Commit Graph

1344 Commits (a575f411843d6b107abcc137c289c63a692b13f1)

Author SHA1 Message Date
Tim Su 0f13cf01f7 Merge pull request #174 from sbosley/120302_sb_swipe_lists_subtasks
Swipe between lists! Woooo
13 years ago
Tim Su 076eeee13c Merge pull request #173 from sbosley/120405_sb_pick_contact
Contacts picker!
13 years ago
Sam Bosley 8d2c19c859 Renamed adjustedSqlQuery in Filter to filterOverride to be more descriptive 13 years ago
Sam Bosley 056cbe5497 Introduced an adjustedSqlQuery field to Filter objects so that subtasks won't break equality checking 13 years ago
Sam Bosley af9345c057 Merge swipe between lists branch with changes from master 13 years ago
Sam Bosley 6cee41ac9a Restored progress bar to activity fragment 13 years ago
Sam Bosley dde1248573 Use the onOkClick hook in assignment picker to validate email before dismissing dialog 13 years ago
Sam Bosley b0a1efcdcd Introduced a new hook so that subclasses of popup control set can decide for themselves if the ok button should always dismiss the dialog (for data validation purposes) 13 years ago
Sam Bosley 197fe02be4 Sectioned headers in the assignment picker. booyah 13 years ago
Sam Bosley 7fbfe181b5 Fixed a bug in user sync 13 years ago
Sam Bosley b0ac54ef30 Fixed a bug with using the contact picker 13 years ago
Sam Bosley 5ede134e9f Added contact chooser option to people picker 13 years ago
Sam Bosley 6168534e0a Better size for assigned picker rows 13 years ago
Sam Bosley 1e3006bde7 More improvements to contact picking 13 years ago
Sam Bosley 6268458093 Cherry-pick astrid user loading commit 13 years ago
Sam Bosley c8c170ed7b First draft of contact picking 13 years ago
sbosley 2104d3eae0 Merge pull request #172 from sbosley/120405_sb_backup_on_upgrade
Backup on upgrade
13 years ago
Sam Bosley 8a377ffd33 When deleting tasks after a manual sync (i.e. ones that weren't returned) only delete things assigned to me 13 years ago
Sam Bosley 75b51c8839 Only do backups before upgrade when necessary. Added a reminder comment in upgrade service to remind developers to do this 13 years ago
Sam Bosley cc3a70962b Make a special backup before upgrades 13 years ago
Tim Su 99f5cdc39f Apply migration backup fix to deletion date as well as deletion date 13 years ago
Sam Bosley 559bf8d096 Refresh task list after backup import 13 years ago
Tim Su e34ebd2432 Cursors are silly. 13 years ago
Tim Su 353a420fec Handle for restore from failed migration 4.0.6 - reading XML file, not skipping, and instead overwriting 13 years ago
Tim Su df6e08840d Read version from backup xml, only apply due date adjustment in this case 13 years ago
Sam Bosley e2796db23b Migrate old due time style from xml importer to new due time style 13 years ago
Sam Bosley e178681990 Use a better scheme for checking if a filter isInbox 13 years ago
Sam Bosley 52660cd80d Fixed a display bug with the tags control set 13 years ago
Sam Bosley 9496ff0f4d Catch a potential crash and bail out in rescheduling repeating calendar events 13 years ago
Sam Bosley 7b4baaede1 Define constants for transitories in TaskService, fixed a bug where copied tasks would be assigned back to user 13 years ago
Sam Bosley 44efcfb6c3 Fixed repeating tasks in gcal bugs 13 years ago
Sam Bosley 01e28fb529 Fixed a subtasks indentation bug in certain edge cases: 13 years ago
Sam Bosley 06279d50ac Fixed a potential double popup 13 years ago
Sam Bosley b24044ddd1 Fixed a deadlock, made errors more descriptive 13 years ago
Sam Bosley 3f0de0ab4e Report last error at end of sync 13 years ago
Tim Su 1576702202 Merge remote-tracking branch 'sbosley/120329_sb_astrid_sync_fixes' 13 years ago
Tim Su 288a558ebe Really minor cleanup for the awesome gtasks bug fixes 13 years ago
Sam Bosley 7e1335adbc Fixed a synchronization bug 13 years ago
Sam Bosley 02d6d30d83 Threads launching threads 13 years ago
Sam Bosley cb95621ddc Use a condition variable for the actfm sync timing 13 years ago
Sam Bosley cfdbe08e75 Some ideas for fixing timing issue in astrid.com 13 years ago
Sam Bosley ea42bb828c Fixed gtasks sync timing issues 13 years ago
Sam Bosley f0d453e0a3 Fixed some bugs related to subtasks using -1 instead of Task.NO_ID 13 years ago
Sam Bosley e5b5e3e2c2 Fixed a rare crash that could occur if tag is deleted during sync 13 years ago
Sam Bosley d536cdbf1e Fixed a crash that could occur if gtasks encounter auth problems during a background sync 13 years ago
Sam Bosley 9ae4b81acf Don't create new deleted tasks on gtasks 13 years ago
Sam Bosley 54d0390dd8 Don't push things to google tasks that aren't assigned to you 13 years ago
Sam Bosley ef58bb1cda Bug fixes to sync isOngoing display, better error messages 13 years ago
Sam Bosley f221bc49f1 Improved gtasks token validator by trying invalidate/validate cycle a few times before failing 13 years ago
Sam Bosley 745f1ea814 Synchronize the GtasksTokenValidator 13 years ago
Sam Bosley e119dbbc93 Make the locale edit alerts screen always dark themed: 13 years ago
Sam Bosley b395725fcc Show picture popups in task activity feed 13 years ago
Sam Bosley 59dead0ff9 Account for any discrepancies in server time and client time 13 years ago
Sam Bosley e99a2f1d8b Push unsynced tasks in tags 13 years ago
Sam Bosley 0ed4e6a72a Apply last modified check to syncing tags 13 years ago
Sam Bosley 9b6689a90d Sync conflict merge, not totally working 13 years ago
Sam Bosley e91df38e0c Bug fixes to last modified logic in push task on save 13 years ago
Sam Bosley 4ed70def25 Option to report last error in sync prefs 13 years ago
Tim Su 0d67506434 Better check for infinite loop, slightly more detailed upgrade message 13 years ago
Tim Su c7e7458651 Handle crashes in various places 13 years ago
Tim Su de9aacd027 Handle infinite loop when parent is child 13 years ago
Sam Bosley a309e55910 Deleted commented out code for real! Yay for cleanliness 13 years ago
Sam Bosley 260d5b7f26 Don't log handled exceptions--crittercism crashes 13 years ago
Sam Bosley 73df7d23ee Fixed ActionBar home button in CustomFilterActivity 13 years ago
sbosley a1e71d9bbb Merge pull request #163 from sbosley/120312_sb_sqlite_exception
Added code to catch SQLiteException errors like missing columns
13 years ago
Sam Bosley e320e9ee6b Refactored gtasks token validator 13 years ago
Sam Bosley 9192b5e17f Try catching intents in cases when GoogleAccountManager doesn't have a token response 13 years ago
Sam Bosley 7269e2b5a5 Fixed bug in quickadd when sharing links etc to Astrid 13 years ago
Sam Bosley cce6f2c0e7 Added code to catch SQLiteException errors like missing columns and recommend a reinstall 13 years ago
Sam Bosley 7cae25eaaa Fixed a bug where assignment wouldn't save/refresh when assigning tasks via email on tablet 13 years ago
Sam Bosley 0b55f6b3a3 Fixed issue where refresh menu item wouldn
't always show up in action bar on tablets
13 years ago
Sam Bosley d7ec7ce62e Use dark refresh icon for comments fragment 13 years ago
Sam Bosley 8df2ebea24 Updated crittercism library and readded the calls to logHandledException 13 years ago
Sam Bosley f56c2af26d Fixed manual refresh issue 13 years ago
Sam Bosley 091fdc517c Commented out all calls to Crittercism.logHandledException until issues are fixed 13 years ago
Sam Bosley 760d7da160 Merge remote-tracking branch 'upstream/master' into 120302_sb_swipe_lists_subtasks 13 years ago
Sam Bosley 0a9e9023d0 Fixed locale theme issues 13 years ago
Sam Bosley 9d23ba2c34 Handled exceptions with crittercism 13 years ago
Sam Bosley 4e3ebbde05 Fixed bugs with icon themes on tablet, updated crittercism library 13 years ago
Tim Su cc25b593b4 Add switching logic via ThemeService to identify light and dark drawables to use. Renamed up filters and plugins icons to be more identificatory. 13 years ago
Sam Bosley 2d1f1d1198 Renamed and reorganized menu images for easier replacing 13 years ago
Sam Bosley b3b7085da4 Don't trigger moves for null metadata (not that this should happen) 13 years ago
Sam Bosley 0449ab5bf3 Removed unused intro task strings, fixed a crash in push on save when checking for those strings 13 years ago
Sam Bosley 2b930a7a0e Populate dropdown menu with options menu items 13 years ago
Tim Su 2dd5482bdf Don't always save task modification date when you drag and drop 13 years ago
Tim Su 6849e1fafb Updates to sync service - faster task pushing, without having a prefetch or always to sleep 13 years ago
Tim Su 516a96bd21 Fix for onMetadataChanged -> onMovedOrIndented and only call it sometimes 13 years ago
Tim Su 786a1ff5ef Refactor so that every metadata change triggers a sync in gtasks dragging 13 years ago
Tim Su ac3fc60be1 Gtasks sync on save should push a re-fetched model 13 years ago
Tim Su 6c2bb8470d Add ability for manual sync to clear duplicate tasks 13 years ago
Tim Su 4183da33ce Fix for gtasks order would be wrong because we use string ordering 13 years ago
Tim Su d41ae9e4aa Turn gtasks sync v2 provider into a real singleton, and synchronize on the instance for certain methods 13 years ago
Sam Bosley 02bcbff4e2 Added code to push on save to check for sql constraint exceptions and try to recover 13 years ago
Sam Bosley 9e37fe5547 Update comment count when switching between pages 13 years ago
Sam Bosley 1ddbba41d2 Only initiate autosync when fragment is swiped into view 13 years ago
Sam Bosley ed6984e58d Merge remote-tracking branch 'origin/120221_sb_swipe_between_lists' into 120221_sb_swipe_between_lists 13 years ago
Andrew Shaw 71ff9615c6 Fixed task rabbit login with Tim 13 years ago
Sam Bosley 054b8b4f4f Merge remote-tracking branch 'upstream/master' into 120221_sb_swipe_between_lists
Conflicts:
	astrid/src/com/todoroo/astrid/activity/AstridActivity.java
	astrid/src/com/todoroo/astrid/activity/TaskListFragment.java

Merge upstream/master
13 years ago
Sam Bosley c082d1e672 Fixed a crash on tablets when posting to task rabbit 13 years ago
Sam Bosley 9247845670 Use debug/release api keys with google maps (for taskrabbit), fixed some task rabbit copy 13 years ago
Sam Bosley 6b45cb19ab Finish and autosync when manually syncing from prefs when already logged in 13 years ago
Jon 3fa88dd7a9 Merge pull request #156 from sbosley/120228_sb_sync_prefs_polish
Refactored sync preferences
13 years ago
Sam Bosley 8b0f3e80cc Refactored sync preferences to go straight back to task list and autosync after logging in, other polish 13 years ago
Tim Su 2b56bc11eb Fix for force close when you have an orphaned top-level child 13 years ago
Tim Su 69d6bfb51a Only show option to take a picture if you have a camera 13 years ago
Sam Bosley ee36d3d1be Fixed some concurrency bugs with EditPeopleControlSet 13 years ago
Sam Bosley 867c148996 Merge remote-tracking branch 'upstream/4.0' into 120221_sb_swipe_between_lists 13 years ago
sbosley a47fee9f4c Merge pull request #154 from todoroo/120227_as_location_permission
Removed gps permission for task rabbit
13 years ago
Sam Bosley 9a88805147 Missing import 13 years ago
Andrew Shaw 7d45748a6c Fixing task rabbit statistics reporting with login 13 years ago
Andrew Shaw 9ef1de188e Removed gps permission for task rabbit 13 years ago
Sam Bosley c1e3b5b505 Missing import 13 years ago
Sam Bosley 36a5821813 Merge remote-tracking branch 'upstream/4.0' into 120221_sb_swipe_between_lists 13 years ago
Sam Bosley 4744320760 Fixed a bug in updateFromJson 13 years ago
Sam Bosley c92693feef Fix sql constraint errors when cloning tasks, use transitory for sync suppress flags 13 years ago
Sam Bosley ad7fc4ce80 Merge upstream/4.0 13 years ago
Sam Bosley e8a5fc576f Only send created_at for new tasks 13 years ago
Tim Su 7b6831501b This commit was overruled by committee.
Revert "For simplicity and performance, kill the 'tags that start with _' tasks being hidden from the inbox"

This reverts commit 514a83df60.
13 years ago
Tim Su 514a83df60 For simplicity and performance, kill the 'tags that start with _' tasks being hidden from the inbox 13 years ago
Tim Su f255aca5fb Fixed warnings in all of our code 13 years ago
Tim Su 3c536e2708 Add nls 13 years ago
Tim Su dac9ffd318 Overrode on task delete to cascading delete in gtsaks 13 years ago
Tim Su b44061e676 Make one constant instead of two 13 years ago
Sam Bosley f7143cc2ff Fixed an issue where swiping list area below task could trigger indent and drop events 13 years ago
Sam Bosley 61ddbcbeec Fixed null pointers when reading null properties in xml importer/exporter 13 years ago
Sam Bosley fec4c77af3 Sanity check for 0 when receiving remote task ids 13 years ago
Tim Su 3adfe374e1 Surround indent and drop in a try/catch 13 years ago
Sam Bosley 3f744f23f9 Fixed quickadd assignment oddity, don't push task in edit note activity 13 years ago
Tim Su 80707c5281 When you indent a task, canonicalize order. 13 years ago
Tim Su 49f1b7325e Upgrade message on honeycomb should be black. Unify code. 13 years ago
Tim Su ff01ab795f Subtasks help page now looks cool and fits on one page 13 years ago
Tim Su e10e4c8a0d First pass at making a help file for subtasks 13 years ago
Andrew Shaw 79c720996a Added new widget 9 patch and fixed timer activity not showing up 13 years ago
Tim Su 731f7c007c Fixed the cascading repeat ends up still indented bug 13 years ago
Sam Bosley 24350c448b Fixed issues with Gtasks sync on save 13 years ago
Tim Su 2a8ad3cdd4 Merge remote-tracking branch 'origin/20120221_as_tag_settings' into 4.0 13 years ago
Tim Su 65066be923 Removed log messages 13 years ago
Andrew Shaw e6b2afc3b5 Fixed dissappearing comments in recent activity 13 years ago
Andrew Shaw 2a01d8460d Caching images in AsyncImageView 13 years ago
Andrew Shaw 599e7b7561 Theming and UI changes 13 years ago
Andrew Shaw ab8bfbeda6 Caching tag images 13 years ago
Andrew Shaw ada52d90e1 Tag settings redesign 13 years ago
Andrew Shaw 6eb8af2d1d changing widget layouts 13 years ago
Andrew Shaw 7759ab098a Fixed widget and added message when there is no activity 13 years ago
Andrew Shaw d7841b2b44 Fixed task rabbit oauth and posting 13 years ago
Andrew Shaw 9311eeb5b7 Welcome activity tag 13 years ago
Tim Su db1bc35877 Fix to get google tasks to drag/drop. Also removed google tasks help screen, we're gonna make another one 13 years ago
Tim Su e60c44f710 Fixes for making google tasks work 13 years ago
Tim Su a8ea63ed30 Brought the drag goodness to google tasks fragment 13 years ago
Tim Su 5042e17b1f Generify ordered list fragment helper for use with gtasks 13 years ago