archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
3,894 Commits
20 Branches
350 Tags
131 MiB
14.0
main
renovate/work
renovate/fragment.ktx
renovate/google.oauth2
renovate/activity.compose
list_settings
renovate/com.android.billingclient-billing-ktx-7.x
renovate/osmdroid
renovate/dagger.hilt
renovate/com.android.billingclient-billing-ktx-6.x
renovate/coil
renovate/retrofit-monorepo
atd_image
remove_adapters
gtask_related_email
synthesis
gtask_note_sync
save_or_discard
gh-pages
4.8.15
4.8.14
4.8.13
4.8.12
4.8.11
4.6.12
4.6.9
4.6.8.1
4.6.8
4.6.7
fork
4.6.6
4.0.2
4.0.1
4.0.0
3.8.5
3.8.5.1
3.8.4.4
3.8.4.2
3.8.4.1
3.8.3
3.8.2
3.8.0.2
3.8.0.1
3.8.0
3.7.7
3.7.6
3.7.5
3.7.4
3.7.3.1
3.7.3
3.7.2
3.7.1
3.7.0
3.6.3
3.6.1
3.6.0
3.5.0
3.4.0
3.3.6
3.3.3
3.3.0
3.2.7
3.2.6
3.2.5
3.2.4
3.2.3
3.2.0
3.1.0
3.0.6
3.0.4
3.0.3
3.0.2
3.0.0
2.14.4-limited
2.14.3
2.14.2
2.14.1
2.14.0
0.6.0-lite
10.0
10.0.1
10.0.2
10.0.3
10.1
10.2
10.3
10.4
10.4.1
11.0
11.0.1
11.1
11.1.1
11.10
11.10.1
11.10.2
11.11
11.12
11.12.1
11.12.2
11.12.3
11.13
11.2
11.2.1
11.2.2
11.3
11.3.1
11.3.2
11.3.3
11.3.4
11.4
11.5
11.5.1
11.6
11.6.1
11.7
11.8
11.9
11.9.1
11.9.2
12.0
12.1
12.2
12.3
12.4
12.5
12.6
12.6.1
12.7
12.7.1
13.0.1
13.0.2
13.1
13.1.1
13.1.2
13.10
13.11
13.11.1
13.11.2
13.2
13.2.1
13.2.2
13.2.3
13.2.4
13.3
13.3.1
13.3.2
13.4
13.5
13.5.1
13.6
13.6.1
13.6.2
13.6.3
13.7
13.8
13.8.1
13.9
13.9.6
13.9.7
13.9.9
3.8.3.1
3.9.1
3.9.1.1
4.1.3
4.1.3.1
4.2.0
4.2.1
4.2.2
4.3.0
4.3.1
4.3.2
4.3.3
4.3.4
4.3.4.1
4.3.4.2
4.4.0
4.4.1
4.4.2
4.4.3
4.4.4
4.4.4.1
4.5.0
4.5.1
4.5.2
4.5.3
4.6.0
4.6.1
4.6.10
4.6.11
4.6.13
4.6.14
4.6.15
4.6.16
4.6.17
4.6.18
4.6.2
4.6.3
4.6.4
4.6.5
4.7.0
4.7.1
4.7.10-fdroid
4.7.11
4.7.11-fdroid
4.7.12
4.7.12-fdroid
4.7.13
4.7.14
4.7.14-fdroid
4.7.15
4.7.15-fdroid
4.7.16
4.7.16-fdroid
4.7.17
4.7.18
4.7.19
4.7.2
4.7.20
4.7.21
4.7.22
4.7.3
4.7.4
4.7.5
4.7.6
4.7.7
4.7.8
4.7.9
4.8.0
4.8.1
4.8.10
4.8.16
4.8.17
4.8.18
4.8.19
4.8.2
4.8.20
4.8.21
4.8.22
4.8.3
4.8.4
4.8.5
4.8.6
4.8.7
4.8.8
4.8.9
4.9.0
4.9.1
4.9.10
4.9.11
4.9.12
4.9.13
4.9.14
4.9.15
4.9.2
4.9.3
4.9.4
4.9.5
4.9.6
4.9.7
4.9.8
5.0.0
5.0.1
5.0.2
5.1.0
5.1.2
5.1.3
5.1.4
5.1.5
5.2.0
5.2.1
5.3.0
5.3.1
5.3.2
5.3.3
5.3.4
5.3.5
5.3.6
6.0
6.0.1
6.0.2
6.0.3
6.0.4
6.0.5
6.0.6
6.1
6.1.1
6.1.2
6.1.3
6.2
6.3
6.3.1
6.4
6.4.1
6.4.3
6.4.5
6.5
6.5.1
6.5.2
6.5.3
6.5.4
6.5.5
6.5.6
6.6
6.6.1
6.6.2
6.6.3
6.6.4
6.6.5
6.7
6.7.1
6.7.2
6.7.3
6.8
6.8.1
6.9
6.9.1
6.9.2
6.9.3
7.0
7.1
7.1.1
7.1.2
7.2
7.2.1
7.2.2
7.3
7.3.1
7.3.2
7.4
7.4.1
7.4.2
7.5
7.6
7.6.1
7.7
7.8
8.0
8.0.1
8.1
8.10
8.11
8.2
8.2.1
8.3
8.4
8.5
8.6
8.6.1
8.7
8.7.1
8.8
8.9
8.9.1
8.9.2
9.0
9.1
9.2
9.3
9.3.1
9.4
9.4.1
9.5
9.6
9.7
9.7.1
9.7.2
9.7.3
lite-0.5.0
lite-0.5.1
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'b62e1755f1'
${ noResults }
Commit Graph

