Catch up merge from 2.0.1 into 2.1 #33
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…e I did a mistake when branching/pulling?
…eck (dae/anki c335ea2cee) - No real change, as we don't use aqt/models:_tmpNote() that uses this change - still I optimized a bit the Models.current() calls and added some javadoc
…an invalid status when unburied (dae/anki aefc58d5d5)
If the card count is not fetched correctly, we should fail the import.
Issue 1567: Handle failure to fetch card count.
Libanki update to anki v2.0.5
Merge from iniju
Merge from flerda
Issue 1624: JSON problem with null values
…lready upgraded?' comes up and we reply 'do nothing'
Issue 1626: Alternative cloze format causes crash.
Stuck after skipping upgrade.
Issue 1621: Change error messages for wrong time.
Issue 1619: Change "dynamic" to "filtered" deck.
Removing some extra whitespace.
Catch up merge from iniju into 2.0.1
function doesn't escape forward slashes when serializing. Android's org.json.JSONObject.toString() function does escape them. That means that when we save some card templates (frequently having tags that have a forward slash when closing) we might be breaking them.
Fix for JSON escaping.
ghost
assigned
flerda
added a commit
that referenced
this pull request
Jan 23, 2013
Catch up merge from 2.0.1 into 2.1
flerda
added a commit
that referenced
this pull request
Apr 20, 2013
Use less specific CSS selectors for the default font.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.