archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
3,844 Commits
22 Branches
386 Tags
141 MiB
14.9
main
renovate/fastlane-2.x-lockfile
renovate/ruby-4.x
renovate/major-azure-ad-microsoft-authentication-library-for-android-monorepo
renovate/major-firebase
renovate/compose
renovate/com.android.billingclient-billing-ktx-8.x
renovate/dev.zacsweers.redacted-1.x
renovate/grpc-java-monorepo
renovate/androidx.compose.ui-ui-tooling-preview-android-1.x
renovate/kotlin
renovate/google.oauth2
renovate/azure-ad-microsoft-authentication-library-for-android-monorepo
renovate/material
update_actions
renovate/com.android.billingclient-billing-ktx-7.x
first_day_of_week
atd_image
remove_adapters
gtask_related_email
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
14.0
14.0.1
14.1
14.1.1
14.2
14.2.1
14.3
14.3.1
14.4
14.4.1
14.4.2
14.4.3
14.4.4
14.4.5
14.4.6
14.4.7
14.4.8
14.5
14.5.1
14.5.2
14.5.3
14.5.4
14.6
14.6.1
14.6.2
14.7
14.7.1
14.7.2
14.7.3
14.7.4
14.8
14.8.1
14.8.2
14.8.3
14.8.4
14.8.5
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 'c943fd1f12'
${ noResults }
Commit Graph

417 Commits (c943fd1f126c94dea05586e2972dbfb054c4d139)

Author SHA1 Message Date
Tim Su 630f842301 Version bump 16 years ago
Tim Su 0fdc38c7cd Debuggable = true 16 years ago
Tim Su a4340a5acd Fixed widget update wrong activity getting called after configure 16 years ago
Tim Su f50e1f6811 now the 4x4 widget works 16 years ago
Tim Su 24e1aa70f1 Consolidated three widget configuration classes into one 16 years ago
Tim Su e36b5d2c94 turned off scary permissions for gtasks since no gtasks yet 16 years ago
Tim Su 7d0b986d98 turned on gtasks and widget 16 years ago
Tim Su a20f0b008a Commented out google tasks, version bump for market release 16 years ago
Tim Su 9a977e0129 Google tasks login thing 16 years ago
Tim Su 6d127a8071 Added a swipe listener to touch list view, extended gtasks to use it 16 years ago
Tim Su 48e42f910e Manual merge of improvements from split-out gtasks project and our current branch 16 years ago
Tim Su a85ba5571d Revert "Removed gtasks plugin into its own project" 
This reverts commit 84fbfc1cbd.
 16 years ago
Tim Su e030d23a6f Started work on draggable task list activity by separating out task list body from task list activity, pulling in cwac TouchListView class (license: APLv2) 16 years ago
Tim Su 84fbfc1cbd Removed gtasks plugin into its own project 16 years ago
Tim Su d2d4f8150b Imported auth manager and account chooser code from Google MyTracks (Apache License). Wired up gtasks to use auth manager. Modern seems to work but Old does not. 16 years ago
Tim Su de8bff5b81 Merge branch 'producteev-custom-filters-2' of git://192.168.10.106/astrid 16 years ago
Joshua Ball cb407bbd53 Producteev custom filters. 16 years ago
Joshua Ball 11c30a522c API-ifying custom filter criteria. 
Moving tag custom filter criteria into their
own exposer.
 16 years ago
Tim Su 696c8cd4c7 Now able to synchronize a google task list successfully. Some kinks to work out. 16 years ago
Tim Su bfc7655d6d Merge branch 'gtasks' 
Conflicts:
	astrid/src/com/todoroo/astrid/service/AstridDependencyInjector.java
 16 years ago
