Commit Graph

1152 Commits (661ccf5696b24ae7c73ef6a69dd697706788ad1a)

Author SHA1 Message Date
Sam Bosley 9e37fe5547 Update comment count when switching between pages 14 years ago
Sam Bosley 1ddbba41d2 Only initiate autosync when fragment is swiped into view 14 years ago
Sam Bosley ed6984e58d Merge remote-tracking branch 'origin/120221_sb_swipe_between_lists' into 120221_sb_swipe_between_lists 14 years ago
Andrew Shaw 71ff9615c6 Fixed task rabbit login with Tim 14 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
14 years ago
Sam Bosley c082d1e672 Fixed a crash on tablets when posting to task rabbit 14 years ago
Sam Bosley 9247845670 Use debug/release api keys with google maps (for taskrabbit), fixed some task rabbit copy 14 years ago
Sam Bosley 6b45cb19ab Finish and autosync when manually syncing from prefs when already logged in 14 years ago
Jon 3fa88dd7a9 Merge pull request #156 from sbosley/120228_sb_sync_prefs_polish
Refactored sync preferences
14 years ago
Sam Bosley 8b0f3e80cc Refactored sync preferences to go straight back to task list and autosync after logging in, other polish 14 years ago
Tim Su 2b56bc11eb Fix for force close when you have an orphaned top-level child 14 years ago
Tim Su 69d6bfb51a Only show option to take a picture if you have a camera 14 years ago
Sam Bosley ee36d3d1be Fixed some concurrency bugs with EditPeopleControlSet 14 years ago
Sam Bosley 867c148996 Merge remote-tracking branch 'upstream/4.0' into 120221_sb_swipe_between_lists 14 years ago
sbosley a47fee9f4c Merge pull request #154 from todoroo/120227_as_location_permission
Removed gps permission for task rabbit
14 years ago
Sam Bosley 9a88805147 Missing import 14 years ago
Andrew Shaw 7d45748a6c Fixing task rabbit statistics reporting with login 14 years ago
Andrew Shaw 9ef1de188e Removed gps permission for task rabbit 14 years ago
Sam Bosley c1e3b5b505 Missing import 14 years ago
Sam Bosley 36a5821813 Merge remote-tracking branch 'upstream/4.0' into 120221_sb_swipe_between_lists 14 years ago
Sam Bosley 4744320760 Fixed a bug in updateFromJson 14 years ago
Sam Bosley c92693feef Fix sql constraint errors when cloning tasks, use transitory for sync suppress flags 14 years ago
Sam Bosley ad7fc4ce80 Merge upstream/4.0 14 years ago
Sam Bosley e8a5fc576f Only send created_at for new tasks 14 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.
14 years ago
Tim Su 514a83df60 For simplicity and performance, kill the 'tags that start with _' tasks being hidden from the inbox 14 years ago
Tim Su f255aca5fb Fixed warnings in all of our code 14 years ago
Tim Su 3c536e2708 Add nls 14 years ago
Tim Su dac9ffd318 Overrode on task delete to cascading delete in gtsaks 14 years ago
Tim Su b44061e676 Make one constant instead of two 14 years ago
Sam Bosley f7143cc2ff Fixed an issue where swiping list area below task could trigger indent and drop events 14 years ago
Sam Bosley 61ddbcbeec Fixed null pointers when reading null properties in xml importer/exporter 14 years ago
Sam Bosley fec4c77af3 Sanity check for 0 when receiving remote task ids 14 years ago
Tim Su 3adfe374e1 Surround indent and drop in a try/catch 14 years ago
Sam Bosley 3f744f23f9 Fixed quickadd assignment oddity, don't push task in edit note activity 14 years ago
Tim Su 80707c5281 When you indent a task, canonicalize order. 14 years ago
Tim Su 49f1b7325e Upgrade message on honeycomb should be black. Unify code. 14 years ago
Tim Su ff01ab795f Subtasks help page now looks cool and fits on one page 14 years ago
Tim Su e10e4c8a0d First pass at making a help file for subtasks 14 years ago
Andrew Shaw 79c720996a Added new widget 9 patch and fixed timer activity not showing up 14 years ago
Tim Su 731f7c007c Fixed the cascading repeat ends up still indented bug 14 years ago
Sam Bosley 24350c448b Fixed issues with Gtasks sync on save 14 years ago
Tim Su 2a8ad3cdd4 Merge remote-tracking branch 'origin/20120221_as_tag_settings' into 4.0 14 years ago
Tim Su 65066be923 Removed log messages 14 years ago
Andrew Shaw e6b2afc3b5 Fixed dissappearing comments in recent activity 14 years ago
Andrew Shaw 2a01d8460d Caching images in AsyncImageView 14 years ago
Andrew Shaw 599e7b7561 Theming and UI changes 14 years ago
Andrew Shaw ab8bfbeda6 Caching tag images 14 years ago
Andrew Shaw ada52d90e1 Tag settings redesign 14 years ago
Andrew Shaw 6eb8af2d1d changing widget layouts 14 years ago