1266 Commits (b62e1755f1117cbc9f586f138208345d1a487b7f)

Author SHA1 Message Date
Sam Bosley e9d1f1391e Prompt for login at in app billing page, direct users to astrid.com if billing not supported 12 years ago
Sam Bosley 069a40d4f6 Call server to update premium status 12 years ago
Sam Bosley 9ace9de527 Don't prompt for login at billing screen 12 years ago
Sam Bosley 73b6025c6b Cleanup and minor conflict resolution 12 years ago
Sam Bosley 6e8331ebd3 Merge Jimmy's layout for billing and resolve conflicts 12 years ago
Jimmy Scott ba2f828821 Billing xml with relevent strings created 12 years ago
Sam Bosley a8f74da42e More code and refactoring in the billing activity 12 years ago
Sam Bosley b8d5fedf84 Skeleton of a billing activity 12 years ago
Sam Bosley 348f7cca58 Repeat confirmation dialog when finishing a repeat task with an end date 13 years ago
Sam Bosley f0ff251bda Refresh the main menu after sync, only show featured lists when necessary 13 years ago
Sam Bosley 7ff311f76d Show people's images when in people mode 13 years ago
Sam Bosley 91935162ab Added featured lists icon to the menu 13 years ago
Sam Bosley ff853e0ce0 Localized strings and added progress dialog to cloning process 13 years ago
Sam Bosley aac0b196fe Cloning individual reusable tasks 13 years ago
Sam Bosley ba80ac686c Featured lists fragment now mostly working, needs polish 13 years ago
Sam Bosley fb51a7334c Started on reusable task adapter 13 years ago
Sam Bosley 1cd9f08c28 More work on the featured lists view 13 years ago
Sam Bosley e4295194a5 Started with infrastructure for featured lists 13 years ago
Sam Bosley ce6812fcf5 Introduced ability to repeat a task until a specified date 13 years ago
Sam Bosley b4b7653367 Minor cleanup and copy update 13 years ago
Jimmy Scott 913702d5e9 AB test calendar scheduling 13 years ago
Sam Bosley 6e3f0d7765 Error catching spinner to catch crashes when rotating spinners in control sets (still leaks windows) 13 years ago
Sam Bosley 14c36867ed Fixed compilation errors from string import 13 years ago
Tim Su 8a5ff997ea Update strings files with translation help comments provided by Jessie Tang 13 years ago
Sam Bosley 50b2751360 Three pane view in tablet portrait mode 13 years ago
Sam Bosley 268d57d498 Warn when logging into your second sync provider 13 years ago
Sam Bosley 04bc247509 Adjusted placement of user image in comment row 13 years ago
Sam Bosley 6be8d02cf2 Fixed padding bug in filter adapter 13 years ago
Sam Bosley 60b55c9197 Polish and layout adjustments to comments list 13 years ago
Sam Bosley c6e2085549 Adjust filter adapter row height and layout 13 years ago
Sam Bosley 0535e469c9 Adjusted layouts of checkboxes and tag members header 13 years ago
Sam Bosley 5665f8c2a7 Started on adjusting task row layout 13 years ago
Sam Bosley fe6886a383 Adjusted margins for list icons 13 years ago
Sam Bosley f42ebf097c Removed separators in header view 13 years ago
Sam Bosley dd552cd4c0 Added a button to go to astrid labs from the missed call notification 13 years ago
Sam Bosley 55bed5b687 Added explanitory share with text 13 years ago
Sam Bosley 09fc117c13 Adjust alignment of labels in tag settings 13 years ago
Sam Bosley 23db694cae Updated the anyone images and hdpi checkbox backgrounds 13 years ago
Sam Bosley 86749f97b2 Updated and polished sync menu icons 13 years ago
Sam Bosley 90bbc9b1b4 Revert "Shrink the assigned images slightly in task rows" 
This reverts commit a7ac25eea956ed1252d666c32a1985d73f92c354.
 13 years ago
