Commit Graph

939 Commits (44f8c82d9a8db84b6b2904f58e6873b35d9c9211)

Author SHA1 Message Date
Sam Bosley 9d237bf81f Merge from upstream/master 14 years ago
Tim Su b3f3bd02ea If you haven't saved a tag, don't transmit picture until after you have. 14 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 14 years ago
Sam Bosley b0e5cbef39 Resolve some left over merge conflicts 14 years ago
Sam Bosley dd11d36160 Merge upstream/master 14 years ago
Sam Bosley e0a6e52523 Fixed a bug that would cause activity from this user to not display correctly 14 years ago
Sam Bosley 0029e881cb Reorganized layout of repeat and calendar control in date dialog, updated some strings 14 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." 14 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." 14 years ago
Sam Bosley d62a573cb8 Styled the action bar for the tag settings activity 14 years ago
Tim Su dc057fdf3b Fixes to make project compile, and greendroid to api level 14 14 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
14 years ago
Andrew Shaw d1e9b4c7c0 Walkthrough tutorial upon app launch 14 years ago
Sam Bosley 0b1639af85 Make the welcome login activity work in landscape like the regular login activity 14 years ago
Arne Jans 45635f22ec Fixed the loginpage and actfmaloginactivity for landscape 14 years ago
Tim Su 7dcd0736f3 Add progress bar for fetching task activity 14 years ago
Tim Su 11bb7e6e71 Disable the old sync provider in favor of new hotness 14 years ago
Tim Su eee0def2bd Synchronize TagViewActivity with the v2 sync provider 14 years ago
Tim Su 7457c6ee08 Initiate Auto sync, and save last sync for tasks received through the system 14 years ago
Sam Bosley ab07bae3a1 Commented out some stuff that was causing a crash 14 years ago
Tim Su 85eda2a62d Added new progress bar to task list activity, now using it to sync task list activity 14 years ago
Sam Bosley 3931e3a624 Fixed bugs related to rotating while in FilterListWrapperActivity 14 years ago
Sam Bosley 808a4223d9 Fixed some null pointer exceptions in tag view activity callbacks 14 years ago
Sam Bosley 0767328c5c Can now swap custom task list fragments for filters with custom intents 14 years ago
Sam Bosley 67c2776472 Fixed invisible checkboxes in repeat control set 14 years ago
Sam Bosley 14274386c7 Adjusted calendar functions to work on ICS 14 years ago
Sam Bosley ed01e28916 Resolve merge conflicts from tablet branch 14 years ago
Sam Bosley 7ff70ade9b Changed gcal behavior for repeated tasks--don't delete old events 14 years ago
Arne Jans 6511d7e594 merged master into unifiedtabletphone-ui
fixed NotificationActivity to be shown, also for landscape
14 years ago
Sam Bosley 5094e1a3f3 Trim tag name before saving so tags can't be just whitespace 14 years ago
Sam Bosley ba8fc52520 Fixed some bugs with task description field from JSON and cleaned up description UI, removed some debug code 14 years ago
Amy Tang e4b57e963f Press astrid on empty list to create new task 14 years ago
Amy Tang a0c6528e24 Tag description UI and backend 14 years ago
Sam Bosley b0cb09dc11 Fixed an off by one error that was causing a null pointer exception in filter list activity 14 years ago
Sam Bosley 6f8bb86357 Killed the filters header, moved not in a list under the lists heading 14 years ago
Sam Bosley 2e9a211c23 Popup to ask whether to show assigned task 14 years ago
Sam Bosley 24dfae45e4 Switch to assigned by me filter when assigning a task from active tasks list 14 years ago
Amy Tang e98a494f08 Changed copy on add new tasks 14 years ago
Sam Bosley 04f0b617b0 Don't show toast on new user login, fixed keyboard bug on new user login 14 years ago
Sam Bosley 4caf719e88 New I've Assigned filter 14 years ago
Sam Bosley 0cb3ef8a1c Refactored some task criteria into the api dao, check for task ownership when syncing 14 years ago
Sam Bosley 1e13208b05 Fixed an issue with adding pictures to comments and with adding whitespace only tasks 14 years ago
Sam Bosley 85552138ba Fixed styling issue with repeat days of week 14 years ago
Sam Bosley 9f7d0bd322 Sanity checks to prevent null pointer exceptions in sync service 14 years ago
Sam Bosley 26bee9c9d9 Hopefully fixed a concurrent modification crash in sync service 14 years ago
Sam Bosley f42f237ddd Fixed a bug where the setting to silence list notifications would get turned off whenever you edited a list 14 years ago
Sam Bosley 9a8917d50c Cleaned up a little ics calendar code (still not working) 14 years ago
Arne Jans 28a339467f Merge branch 'master' into unifiedtabletphone-ui
Conflicts:
	astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java
	astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
	astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
