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

6279 Commits

Author SHA1 Message Date
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
Tim Rae
4751d6f3e4 Merge pull request #565 from agrueneberg/fix-shortcuts
Fix some / add more keyboard shortcuts
2014-10-23 10:02:58 +09:00
Flavio Lerda
85970f91c6 Skipped 'd63cb81' from release-2.3: Bumped version to 2.3beta32
@branch-specific
2014-10-23 00:13:17 +01:00
Flavio Lerda
aca6d2a402 Merged '45730b4' from release-2.3: 46b50ca,9c7705b
Commit '46b50ca'
Fix crash in StudyOptionsFragment.onResume() when col closed

Commit '9c7705b'
Fix showcaseview position in tablets
2014-10-23 00:13:17 +01:00
Flavio Lerda
6c87a73715 Skipped '7d5c80a' from release-2.3: Bumped version to 2.3beta31
@branch-specific
2014-10-23 00:13:17 +01:00
Flavio Lerda
59554c2331 Merged 'd19546b' from release-2.3: 88850ae,ec81bdf
Commit '88850ae'
Use SlidingTabLayout instead of ActionBarTabs for Statistics

Commit 'ec81bdf'
Fix crash when changing language etc in Statistics
2014-10-23 00:13:17 +01:00
Flavio Lerda
2091908365 Skipped 'f270d43' from release-2.3: Bumped version to 2.3beta30
@branch-specific
2014-10-23 00:13:17 +01:00
Flavio Lerda
fd6121f8ba Merged 'a9d98e5' from release-2.3: Fix sync error introduced in beta29 2014-10-23 00:13:16 +01:00
Flavio Lerda
0555130c5a Merged 'dcb0987' from release-2.3: Fix wrong ND indicator state on first run. 2014-10-23 00:13:16 +01:00
Alexander Grüneberg
bbd696b5f4 Add more shortcuts: space to answer, r to replay sounds. 2014-10-22 16:34:02 -05:00
Alexander Grüneberg
694eed2e65 Only allow (1,2,3,4) shortcuts if answer side is shown. 2014-10-22 16:33:25 -05:00
Nicolas Raoul
d63cb8132b Bumped version to 2.3beta32
@branch-specific
2014-10-23 00:45:21 +09:00
Nicolas Raoul
45730b43d0 Merge pull request #564 from timrae/StudyOptionsFragmentCrash
Fix some issues on tablet
2014-10-23 00:43:34 +09:00
timrae
9c7705b0fc Fix showcaseview position in tablets 2014-10-23 00:34:14 +09:00
timrae
46b50ca655 Fix crash in StudyOptionsFragment.onResume() when col closed 2014-10-23 00:05:30 +09:00
Nicolas Raoul
7d5c80a36c Bumped version to 2.3beta31
@branch-specific
2014-10-22 22:46:16 +09:00
Nicolas Raoul
d19546beb4 Merge pull request #563 from timrae/statisticsFixes
Statistics fixes
2014-10-22 22:42:23 +09:00
timrae
ec81bdfa9b Fix crash when changing language etc in Statistics 2014-10-22 22:30:28 +09:00
timrae
88850ae283 Use SlidingTabLayout instead of ActionBarTabs for Statistics 2014-10-22 22:30:00 +09:00
Nicolas Raoul
f270d43e26 Bumped version to 2.3beta30
@branch-specific
2014-10-22 09:57:42 +09:00
Nicolas Raoul
a9d98e59d7 Merge pull request #561 from timrae/beta29fix
Fix sync error introduced in beta29
2014-10-22 09:56:27 +09:00
Tim Rae
dcb0987e57 Merge pull request #562 from agrueneberg/fix-wrong-nd-indicator-state-on-first-run
Fix wrong ND indicator state on first run
2014-10-22 09:44:39 +09:00