You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
tasks/astrid/common-src/com/todoroo/andlib
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
14 years ago
..
data Merge remote branch 'origin/master' into dev 14 years ago
service Fixed issue with repeated tasks getting upgraded as completed, also fixed backup not getting created while upgrading, and upgrade failure results in backup restore. Also temporary restore of backup functionality 14 years ago
sql Renamed permissions, fixed a bug with Field class 14 years ago
utility Now we detect if an anomalous database state has occurred and try to restore tasks. Also now we sort backup files by last modified date 14 years ago
widget Increased gesture detection threshold 14 years ago