Sam Bosley 1fb3949ef6 Fixed progress bar height discrepancies 13 years ago
Sam Bosley c7383030d1 Adjust padding on tag updates title 13 years ago
Sam Bosley 0cef0ebb47 Shrink the assigned images slightly in task rows 13 years ago
Sam Bosley 82075f92e7 Adjusted weights of columns in tablet portrait mode 13 years ago
Sam Bosley e29d0754ad Layout polish to the add comment bar 13 years ago
Jon Paris cfbc723889 cleaned up icons 13 years ago
Sam Bosley ef3293c2e3 Don't allow ideas tab on the nook 13 years ago
Sam Bosley 06adf4594b Fixed a display bug on HTC MyTouch 13 years ago
Sam Bosley 467bc2651c Timer control bug fixes, some text color polish 13 years ago
Sam Bosley f470f1924e Tweaked a layout 13 years ago
Sam Bosley e4920c3156 AB test the presence of the ideas tab 13 years ago
Sam Bosley c4c6fbd1d7 Fixed typo 13 years ago
Sam Bosley e22b8c4fca Updated tag header layout 13 years ago
Sam Bosley 8310e52050 Show user name when logged in to astrid.com 13 years ago
Sam Bosley ad05aafb3a Call it People instead of Friends 13 years ago
Sam Bosley 6b177109fb Fixed a bunch of layout issues with the reminder dialogs 13 years ago
Sam Bosley 7d4072f544 Handle the major MS Ofice filetypes 13 years ago
Sam Bosley 58c565cfd1 Search the market for applications to handle various filetypes if they can't be handled natively 13 years ago
Sam Bosley b66377901a Copy updates, more reengagement strings 13 years ago
Sam Bosley 40a26ab405 Updated some strings, A/B test presence of notifications 13 years ago
Sam Bosley 27c3d3cd4a Reengagement notifications are working in full 13 years ago
Sam Bosley cfcbc468c8 More skeleton stuff for reengagement, deferring for design 13 years ago
Sam Bosley bd71eb16d2 Polish the recording audio dialog a little 13 years ago
Sam Bosley 8bb5f2d405 File attachments quick action 13 years ago
Sam Bosley d10cd37256 Show files immediately after download finishes 13 years ago
Sam Bosley 767d8283fb Don't let non-premium users delete files 13 years ago
Sam Bosley 0f9d4dc225 Better recovery attempts when encountering unknown filetypes 13 years ago
sbosley 500660f05d Merge pull request #183 from sbosley/120511_sb_premium_voice 
Premium!
 13 years ago