14 years ago
Sam Bosley 0d77643a8d Fixed a bug with null in a toast and double toasting 14 years ago
Tim Su 597375761a Force task to save even when a sync is going on when you edit 14 years ago
Tim Su 9c0da435c4 Adjust share toast so it doesn't show if you aren't logged in 14 years ago
Tim Su d9e9d3fc48 On actfm login, make the text boxes the right input type 14 years ago
Tim Su 759b05053d Killed dead code, fixed issues with user assignment 14 years ago
Tim Su d77e7da5b6 Re-write and fix user id 14 years ago
Tim Su 1403011f31 Removed several unneeded task flags 14 years ago
Tim Su 019bce8bf7 Removed debugging println statements 14 years ago
Tim Su e09ceca0c0 Fix for wront local URL 14 years ago
Sam Bosley 65c3d0a6ec Fixed a bug that would cause a json exception (shouldn't have broken anything though) 14 years ago
Arne Jans d87ed70d52 Fixed crash when adding a new list. 14 years ago
Sam Bosley 316d998306 Fixed a bug with sharing when not logged in 14 years ago
Arne Jans 27010eb6cd Merge branch 'master' into unifiedtabletphone-ui
Conflicts:
	astrid/AndroidManifest.xml
	astrid/plugin-src/com/todoroo/astrid/actfm/TagViewActivity.java
	astrid/src/com/todoroo/astrid/activity/FilterListActivity.java
	astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
	astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
	astrid/src/com/todoroo/astrid/welcome/SplashScreenLauncher.java
	astrid/src/com/todoroo/astrid/welcome/WelcomeGraphic.java
14 years ago
Sam Bosley 78b5bb31c2 Fixed a bug where the save toast wouldn't show correctly for shared tasks 14 years ago
Sam Bosley 79d5bf9dd5 New user experience improved with more help popovers, updated copy, feedback when saved task will be hidden 14 years ago
Sam Bosley 95bd8210c8 Updated dialog utilities function for custom dialog to include icon 14 years ago
Arne Jans 58181c2769 Added convenience-method for overridePendingTransition in AndroidUtilities for typesafety (calling it with fragments is bad). 14 years ago
Arne Jans 1d60b42138 Added fragment-version of TaskEditActivity, callbacks not ready yet. 14 years ago
Arne Jans e9913eac56 2nd alpha version of tablet/phone ui with actionbar-classes and basic callback-structure through activities as proposed in the 'supporting handsets' article on developer.android.com 14 years ago
Arne Jans f125bf24ec Alpha version of dualpane-layout with actionbar and fixed editing of readonly-tasks 14 years ago
Sam Bosley 2cd5cf1005 Cleaned up some more code, added chronometer to timer in task edit view 14 years ago
Sam Bosley b188bc6cdd Cleaned up unused files and polished the tag view activity people header 14 years ago
Sam Bosley 5c197923bc Cancel button in tag settings activity 14 years ago
Sam Bosley 854b6c6b33 Better feedback when trying to share a task when not logged in 14 years ago
Sam Bosley 653811520b Fixed the bug where task edit ok buttons would get squished off screen 14 years ago
Sam Bosley 89af29b011 Killed settings button 14 years ago
Sam Bosley ec4e342177 Fixed a bug where keyboard would stay up after editing tag settings 14 years ago
Sam Bosley ae11c49c2d Fixed threading in C2DM registration that could cause an ANR on first sync: 14 years ago
Sam Bosley f64bfb9457 Autoexpand task edit page when notes or lists are present 14 years ago
Sam Bosley a5d4de0d99 Prevented autosync popups from happening all the time, fixed bug where quick add bar would push header off screen 14 years ago
Sam Bosley fe8556ce44 New list button now in lists footer, not in any list is now under filters section 14 years ago
Sam Bosley 0ba1a689a0 Don't show task notes by default 14 years ago
Sam Bosley 8476e387fb Killed welcome graphic 14 years ago
Sam Bosley 943e9b6219 Themed all the task edit dialogs, including the calendar picker 14 years ago
Sam Bosley 4289827e1f Fixed bug where person task was assigned to wouldn't be checked in people picker 14 years ago
Sam Bosley 01170b9ca1 Hopefully fixed a null pointer in the tags control set 14 years ago
Sam Bosley e74d3de73b Possible fix for unassigned bugs 14 years ago
Sam Bosley 3e15123360 Merge branch '111205_sb_ics_calendar' into 111205_sb_3.9_revisions 14 years ago
Sam Bosley bdd28776c4 Workaround for a google bug that could give us invalid list ids. could this be the cause of all the 400 errors? 14 years ago
Sam Bosley 4cd6321fa3 More progress on calendar picker
New and awesome date and time picker for deadlines, alarms, etc.
14 years ago
Sam Bosley 6789f2de47 Tweaked some things to try to make calendar plugin work on ICS 14 years ago
Sam Bosley 36621ab281 Fixed layout issues with repeating task days of week 14 years ago
Sam Bosley 157d77d14a Updated default person and unassigned images 14 years ago
Sam Bosley 064df88f85 Fixed problem with weird animation in dialog with deleting lists/filters 14 years ago
Sam Bosley 0e626de22c Pictures in assignment list 14 years ago
Sam Bosley 9f1d7175d9 Certain kinds of notifications now take you to list activity 14 years ago
Sam Bosley 0de393e4c3 Updated some more transition animations 14 years ago
Sam Bosley e943d0ac67 Animation polish, updated some icons 14 years ago
Sam Bosley 0df9ae4c39 Lots of polish to edit page, dialogs, making things work on small screen, etc. 14 years ago
Sam Bosley f7465d78c2 Fixed a bug where empty lists created offline would get deleted on first sync 14 years ago
Sam Bosley 72bbd6e221 Killed filters header and moved add filter button to menu 14 years ago
Sam Bosley 2957e7ee2e Removed special chars from password creation: 14 years ago