Tim Su bfa25cba4e Merge branch 'rename-delete-tag' of git://192.168.10.106/astrid 16 years ago
Joshua Ball 761aa94080 Adding ability to rename and delete tags. 16 years ago
Tim Su 4cc9829e8c Version bump again, since the last one was released with debugging options 16 years ago
Tim Su 1e9cda7aaa Merge branch 'master' into gtasks 16 years ago
Tim Su d0e2527ca9 3.3.5 version bump 16 years ago
Tim Su 95621e597c First pass at gtasks sync provider 16 years ago
Tim Su 968ccc9fe4 version bump 16 years ago
Tim Su d438ab4de0 Bumped Astrid version to push out an Astrid 3.3 release with cleaner caching logic and no debug statements 16 years ago
Tim Su df942e57ba changed ordering of actions to up right left down 16 years ago
Tim Su 459009f39c Refactored task adapter add on manager into own class, fixed a bug with detail loading, updated task details to not use broadcast receiver, added skeleton google order actions 16 years ago
Tim Su 927ba61e5a Added indentation action and unit test 16 years ago
Tim Su 1d5e7ef477 Added gtasks preferences, bug fixes to get detail exposer working 16 years ago
Tim Su 2c6400ed89 Astrid 3.3.2 - fixes edit button tap jumps to top of list 16 years ago
Tim Su 7fe8f6a481 Version bump, make it so that invalidating the data set preserves scroll location 16 years ago
Tim Su f0aba05d43 Added a version descriptor 16 years ago
Tim Su 1d406bb292 Version bump - Astrid 3.3 16 years ago
Tim Su ee303ab1f4 Fixing widget not starting, fixing bug with custom filter activity and decorations not loading correctly 16 years ago
Tim Su 13e69cc004 temporary disable of pp widgets in order to make a release 16 years ago
Tim Su 9598ba52d4 Moving reminder scheduling into a background service to prevent ANR dialogs 16 years ago
Tim Su c918f251b4 4x2 widget beta... did the old widget break? 16 years ago
Tim Su 8c2d742336 Removed some cruft 16 years ago
Tim Su cc7bf20562 Made snooze time override other alarms, also created preference for new old-style snooze dialog 16 years ago
Tim Su da74bc73e2 Added drop shadow to buttons, updates to widget to fix bugs with completing tasks scrolled further down 16 years ago
Tim Su 4776e0e866 temporarily restoring rmilk into mainline astrid product for a bug fix release 16 years ago
Tim Su 597c2ea67f Initial big widget commit 16 years ago
Tim Su 12880c4508 Wrote a build.xml for Astrid that actually compiles the thing. 16 years ago
Tim Su be125eca89 Added an API for refreshing details 16 years ago
Tim Su 136135cfd0 Official API support for settings categories 16 years ago
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
 16 years ago
Tim Su 3e57703911 Fixed up bugs in reminders that would cause them to go off continually. Version bumped to 3.2.7 16 years ago
Tim Su e129443c9d Version bump and upgrade message 16 years ago
Tim Su 5934d21d4a finished up Sync action 16 years ago
Tim Su 939bb9d5af Merge remote branch 'origin/master' 
Conflicts:
	astrid/plugin-src/com/todoroo/astrid/producteev/sync/ProducteevSyncProvider.java
 16 years ago
Tim Su 8bd838be50 Made slide animations quicker, started work on sync provider API 16 years ago
Tim Su adea1b3126 AST-246 - caching task details 16 years ago
Tim Su 120613d067 Fix for AS-299 - notifications don't open up the right page and instead re-use the old notification. There were bugs upon bugs upon bugs! 16 years ago
Tim Su de28c8f072 Renamed permissions, fixed a bug with Field class 16 years ago
Tim Su 0b77d19f7d Now passing the first of the content provider unit tests 16 years ago
Arne Jans 8b084c286f first version of notifiers for producteev-worklog to show acitivites/shownotifications since last sync 16 years ago
Tim Su ae0f20e192 Remoted a temporary property on ProducteevLoginActivity, change 'Notes' -> 'Add a Comment' in taskedit with producteev 16 years ago
Tim Su da7f87a4e0 Merge branch '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/MilkLoginActivity.java
	astrid/plugin-src/com/todoroo/astrid/rmilk/data/MilkDataService.java
	astrid/plugin-src/com/todoroo/astrid/rmilk/sync/RTMSyncProvider.java
	astrid/src/com/todoroo/astrid/service/StartupService.java
 16 years ago