Sam Bosley 7920ea4bf2 Better handling of file attachments names, ui polish, code cleanup 13 years ago
Sam Bosley 688c608e54 Show friends view if friends exist, hide it if not 13 years ago
Sam Bosley 4eb57e2b6f Copy update 13 years ago
Sam Bosley d31bf681c5 Merge remote-tracking branch 'origin/120511_sb_premium_voice' into 120511_sb_premium_voice 13 years ago
Sam Bosley 50d249dd53 First draft at downloading files on demand (untested) 13 years ago
Sam Bosley 0448778d64 Scale bitmaps to prevent out of memory errors 13 years ago
Sam Bosley 539822e3e4 Introduced quick action for viewing notes 13 years ago
Sam Bosley 89f97434cd Color polish 13 years ago
Sam Bosley af8cb9b87c Resized the task edit complete box to match those in the task list 13 years ago
Sam Bosley 5289946e62 Fixed a layout issue with the empty view in list comments 13 years ago
Sam Bosley e882217ebe Centered and aligned all the various quickadd-like bars 13 years ago
Sam Bosley 64cdf02245 Theme the main edit text fields (comments, add task, etc) 13 years ago
Sam Bosley 1742a7532f Start differentiating bewteen picture attachments and sdcard attachments 13 years ago
Sam Bosley a1f7c3603c Copy files when attaching, code cleanup 13 years ago
Sam Bosley a45ffb0c79 Added a file browser to select and attach files from the sdcard. Minor code cleanup and polish 13 years ago
Sam Bosley 3f97682595 Localized another string 13 years ago
Sam Bosley 565894f661 Localize some strings, clean up the code 13 years ago
Sam Bosley 263649b508 Lots of polish to the files control set 13 years ago
Sam Bosley dcc228c4c2 Fixed bugs with FilesControlSet displays 13 years ago
Sam Bosley e542b985b3 Infrastructure for general recording, but getting buffer overflows 13 years ago
Sam Bosley 810f70f5a6 New icons and menu items as placeholders for premium features 13 years ago
Sam Bosley 4e85017921 Hopefully fixed the leaked service connection problems, added some error handling 13 years ago
Sam Bosley 998d990ecb Improvements to file list control set 13 years ago
Sam Bosley 28c8fe0645 Simple delete file button in files control set 13 years ago
Sam Bosley 33c318befc Use metadata objects for files control set 13 years ago
Sam Bosley 7e8438ac74 Prototype of audio playback from TEA 13 years ago
Sam Bosley 57f291f809 Move Producteev into astrid labs 13 years ago
Jon 4563167ae8 Merge pull request #181 from jonparis/master 
fixed wrong size of refresh icon for tablets
 13 years ago
Jon Paris d9431004d0 fixed big refresh image for tablets 13 years ago
Sam Bosley 64a0f32b04 Fixed layout issues with people list fragment 13 years ago
Sam Bosley 2b75a4de1e AB test the friends view, added descriptions for all the astrid labs features 13 years ago
Tim Su e797764145 Merge pull request #179 from rip238/patch-1 
Translated some strings
 13 years ago
Tim Su 328128f443 More kindle fixes - TagUpdatesFragment looks super ugly, and ActFmLoginActivity remove google login 13 years ago
Sam Bosley 375de2ffca Fixed a layout bug with the person fragment, use a custom icon for the my shared tasks filter 13 years ago
Sam Bosley 6b56710dc8 Added a subtitle to Astrid Labs preference 13 years ago
Sam Bosley 4dd8bff567 Added a default people filter that shows all the tasks you have shared with anyone 13 years ago
rip238 328d66f31b Translated some strings 13 years ago
Sam Bosley 4c845f2dfb Added icons for the various people buttons 13 years ago
Sam Bosley 63d6605898 Updated string for empty list in people view 13 years ago
Sam Bosley 86ec3295b6 Basic version of toggling to people mode on tablet working 13 years ago
Sam Bosley 02f25f7e1f Polish to main menu size 13 years ago
Sam Bosley 1896fe89c7 Cleanup and polish to quick add bar in people view 13 years ago
Sam Bosley 0ed664a663 Commit all the things--mostly working people view 13 years ago
Sam Bosley fea213a7a8 Fixed a null pointer in missed call activity when encouragements disabled 13 years ago
Tim Su e47b34a998 Delete string entries that changed from original template 13 years ago
Tim Su 0f45a4d28f Import XML files from .po 13 years ago
Sam Bosley 621491478a More polish 13 years ago
Sam Bosley b9dcb3fcda Polish with Henry 13 years ago
Sam Bosley a2153ea237 Fixed bugs in widget not using customExtras 13 years ago
Sam Bosley cd28d408e2 Polish and fixes to missed call notif 13 years ago
Sam Bosley cf68f97aa4 Random strings for missed call dialog 13 years ago
Sam Bosley c469c9afd2 Fixed picture loading stuff 13 years ago
Sam Bosley 48f0ec9ece Polished the missed call dialog 13 years ago
Sam Bosley 29555b08a4 Picture in missed call view, polish close button 13 years ago
Sam Bosley 9fe310972f Don't title the missed call schedule dialog 'snooze' 13 years ago
Sam Bosley 0e613f9017 Wire up call later button to create tasks with the appropriate due time 13 years ago
Sam Bosley b772c79bf9 More polish to missed call dialog, preference to activate/deactivate: 13 years ago
Sam Bosley e19fa0819c More awesomeness. All that's left is the snooze scheduling 13 years ago
Sam Bosley 29c41bcffe Displaying the activity in most of its awesomeness 13 years ago
Sam Bosley 453ecbed4d Removed a bunch of unnecessary stuff related to toasting on tag save 13 years ago
Sam Bosley 32bd06219a Replaced the Performance preferences with 'Astrid Labs', where users can go to enable/disable features that are being AB tested 13 years ago
Sam Bosley 9519517073 Made swipe between lists disableable 13 years ago
Sam Bosley 529bb2fcba Added a prefrence to control how aggressive the fragment pager is with preloading task lists 13 years ago
sbosley 35734273f0 Merge pull request #175 from sbosley/120413_sb_comment_links 
In comments, make links to tasks.
 13 years ago
