Commit Graph

14 Commits (7d06f46fc4d40354efece11dda390a5241e2da88)

Author SHA1 Message Date
Tim Su 6f6956dcd8 Merge branch 'master' into 4.0
Conflicts:
	astrid/AndroidManifest.xml
	astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java
	astrid/project.properties
	astrid/res/drawable-hdpi/widget_frame.png
	astrid/res/drawable-land-hdpi/widget_frame.png
	astrid/res/drawable-land/widget_frame.png
	astrid/res/drawable/widget_frame.png
	astrid/res/layout/task_list_activity.xml
	astrid/src/com/todoroo/astrid/activity/FilterListActivity.java
	astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
	greendroid/GreenDroid/.classpath
13 years ago
Tim Su 85eda2a62d Added new progress bar to task list activity, now using it to sync task list activity 13 years ago
Arne Jans 6511d7e594 merged master into unifiedtabletphone-ui
fixed NotificationActivity to be shown, also for landscape
13 years ago
Sam Bosley 04f0b617b0 Don't show toast on new user login, fixed keyboard bug on new user login 13 years ago
Arne Jans 84ade762cc Added method-comment to AndroidUtilities.callOverridePendingTransition 13 years ago
Arne Jans 58181c2769 Added convenience-method for overridePendingTransition in AndroidUtilities for typesafety (calling it with fragments is bad). 13 years ago
Sam Bosley c0dad1c969 Fixed a bug that ommitted booleans from serializing content values or bundles to string in AndroidUtilities 13 years ago
Sam Bosley 043beb2b39 Fix for crash in gtasks widget 13 years ago
Sam Bosley 32b865d86f Fixed bug with tag widgets not launching tag view activity 13 years ago
Tim Su 94fd25098f New style for filters page to show list pictures and restructure custom filters. 13 years ago
Tim Su 26c2d3c49b Astrid Collaboration Project
- sync with Astrid.com server
- people activity for delegating and sharing tasks
- shared tags activity for adding users to tags
- c2dm push notifications
14 years ago
Tim Su d7af85c164 Using apache lang unescapeHTML instead of the random one i found on the net. Better license and more trusted code. 14 years ago
Tim Su 479f2458fc Replacing html.fromHTML in pdv api utilities to unescapeHtml implementation to fix pushback buffer overflow issue. 14 years ago
Tim Su 9b26d9020e Merge commit '94a57ce7512954d092ea49a09f3f15ccc7486556' as 'api' 14 years ago