Tim Su f9eb247ef6 Fix for RTM metadata not getting created at all. 16 years ago
Tim Su c74f251a91 Added Producteev startup receiver 16 years ago
Tim Su 4b647fdd97 Version bump, added upgrade message 16 years ago
Tim Su 057cfed7fc Real fix for npe when creating new tasks with producteev 16 years ago
Tim Su 3d2a67741e Removed plugin. 16 years ago
Tim Su c1821599f6 Fix for producteev control set crashing if data was null, got rid of all warnings in the project 16 years ago
Tim Su 3e2c86ff72 Updated changelog for 3.2, pushed it into version name. 16 years ago
Tim Su 08b810be2f Removed debuggable from manifest 16 years ago
Tim Su be75a93e9e Fix for AST-145 - due time stays same when editing due date 16 years ago
Tim Su 992eb9f746 Bump! 3.2.0 16 years ago
Tim Su 648139e458 Fix for AST-227 - launching app goes straight to filters, back from filters goes straight home 16 years ago
Tim Su 8c510d82a1 Merge remote branch 'origin/dev' 16 years ago
Arne Jans 8703283aea Added the ProducteevFilterExposer 16 years ago
Tim Su fe3dfb2fab AST-255 - when you create a widget, you get to select a filter. Awesome. 16 years ago
Tim Su 613516e06a Updates to metadata control sets to touch task last modified so they will be sync'd, fixed a NPE in PDV 16 years ago
Tim Su ea10f25814 Merge remote branch 'stingeraj/dev' into dev 16 years ago
Tim Su 616b7e4072 Working on fix for AST-227 - launching app goes straight to filters. Also adjusting appearance of filters button, and lastly, got deleting custom filters up 16 years ago
Tim Su 7cbc7478c0 got saved filter saving working. also updated the icon on the task list activity 16 years ago
Arne Jans b25e6c21ab Changed manifest, so Astrid works on 2.1-phones. Fixed Task-assignment- and dashboard-spinner on TaskEditActivity. Changes arent pushed to the server, dont know how. Here are 2 bugs left: responsible person and dashboard isnt saved with task (see Producteev-tasks and notes I gave you), and the responsible-spinner is too small, I dont know why.... 16 years ago
Arne Jans 49ac72b647 Merge remote branch 'upstream/dev' into dev 16 years ago
Arne Jans a9130b3ba4 first version of responsible- and dashboard-assignment. still needs testing and pushing assignment-changes to producteev-service. see TODO in ProducteevControlSet. 16 years ago
Tim Su 509c699251 Custom filter activity prototype 16 years ago
Tim Su 6784b38cb1 Styled up producteev login activity. Next need to hook up to actual api calls 16 years ago
Arne Jans 1b5a1f9d79 merged AndroidManifest.xml and added missing things for LoginActivity 16 years ago
Tim Su 44e0f00b38 Merge branch 'master' into dev 
Conflicts:
	astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
 16 years ago