Sam Bosley 279713cf48 Added comment for translators, use $ for special token 13 years ago
Sam Bosley bec80c0b34 Send support button to blog faq, forums button to crittercism 13 years ago
Sam Bosley 2745079599 Awesome new stuff for putting links in comments. Works for tasks, can adapt to things like tags/users in the future 13 years ago
Sam Bosley be6b1310e1 Make clicking on task links in comments edit task 13 years ago
Sam Bosley 6701e46bfb Good progress on linkifying task titles in comments 13 years ago
Sam Bosley dc9a6b2fed Fix some arguments in update format strings 13 years ago
Sam Bosley f7da0c8233 Refixed people picker row heights 13 years ago
Sam Bosley ea4b8ecbd1 Fixed a string with backwards format args 13 years ago
Sam Bosley 4477ca55ca Don't show astrid in reminder dialog when that preference is turned off 13 years ago
Sam Bosley 668a23ad45 Adjusted contact adapter row size 13 years ago
Sam Bosley 7f07d08af4 Restore the progress bar to task comments view 13 years ago
Tim Su 0f13cf01f7 Merge pull request #174 from sbosley/120302_sb_swipe_lists_subtasks 
Swipe between lists! Woooo
 13 years ago
Tim Su 076eeee13c Merge pull request #173 from sbosley/120405_sb_pick_contact 
Contacts picker!
 13 years ago
Sam Bosley af9345c057 Merge swipe between lists branch with changes from master 13 years ago
Sam Bosley 6cee41ac9a Restored progress bar to activity fragment 13 years ago
Sam Bosley 85efa99f2b Better plus button in the people picker 13 years ago
Sam Bosley 197fe02be4 Sectioned headers in the assignment picker. booyah 13 years ago
Sam Bosley e92c2ef048 Polished assignment autocomplete field 13 years ago
Sam Bosley 5ede134e9f Added contact chooser option to people picker 13 years ago
Sam Bosley 6168534e0a Better size for assigned picker rows 13 years ago
Sam Bosley c8c170ed7b First draft of contact picking 13 years ago
Sam Bosley d0b18d3596 Make activity feed less vague 13 years ago
Sam Bosley 3b7c9a0437 Updated a string to prevent bad word wrapping 13 years ago
Sam Bosley 4c89881956 Use 'someone 
' instead of 'you' when no name available for comment
 13 years ago
Sam Bosley d536cdbf1e Fixed a crash that could occur if gtasks encounter auth problems during a background sync 13 years ago
Sam Bosley b65d12fb3e Fixed an android 2.1 widget bug by using multiple layouts. Better solution? 13 years ago
Sam Bosley e119dbbc93 Make the locale edit alerts screen always dark themed: 13 years ago
Sam Bosley 4ed70def25 Option to report last error in sync prefs 13 years ago
Sam Bosley 22776b7928 Legacy widget style 13 years ago
Sam Bosley 8e7a8f5c97 Added preference for choosing widget theme 13 years ago
Sam Bosley a0209dd79e Style tweaks to AddOnActivity, make home button work in it 13 years ago
Tim Su 1d215de036 Fix for height of filter adapter text in Amazon kindle being cut off 13 years ago
sbosley a1e71d9bbb Merge pull request #163 from sbosley/120312_sb_sqlite_exception 
Added code to catch SQLiteException errors like missing columns
 13 years ago
