timrae
925174f990
Skipped 'bb879e8' from hotfix-2.3.1: Bumped version to 2.3.1beta13
...
@branch-specific
2014-11-07 16:18:09 +09:00
timrae
f966b680e4
Merged '1821321' from hotfix-2.3.1: Fix bug opening apkg files
...
I was only sending requests to show import dialog when the apkg was sent via content provider
2014-11-07 16:18:09 +09:00
timrae
bb3549bbbc
Skipped '2c8b663' from hotfix-2.3.1: Bumped version to 2.3.1beta12
...
@branch-specific
2014-11-07 16:18:08 +09:00
timrae
30bf2ead43
Merged 'cb72b62' from hotfix-2.3.1: Updated strings from Crowdin
2014-11-07 16:18:08 +09:00
timrae
f3abf53277
Merged '7059967' from hotfix-2.3.1: Fix show answer on whitespace in type mode.
2014-11-07 16:18:08 +09:00
timrae
4a2edbde55
localization line endings
2014-11-06 18:52:25 +09:00
Nicolas Raoul
bb879e8b04
Bumped version to 2.3.1beta13
...
@branch-specific
2014-11-06 15:29:40 +09:00
Nicolas Raoul
18213219cf
Merge pull request #615 from timrae/fixApkgImportFromFile
...
Fix bug opening apkg files
2014-11-06 15:20:35 +09:00
timrae
d4a77f46ce
Fix bug opening apkg files
...
I was only sending requests to show import dialog when the apkg was sent via content provider
2014-11-06 15:11:16 +09:00
Nicolas Raoul
ba0338a750
Merge pull request #611 from timrae/noteTypeChange
...
Note type change
2014-11-05 16:19:12 +09:00
timrae
a4ecc3bc64
Add ability to change note type of existing notes in note editor
2014-11-05 16:11:47 +09:00
Nicolas Raoul
2c8b6634f3
Bumped version to 2.3.1beta12
...
@branch-specific
2014-11-05 15:21:34 +09:00
Nicolas Raoul
cb72b624cf
Updated strings from Crowdin
2014-11-05 14:47:09 +09:00
Nicolas Raoul
7059967dfd
Merge pull request #610 from agrueneberg/fix-answer-on-space-in-type-mode
...
Fix show answer on whitespace in type mode
2014-11-05 14:44:54 +09:00
Alexander Grüneberg
205f8efc9e
Fix show answer on whitespace in type mode.
2014-11-04 23:30:24 -06:00
timrae
139a84bf0d
Add list of card names to note editor
2014-11-05 14:23:36 +09:00
timrae
3cb16acbe6
Rename card_editor.xml to note_editor.xml
2014-11-05 14:23:35 +09:00
timrae
1138cd44b7
Skipped '65bf51a' from hotfix-2.3.1: Update 13-newfeatures.xml
...
@branch-specific
2014-11-05 12:55:16 +09:00
timrae
ed104eb1c8
Skipped '06194bd' from hotfix-2.3.1: Bumped version to 2.3.1beta11
...
@branch-specific
2014-11-05 12:54:58 +09:00
timrae
06ed1bea04
Merged '0fe275d' from hotfix-2.3.1: Updated strings from Crowdin
2014-11-05 12:54:49 +09:00
timrae
b8185e1932
Merged '7739283' from hotfix-2.3.1: Fix bug in APKG export
2014-11-05 12:54:40 +09:00
timrae
b7ece141bb
Skipped '1580a0c' from hotfix-2.3.1: Bumped version to 2.3.1beta10
...
@branch-specific
2014-11-05 12:54:32 +09:00
timrae
9493544e7b
Merged '4dddbe8' from hotfix-2.3.1: Fix bug where modSchema() wasn't getting called properly on sanity check error
2014-11-05 12:54:23 +09:00
timrae
bd7e73e2a1
Merged 'b9c3ed5' from hotfix-2.3.1: Don't try to upload media files that have been deleted externally
2014-11-05 12:54:14 +09:00
timrae
a9f0d744fc
Merged '782dc56' from hotfix-2.3.1: Catch timeout exceptions on login
2014-11-05 12:54:06 +09:00
timrae
045eb1b952
Merged 'e02c485' from hotfix-2.3.1: Force a full sync when upgrading from version before 2.3.1beta8
2014-11-05 12:53:57 +09:00
timrae
b434f6e546
Skipped 'e334d1a' from hotfix-2.3.1: Bumped version to 2.3.1beta9
...
@branch-specific
2014-11-05 12:53:46 +09:00
timrae
aeb8d91185
Merged 'a9cde6a' from hotfix-2.3.1: Updated strings from Crowdin
2014-11-05 12:53:29 +09:00
timrae
c2b4066b1e
Skipped 'cea5eb0' from hotfix-2.3.1: Update 13-newfeatures.xml
2014-11-05 12:53:09 +09:00
timrae
a91a84ea7f
Merged 'f9ffb23' from hotfix-2.3.1: Add missing built-in user confirmation functionality to modSchema()
2014-11-05 12:52:52 +09:00
timrae
e5e2bccd8f
Skipped 'cd24ab4' from hotfix-2.3.1: Bumped version to 2.3.1beta8
...
@branch-specific
2014-11-05 12:49:55 +09:00
timrae
54ec591630
Merged '9c703dc' from hotfix-2.3.1: fix long-standing bug in syncer.chunk()
...
chunk() was failing to gather anything but the first batch
of changes as the logic to determine whether there were
more changes was wrong.
with the recent change to a 250 chunk size, any users
who changed more than 250 cards on AD and synced may have
collections that don't match what's on AnkiWeb, so
for the 2.3.1 release I recommend you advise users to force
a full sync to correct any possible problems
2014-11-05 12:49:43 +09:00
timrae
69f4a80637
Skipped 'bf2e2fa' from hotfix-2.3.1: Bumped version to 2.3.1beta6
...
@branch-specific
2014-11-05 12:49:28 +09:00
timrae
8cc5c7ee9a
Skipped '1a4bd5f' from hotfix-2.3.1: Add back red icons
2014-11-05 12:49:11 +09:00
timrae
7eb05eadcb
Merged 'b8be47f' from hotfix-2.3.1: Convert custom study dialogs to DialogFragment
2014-11-05 12:48:39 +09:00
timrae
67547f6ae4
Skipped '899f557' from hotfix-2.3.1: Bumped version to 2.3.1beta4
...
@branch-specific
2014-11-05 12:46:24 +09:00
timrae
5b42051ed9
Merged '16b61c4' from hotfix-2.3.1: Fix bug where filtered deck controls not shown when changing to custom study
2014-11-05 12:46:13 +09:00
timrae
a0fea529e5
Skipped '296ee49' from hotfix-2.3.1: Bumped version to 2.3.1beta3
...
@branch-specific
2014-11-05 12:45:57 +09:00
timrae
c8439422fb
Merge commit '7db8102' into develop
...
Conflicts:
res/values-fi/01-core.xml
res/values-fi/02-strings.xml
res/values-fi/03-dialogs.xml
2014-11-05 12:45:21 +09:00
timrae
1be5979403
Skipped '4b8001f' from hotfix-2.3.1: Bumped version to 2.3.1beta2
...
@branch-specific
2014-11-05 12:40:23 +09:00
timrae
ee6609571e
Merged '07d57d4' from hotfix-2.3.1: MM Editor: Only delete temporary media when new path is different from old path
2014-11-05 12:40:13 +09:00
timrae
e01d3bd623
Merged 'cd29c5f' from hotfix-2.3.1: Use local files when changing icon to blue
2014-11-05 12:40:03 +09:00
timrae
bc23d8729d
Merged 'f33430a' from hotfix-2.3.1: add icons to marketing folder
2014-11-05 12:38:44 +09:00
timrae
ae05d845ed
Merged 'bc803e4' from hotfix-2.3.1: Make back button behave consistently in browser search bar
2014-11-05 12:38:31 +09:00
timrae
24d3b78163
Merged '5b1a8b6' from hotfix-2.3.1: Fix crash when closing preferences
2014-11-05 12:38:22 +09:00
timrae
32341f5799
Skipped '0c312fd' from hotfix-2.3.1: Bumped version to 2.3.1beta1
...
@branch-specific
2014-11-05 12:38:10 +09:00
timrae
e9a4495e59
Skipped '9c55caa' from hotfix-2.3.1: Update 13-newfeatures.xml
...
Add note to new features list
2014-11-05 12:37:39 +09:00
timrae
6ab5972fc7
Merged '18c0f74' from hotfix-2.3.1: Fix escaping of media when it's on a remote server
2014-11-05 12:36:27 +09:00
timrae
4687997846
Merged '8dd0e4c' from hotfix-2.3.1: Update 16-multimedia-editor.xml
...
Fix spelling error
2014-11-05 12:36:02 +09:00
timrae
0f2acd4685
Merged 'f5cb752' from hotfix-2.3.1: One commit with GLOSBE fixes
2014-11-05 12:35:51 +09:00