Tim Su 98273affd6 Fixed reminder services leaving junk for all of the other services to deal with, bump version in Android manifest 16 years ago
Tim Su d54567c035 Alarm values auto-adjust when task repeats 16 years ago
Tim Su 3446d6c6db Fix for AST-199 - removed RTM branding from Astrid main menu 16 years ago
Tim Su 28b44894cd Fix for AST-158 - disallowed Astrid from moving to SD card because it breaks widget, service, and alarms 16 years ago
Tim Su a3e2738d91 Fix for a couple synchronization issues, created producteev background service 16 years ago
Tim Su 385db6235f Merge branch 'master' into dev 16 years ago
Tim Su af119a599d Version bump, updated upgrade message, and added weekday 16 years ago
Tim Su aa6f01e730 Fixed a bunch of producteev issues as we move forward 16 years ago
Tim Su 66300d4eb3 producteev preferences, created an abstract sync preferences 16 years ago
Tim Su 375bc26423 Powerpack by default, expiration in september, fixed alert dialog so it wouldn't crash 16 years ago
Tim Su 8ecde7feb4 bump 3.0.5 16 years ago
Tim Su f96963c2a1 Continued making upgrade a more pleasant process - now the task list auto refreshes after update, etc. 16 years ago
Tim Su 934ff46fbb bump 3.0.3 - created a legacy task list activity so users can use their old shortcut to launch Astrid 16 years ago
Tim Su 68f943ab38 Fixed a bunch of crashes experienced in the field. Bumped version to 3.0.2 16 years ago
Tim Su 757fb7798e Cleaned up errors in the logs 16 years ago
Tim Su f00e663bb1 Added punctuation to the addon screen, set a date in the upgrade service, bumped version. 16 years ago
Tim Su a53c6dca03 Fixed stupid bug where complete task then tap another task resets apperance. Also, now when you restore backed up tasks, task list auto refreshes 16 years ago
Tim Su 293788ae2f Updated the legacy com.timsu.astrid.tasksprovider provider 16 years ago
Tim Su 1624c8547d Fixed up locale plugin to check for add on: 16 years ago
Tim Su 29145c7b32 Cleaned up add on adapter and made it work. Next step is locale plugin. Also added some help to backup preferences 16 years ago
Tim Su 2735c80979 Added emtpy add-on activity, made links to it and made it pretty 16 years ago
Tim Su abb753d2ee Backup preferences, backup as a service 16 years ago
Tim Su 8082b94c2c Got export working, minor bug fixes 16 years ago
Tim Su b6ec30285b Initial work on backups plugin 16 years ago
Tim Su 728e1bb2f4 Fix for three issues 
- fling task adapter showed old junk
- timer would show wrong time when remoteview reinstantiated
- due date filter was wrong
 16 years ago
Tim Su a2ae7b9d36 Got snooze working, made notification activity look good. Also fixed some crashes 16 years ago
Tim Su 8f80a9a6c5 Added background synchronization for RTM 16 years ago
Tim Su 4c6d2edf48 Added by due date and importance filter, also fixed launch behavior of FLA 16 years ago
Tim Su 861bc9a4c9 Fixed up the little bugs in Locale. It works awesomely! 16 years ago
Tim Su 8d94011729 Got rid of legacy styles and strings, fixed it all up 16 years ago
Tim Su 50d2b56a3f Merge branch 'dev' of github.com:todoroo/astrid into dev 16 years ago
Tim Su a84e76d983 miiinor tweaks to timers 16 years ago
Tim Su 7f3f92eb63 Timers work. Task adapter cache is messy. 16 years ago
Tim Su fa84414676 Awesome! timer works like it should. No notification yet... 16 years ago
Tim Su 1a331afa62 Made the action exposer 16 years ago
Tim Su 8f757ac9fa First pass at task decorations, timer. Works but doesn't update. 16 years ago
Tim Su 95154ca51c Added gcal task complete listener, made period spinner actually do what it's supposed to. 16 years ago
Tim Su 14bb13f023 Fix for crashes with widget, milk data service, and reminders not getting set properly 16 years ago
Tim Su bfd8a80907 Fixed upgrade test, disabled xml exporter for now, fixed up filter list activity not to be so resistant to change 16 years ago
Tim Su ebe6249852 Made internal api task details way faster to load 16 years ago
Tim Su 27dbd7f198 broke stuff for the sake of tags (and notes? i dunno about notes) 16 years ago
Tim Su 34ee32f5dd Various improvements. All over, improvements. 16 years ago
Tim Su 8314bb97f7 Fix for AST-85 16 years ago
Tim Su da8dcc0432 Awesome better remember the milk 16 years ago
Tim Su cf75d057c1 Fixed some bugs to get Astrid launching, basic synchronization stuff. Still don't work, because of the crazy multi-db join we're doing... 16 years ago
Tim Su d03651c801 Response to user feedback: Moved edit activity stuff around, tweaked background gradient, updated filters to be more useful. 16 years ago
Tim Su 87fd8ca231 added repeat detail exposer, now repeat pushes hide until too 16 years ago
Tim Su 21ea97ed34 Fixed some warnings, pulled out repeat completion listener into it's own 
class, now handling "repeat after complete date", and cloning task.

