Commit Graph

13 Commits (33ae2cad02ff6b938bd4987b5051863f8f254abf)

Author SHA1 Message Date
Tim Su 33ae2cad02 Merge remote branch 'origin/master' into dev
Conflicts:
	astrid/AndroidManifest.xml
	astrid/plugin-src/com/todoroo/astrid/producteev/sync/ProducteevDataService.java
	astrid/plugin-src/com/todoroo/astrid/rmilk/MilkBackgroundService.java
	astrid/plugin-src/com/todoroo/astrid/rmilk/MilkDetailExposer.java
	astrid/plugin-src/com/todoroo/astrid/rmilk/MilkPreferences.java
	astrid/plugin-src/com/todoroo/astrid/rmilk/api/data/RtmTask.java
	astrid/plugin-src/com/todoroo/astrid/rmilk/data/MilkNote.java
	astrid/plugin-src/com/todoroo/astrid/rmilk/sync/RTMSyncProvider.java
	astrid/plugin-src/com/todoroo/astrid/rmilk/sync/RTMTaskContainer.java
	astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
	astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
	astrid/src/com/todoroo/astrid/service/StartupService.java
16 years ago
Tim Su ed60492f18 Fixin' tests, fixin' the content provider, i think it's in decent shape now. All unit tests pass! 16 years ago
Tim Su de43051ee1 Adding 'created by' detail to producteev tasks, fix for not fully logging out, don't read null's from database 16 years ago
Tim Su 8082b94c2c Got export working, minor bug fixes 16 years ago
Tim Su 1bd704b5d4 Findbugs 16 years ago
Tim Su 9cdba9c17a Added default values for all things in creating a new list and syncing it. Also handling sync errors silently 16 years ago
Tim Su 695f865c23 Fixed crashing issues with RTM sync (thanks Arne Jans!). Also added an 'Ongoing' status for sync 16 years ago
Tim Su 196417deea Continued improvements for RTM task / notes - now works without crashing 16 years ago
Tim Su 82e734d986 Upgrade for repeats, and repeat tests. also reorganized some imports on accident 16 years ago
Tim Su 3cb2ed563e Updating reminders to use new stuff... 16 years ago
Tim Su e06f60b95f Now got edit to work. yay! no saving tags, and no alerts. Still to do: due date stuff, urgency stuff 16 years ago
Tim Su a1b12d15ef Made significant progress getting upgrade tests to pass. 16 years ago
Tim Su c7974868be Moved projects around. 16 years ago