Skip to content

Catch up merge from 2.0.1 into 2.1#33

Merged
flerda merged 30 commits intov2.1-devfrom
v2.0.1-dev
Jan 23, 2013
Merged

Catch up merge from 2.0.1 into 2.1#33
flerda merged 30 commits intov2.1-devfrom
v2.0.1-dev

Conversation

@flerda
Copy link
Copy Markdown
Owner

@flerda flerda commented Jan 23, 2013

No description provided.

nicolas-raoul and others added 30 commits January 15, 2013 02:28
…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.
Issue 1624: JSON problem with null values
…lready upgraded?' comes up and we reply 'do nothing'
Issue 1626: Alternative cloze format causes crash.
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.
@ghost ghost assigned flerda Jan 23, 2013
flerda added a commit that referenced this pull request Jan 23, 2013
Catch up merge from 2.0.1 into 2.1
@flerda flerda merged commit d935e92 into v2.1-dev Jan 23, 2013
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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants