Commit Graph

2226 Commits (50eebc46b8b2843bcb750f552a837c4ff588f945)
 

Author SHA1 Message Date
Sam Bosley 50eebc46b8 Refactor filter adapter to not be expandable 13 years ago
Sam Bosley 9d237bf81f Merge from upstream/master 13 years ago
Sam Bosley 06514f3a19 Try/catch in update message dialog to fix crashes with trying to show with a non-running activity 13 years ago
Tim Su 14f8d81ae8 Allow ability to show welcome activity from settings 13 years ago
Tim Su 7412481730 Merge pull request #122 from atshaw/120118_as_regex_fix
Fixed regular expression error
13 years ago
Tim Su b366ebf35a Merge remote-tracking branch 'mruwek/Polish-translation'
Conflicts:
	astrid/res/values-pl/strings.xml
13 years ago
Tim Su b3f3bd02ea If you haven't saved a tag, don't transmit picture until after you have. 13 years ago
Tim Su cf64d736cd Removed sync code from filter list activity in preparation for fragments 13 years ago
Tim Su 8ffe684d94 Bring back a menu item for synchronizing with Astrid.com from task list activity. Modified the abstract provider class to make that happen 13 years ago
Andrew Shaw f5bc5fbca2 Fixed regular expression error where task only added the first word of the tag 13 years ago
Sam Bosley acc651f9fc Merge fixes from upstream/master 13 years ago
Sam Bosley 84a0311f23 Updated landscape layout 13 years ago
Sam Bosley a98fe9e0a5 Version bump and upgrade message 13 years ago
Sam Bosley 49b01b3d4c Added another proguard rule to fix support.v4 library warnings 13 years ago
Sam Bosley e6014d531d Merge remote-tracking branch 'upstream/master' into 4.0 13 years ago
Sam Bosley a3456a397f Updated proguard with rule for AbstractModel 13 years ago
Sam Bosley c130db2c9e Removed redundant jar file (it's already in the actionbarsherlock project) 13 years ago
Sam Bosley b0e5cbef39 Resolve some left over merge conflicts 13 years ago
Sam Bosley dd11d36160 Merge upstream/master 13 years ago
Sam Bosley e0a6e52523 Fixed a bug that would cause activity from this user to not display correctly 13 years ago
Sam Bosley 0029e881cb Reorganized layout of repeat and calendar control in date dialog, updated some strings 13 years ago
Tim Su f215b77a24 Finer-grained keep in proguard 13 years ago
Tim Su 62164d1064 Build.xml now puts clean in right place 13 years ago
Sam Bosley e6cac51035 Removed intent filter that added an extra beast mode preference under a random title 13 years ago
Sam Bosley dc40e65b1d Use the broadcast refresh mechanism for sync finished callbacks in TLA and TVA. This gives better consistency and fewer crashes." 13 years ago
Sam Bosley fad14a1831 Removed intent filter that added an extra beast mode preference under a random title 13 years ago
Tim Su bcb47384e3 Restore Google Guava - oauth has a dependency on it that wasn't caught previously 13 years ago
Sam Bosley 709f74207a Use the broadcast refresh mechanism for sync finished callbacks in TLA and TVA. This gives better consistency and fewer crashes." 13 years ago
Sam Bosley 90a2b83f88 Bump version name and version code so that we won't see tablet crashes and release crashes as the same in crittercism 13 years ago
Sam Bosley 31e7bf3055 Try/catch around sync finished callback in case activity was killed for any reason 13 years ago
Tim Su bd14d3c57b Updated translation template 13 years ago
Tim Su a21ec4afd5 Upgrade crittercism to latest jar 13 years ago
Tim Su a7fe80fadd Fix for crashes and errors, including jchronic, and some preventative try/catches 13 years ago
Tim Su 3c2f614cec Killed welcomeLogin class, made welcome walkthrough dots smaller, localize a string. 13 years ago
Tim Su c4cc1477e3 Shrank a bunch of images, indexed color some, and flat out deleted some others 13 years ago
Tim Su 6d45d6fa02 Fix padding issue for google task adapter 13 years ago
Tim Su bbd9863217 Added proguard optimization & better shrinking, now build is 1MB smaller 13 years ago
Sam Bosley 41a70b4252 Updated crittercism jar to 1.2.5 13 years ago
Sam Bosley 6bef7057d8 Fixed update and upgrade dialog text colors for ics users 13 years ago
Sam Bosley 084bc87e7d Cleaned up the edit task callback and listener and fixed a bug where edit activity sometimes wouldn't launch 13 years ago
Sam Bosley d62a573cb8 Styled the action bar for the tag settings activity 13 years ago
Tim Su dc057fdf3b Fixes to make project compile, and greendroid to api level 14 13 years ago
Tim Su f062260cc9 Darkened list popover 13 years ago
Tim Su 417c8349ed action bar sherlock -> android 14, with corresponding new methods. also removed .project from demo project 13 years ago
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
Sam Bosley 0721f11fbc Cleaned up some header bar action items, styled the task edit activity header 13 years ago
Sam Bosley fdc5775a8f Style the header nav bar for the redesign 13 years ago
Tim Su 10ed3bd532 Get rid of reflection in jchronic library which doesn't play well with Android 13 years ago
Tim Su c320aea90a Move preference setting to make it very difficult for welcome screen to get stuck in a loop 13 years ago
Tim Su ac1a17fc90 Replace astrid icon with pretty new Astrid icon on widget frames. Removed icon_plus, unused. 13 years ago