Sam Bosley 394f06ba58 More copy update 13 years ago
Sam Bosley 8fc440a896 Updated copy 13 years ago
Sam Bosley 85e503c043 All new widget design to match app theme and style 13 years ago
Sam Bosley cce6f2c0e7 Added code to catch SQLiteException errors like missing columns and recommend a reinstall 13 years ago
Jon Paris 33b0ca2bd3 updated the search icons 13 years ago
Sam Bosley 53fcdbe80b Image placeholders to make it easier for Jon to replace them 13 years ago
Sam Bosley 763f06a38a Killed hardware acceleration, added search menu item, moved some menu items to settings 13 years ago
Sam Bosley 8d812060cb Use the correct hint string for new list name field 13 years ago
Sam Bosley 71f071e363 Fixed text color issue when adding lists from task edit 13 years ago
Sam Bosley bf9ed3d039 Use different title in task edit when task is a new task 13 years ago
Sam Bosley 09d5f6918c Fixed a string in repeat reschedule dialog 13 years ago
Tim Su 2e7be1c7b2 Imported XML strings from .po files. For some reason the API strings are still in the main project? 13 years ago
Sam Bosley 760d7da160 Merge remote-tracking branch 'upstream/master' into 120302_sb_swipe_lists_subtasks 13 years ago
Sam Bosley 0a9e9023d0 Fixed locale theme issues 13 years ago
Sam Bosley cc80afcfef Make main menu popover intercept key events so that menu button can dismiss it 13 years ago
Tim Su cc25b593b4 Add switching logic via ThemeService to identify light and dark drawables to use. Renamed up filters and plugins icons to be more identificatory. 13 years ago
Tim Su 328034fbdf Fix for amazon new and used ellipsizing the actual price 13 years ago
Jon Paris d66269d5e6 updated all the icons in the main nav and list popover to be consistent and have both light and dark themes 13 years ago
Sam Bosley 2d1f1d1198 Renamed and reorganized menu images for easier replacing 13 years ago
Sam Bosley 0d6d212743 Fix for one language having incomplete string arrays 13 years ago
Sam Bosley 09691c2176 Removed unused intro_click_prompt string to fix strings unit test 13 years ago
Sam Bosley 0449ab5bf3 Removed unused intro task strings, fixed a crash in push on save when checking for those strings 13 years ago
Sam Bosley 1514568de4 Polished custom menu icons for all screen sizes and layouts (images still unpolished) 13 years ago
Sam Bosley 2b930a7a0e Populate dropdown menu with options menu items 13 years ago
Sam Bosley e67a385a17 Started refactoring MainMenuPopover 13 years ago
Tim Su 4389118e91 Killed intro strings 13 years ago
Jon Paris eea868e4bf update menu buttons per Sam's request 13 years ago
Sam Bosley 358bdbaf38 Fixed a crash in FilterShortcutActivity 13 years ago
Jon Paris 22979da4f3 update menu buttons per Sam's request 13 years ago
Sam Bosley 5d441d4918 Fixed a crash in FilterShortcutActivity 13 years ago
Sam Bosley ed6984e58d Merge remote-tracking branch 'origin/120221_sb_swipe_between_lists' into 120221_sb_swipe_between_lists 13 years ago
Tim Su d30e7b9627 Fix formatstring issues caught by launchpad 13 years ago
Tim Su 3d06bed032 Filter shortcut activity for creating desktop shortcuts of Astrid filters and lists. 13 years ago
Tim Su b589a25e32 New translation system build on android2po. Includes bin/a2po script, locales folders. 13 years ago
Sam Bosley 054b8b4f4f Merge remote-tracking branch 'upstream/master' into 120221_sb_swipe_between_lists 
Conflicts:
	astrid/src/com/todoroo/astrid/activity/AstridActivity.java
	astrid/src/com/todoroo/astrid/activity/TaskListFragment.java

Merge upstream/master
 13 years ago