Needs a unit test of course (of course!)
 16 years ago
Tim Su 8e02edab68 Repeats. woot 16 years ago
Tim Su eee441e9e3 Added RFC2445, got rid of min sdk level if not necessary 16 years ago
Tim Su a168ac5bab Newest Flurry 16 years ago
Tim Su 176c170628 allow astrid to be moved to sd card in froyo 16 years ago
Tim Su 7841448da3 fixed up widget so now application starts up without crashing. 16 years ago
Tim Su 734face4c2 got widget working. and fixed some bugs with it... 16 years ago
Tim Su d083f81c3e Renamed package, cleaned up preference libraries 16 years ago
Tim Su fd26639d33 Cosmetic fixes to checkbox size, made quick add add to the list itself, note detail exposer fixes 16 years ago
Tim Su 9253b4e911 notes plugin 16 years ago
Tim Su f01662689b Fixes to android launch modes, improvements to task sorting by default etc 16 years ago
Tim Su 508357fefb ok made default values work 4 reals 16 years ago
Tim Su 329f371020 Made searching work, fixed up goodies 16 years ago
Tim Su 8b85736976 added reminder preferences, fixed up various minor bugs with tests and real app 16 years ago
Tim Su 05234dde7f Merge branch '100616-replace-controllers' of ponyo into 100616-replace-controllers 
Conflicts:
	astrid/res/xml/preferences.xml
	astrid/res/xml/preferences_reminders.xml
 16 years ago
Tim Su 542bf22201 Fixing various bugs encountered during starting up... 16 years ago
Tim Su 1c9d4c1696 More progress in the effort of getting notifications working. 16 years ago
Tim Su 3cb2ed563e Updating reminders to use new stuff... 16 years ago
Tim Su 8bb4e95530 Removed some stuff that took up extra space, made the icon thing work well. 16 years ago
Tim Su 4f61c9b5a4 Fixed various minor usability issues. A lot more smooth now. 16 years ago
Tim Su acccf78cd0 Fixed minor bugs with delete not working, blank tasks being created 16 years ago
Tim Su 917cb8f7c4 Fixed up start up service, moved it out of legacy, deleted home activity, and fixed various bugs 16 years ago
Tim Su e06f60b95f Now got edit to work. yay! no saving tags, and no alerts. Still to do: due date stuff, urgency stuff 16 years ago
Tim Su fffc9f4a46 Fot filters working, with icons even. sweet action. 16 years ago
Tim Su c43ff1aea6 Made lots of changes in an attempt to clean stuff up 16 years ago
Tim Su c537ea95c8 Merge branch 'master' into 100616-replace-controllers 
Conflicts:
	astrid/AndroidManifest.xml
 16 years ago
Tim Su dd5e197871 Version bump -> 2.14.4 16 years ago
Tim Su 9225898806 Crazy Astrid 3 activity merged in. Does it work? not really. But it's cool that it's there. 16 years ago
Tim Su 0fd5a672ab Prep release for 2.14.4 - version bump and changelog 16 years ago
Tim Su fa0177c76d Fixed polish strings that were broken, addressing a potential NPE 16 years ago
Tim Su b11df0aa95 Fix for no astrid dependency injection in static block. 2.14.1 16 years ago
Tim Su 741a6246a6 Fixed crashes all around, created a changelist displayer in upgrade service 16 years ago
Tim Su f1b9d9e42c Merge of default-calendar branch in launchpad from Sami Salonen. (lp:~ssalonen/astrid/default-calendar) 16 years ago
Tim Su c7974868be Moved projects around. 16 years ago