0
0
mirror of https://github.com/ankidroid/Anki-Android.git synced 2024-09-20 12:02:16 +02:00
Commit Graph

6109 Commits

Author SHA1 Message Date
timrae
6cb55bd53e Fix notification not getting dismissed correctly on startup 2014-10-27 10:05:04 +09:00
timrae
ed06954c8c Fix error and crash when importing apkgs with special characters 2014-10-27 03:58:29 +09:00
timrae
e34ebb9f56 Fix import of apkg not updating deck counts 2014-10-27 03:30:30 +09:00
timrae
0758533a02 Escape special characters in deck names when exporting 2014-10-27 02:22:39 +09:00
timrae
969f80e85f Fix crash forcing full sync when collection closed 2014-10-27 01:56:57 +09:00
timrae
d269946062 Fix issue 2252 in tags editor 2014-10-27 01:56:07 +09:00
Tim Rae
e8c6e5be8c Merge pull request #577 from agrueneberg/remove-unused-currdid
Remove unused currDid variable
2014-10-25 13:06:42 +09:00
Alexander Grüneberg
57447b6639 Remove unused currDid variable. 2014-10-24 15:49:17 -05:00
Nicolas Raoul
fe7e17e509 Bumped version to 2.3beta42
@branch-specific
2014-10-25 01:47:59 +09:00
Nicolas Raoul
f4eeac1ec4 Merge pull request #576 from timrae/escapeImages
Escape images to fix issue 2345
2014-10-25 00:46:13 +09:00
timrae
53dd088dfc Escape images to fix issue 2345 2014-10-24 23:53:30 +09:00
Nicolas Raoul
20e76be99a Bumped version to 2.3beta41
@branch-specific
2014-10-24 17:40:54 +09:00
Nicolas Raoul
b461511ce6 Updated strings from Crowdin 2014-10-24 17:33:43 +09:00
Nicolas Raoul
4dd503985c Merge pull request #575 from timrae/cleanupStudyOptionsFragment
Clean up building of study options fragment
2014-10-24 17:21:28 +09:00
timrae
404fe52531 Clean up building of study options fragment 2014-10-24 17:12:37 +09:00
Nicolas Raoul
b3d1349503 Bumped version to 2.3beta40
@branch-specific
2014-10-24 11:51:02 +09:00
Nicolas Raoul
820bcb075c Updated strings from Crowdin 2014-10-24 11:43:40 +09:00
Nicolas Raoul
3e88904423 Merge pull request #574 from timrae/tabletOnResume
Fix tablet issue 2336
2014-10-24 11:42:10 +09:00
timrae
b86f6cefe9 Fix non-dismissing DatabaseErrorDialog 2014-10-24 10:03:52 +09:00
timrae
ce9446b552 Prevent Collection from loading when sync in progress 2014-10-24 10:03:24 +09:00
timrae
530b68f0e0 Fix double reloading of counts via onResume of StudyOptionsFragment 2014-10-24 07:25:32 +09:00
Nicolas Raoul
1212aeb5ab Merge pull request #573 from timrae/ForceFullSync
Move force full sync to top of advanced prefs
2014-10-24 01:17:10 +09:00
timrae
e97b9a8ab9 Move force full sync to top of advanced prefs 2014-10-24 00:40:40 +09:00
Nicolas Raoul
381cd72e0e Merge pull request #572 from timrae/ForceFullSync
Add full sync option
2014-10-23 20:40:23 +09:00
timrae
dcf7fc7fb9 Add full sync option 2014-10-23 19:58:30 +09:00
Nicolas Raoul
79cdb22308 Bumped version to 2.3beta39
@branch-specific
2014-10-23 18:00:06 +09:00
Nicolas Raoul
83a3caa659 Merge branch 'release-2.3' of github.com:ankidroid/Anki-Android into release-2.3 2014-10-23 17:57:31 +09:00
Nicolas Raoul
f5b4e8b850 Bumped version to 2.3beta38
@branch-specific
2014-10-23 17:52:29 +09:00
Nicolas Raoul
9ea65529b7 Merge pull request #571 from timrae/sanityCheckDialog
Remove unnecessary modSchema() from sanity check dialogs
2014-10-23 17:52:19 +09:00
timrae
369c372661 Remove unnecessary modSchema() from sanity check dialogs 2014-10-23 17:48:56 +09:00
Nicolas Raoul
427282cf92 Merge pull request #570 from timrae/NoChangesSyncTitle
Don't show "sync error" as Dialog Title when no changes
2014-10-23 17:08:39 +09:00
timrae
52a3671a66 Don't show "sync error" as Dialog Title when no changes 2014-10-23 17:03:14 +09:00
Nicolas Raoul
a2cd91cac0 Bumped version to 2.3beta37
@branch-specific
2014-10-23 16:38:19 +09:00
Nicolas Raoul
a8317e95d9 Merge pull request #569 from timrae/NotificationIssues2
Fine tuning of restarting activities
2014-10-23 16:17:22 +09:00
timrae
cde218287a Don't crash when loadCounts() called while Activity has been stopped 2014-10-23 16:06:31 +09:00
timrae
f362d69ea8 Make sure to clear task when starting DeckPicker to prevent multiple activities 2014-10-23 15:52:06 +09:00
Nicolas Raoul
155ce7beba Bumped version to 2.3beta36
@branch-specific
2014-10-23 15:19:28 +09:00
timrae
16b0de84f3 Use empty bundle instead of passing extras into intent when reloading activity 2014-10-23 15:16:12 +09:00
Nicolas Raoul
be8d37c56c Merge branch 'release-2.3' of github.com:ankidroid/Anki-Android into release-2.3 2014-10-23 14:34:16 +09:00
Nicolas Raoul
78470f4262 Bumped version to 2.3beta35
@branch-specific
2014-10-23 14:10:00 +09:00
Nicolas Raoul
fa11d22cb5 Merge pull request #568 from timrae/SyncNotificationIssues
Fix double reloading on sync in tablet mode
2014-10-23 14:09:43 +09:00
timrae
01b46e823a Don't select deck in fragment mode after sync, as this is now taken care of by restarting the activity 2014-10-23 13:33:46 +09:00
timrae
a0e49e6b84 Show full notification message on Android 4.1+ 2014-10-23 13:26:12 +09:00
Nicolas Raoul
b9cbca6b77 Merge pull request #567 from timrae/StudyOptionsReloadCrash2
Add null check to addExtras when reloading activity
2014-10-23 12:45:08 +09:00
timrae
f79215a4c1 Add null check to addExtras when reloading activity 2014-10-23 12:43:02 +09:00
Nicolas Raoul
aaf4da4798 Bumped version to 2.3beta34
@branch-specific
2014-10-23 11:33:50 +09:00
Nicolas Raoul
9d3a32aa86 Updated strings from Crowdin 2014-10-23 11:24:02 +09:00
Nicolas Raoul
86cd670b23 Merge pull request #566 from timrae/StudyOptionsReloadCrash
Fix crash when changing settings from StudyOptions screen
2014-10-23 11:22:24 +09:00
timrae
ed0f703e50 Fix crash when changing settings from StudyOptions screen 2014-10-23 10:46:21 +09:00
Nicolas Raoul
f047cb8394 Bumped version to 2.3beta33
@branch-specific
2014-10-23 10:37:34 +09:00