Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update 2.1 branch from flerda #2

Merged
merged 31 commits into from
Jan 23, 2013
Merged

Update 2.1 branch from flerda #2

merged 31 commits into from
Jan 23, 2013

Commits on Jan 14, 2013

  1. Bumping beta version, I find it strange that it was still beta1, mayb… 

    …e I did a mistake when branching/pulling?
    @nicolas-raoul
    nicolas-raoul committed Jan 14, 2013
    Configuration menu
    Copy the full SHA
    b9744e6 View commit details
    Browse the repository at this point in the history

Commits on Jan 20, 2013

  1. note type manager needs to ignore the default note type for current d… 

    …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
    @iniju
    iniju committed Jan 20, 2013
    Configuration menu
    Copy the full SHA
    a883db3 View commit details
    Browse the repository at this point in the history

  2. update manual link (dae/anki e309a68306d)

    @iniju
    iniju committed Jan 20, 2013
    Configuration menu
    Copy the full SHA
    f31e805 View commit details
    Browse the repository at this point in the history

  3. we must remove cards from learning queue on bury or they end up with … 

    …an invalid status when unburied (dae/anki aefc58d5d5)
    @iniju
    iniju committed Jan 20, 2013
    Configuration menu
    Copy the full SHA
    58d47f9 View commit details
    Browse the repository at this point in the history

  4. Issue 1567: Handle failure to fetch card count. 

    If the card count is not fetched correctly, we should fail the import.
    @flerda
    flerda committed Jan 20, 2013
    Configuration menu
    Copy the full SHA
    2ef32ed View commit details
    Browse the repository at this point in the history

  5. match a single note type in browser even if duplicate names (dae/anki… 

    … 120c1d4136)
    @iniju
    iniju committed Jan 20, 2013
    Configuration menu
    Copy the full SHA
    2949285 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #5 from flerda/v2.0.1-npe 

    Issue 1567: Handle failure to fetch card count.
    @iniju
    iniju committed Jan 20, 2013
    Configuration menu
    Copy the full SHA
    c574949 View commit details
    Browse the repository at this point in the history

  7. don't fail when importing apkg that references subdirs (dae/anki ab46… 

    …fa0a70)
    @iniju
    iniju committed Jan 20, 2013
    Configuration menu
    Copy the full SHA
    8643715 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #25 from iniju/v2.0.1-libanki-update-to-anki-v2.0.5 

    Libanki update to anki v2.0.5
    @flerda
    flerda committed Jan 20, 2013
    Configuration menu
    Copy the full SHA
    fe831fa View commit details
    Browse the repository at this point in the history

  9. Merge pull request #26 from iniju/v2.0.1-dev 

    Merge from iniju
    @flerda
    flerda committed Jan 20, 2013
    Configuration menu
    Copy the full SHA
    a0d08d3 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #6 from flerda/v2.0.1-dev 

    Merge from flerda
    @iniju
    iniju committed Jan 20, 2013
    Configuration menu
    Copy the full SHA
    8c44e65 View commit details
    Browse the repository at this point in the history

Commits on Jan 21, 2013

  1. Merged from Flavio

    @nicolas-raoul
    nicolas-raoul committed Jan 21, 2013
    Configuration menu
    Copy the full SHA
    3f4c8f7 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'v2.0.1-dev' of https://github.com/iniju/Anki-Android in… 

    …to v2.0.1-dev
    @nicolas-raoul
    nicolas-raoul committed Jan 21, 2013
    Configuration menu
    Copy the full SHA
    8e535b0 View commit details
    Browse the repository at this point in the history

  3. Bumped version to 2.0.1beta5

    @nicolas-raoul
    nicolas-raoul committed Jan 21, 2013
    Configuration menu
    Copy the full SHA
    f22077b View commit details
    Browse the repository at this point in the history

  4. Fixing json null values

    @iniju
    iniju committed Jan 21, 2013
    Configuration menu
    Copy the full SHA
    73fe526 View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2013

  1. Merge pull request #27 from iniju/v2.0.1-use-proper-json-null 

    Issue 1624: JSON problem with null values
    @flerda
    flerda committed Jan 22, 2013
    Configuration menu
    Copy the full SHA
    a26d9ac View commit details
    Browse the repository at this point in the history

  2. fix issue with getting stuck at flashscreen if dialog for 'have you a… 

    …lready upgraded?' comes up and we reply 'do nothing'
    @iniju
    iniju committed Jan 22, 2013
    Configuration menu
    Copy the full SHA
    4f888d2 View commit details
    Browse the repository at this point in the history

  3. fixed string replacement breaking templates for alt cloze format

    @iniju
    iniju committed Jan 22, 2013
    Configuration menu
    Copy the full SHA
    f9b0acb View commit details
    Browse the repository at this point in the history

  4. Merge pull request #29 from iniju/v2.0.1-fix-cloze-tmpl-issue-1626 

    Issue 1626: Alternative cloze format causes crash.
    @flerda
    flerda committed Jan 22, 2013
    Configuration menu
    Copy the full SHA
    cbe7bfe View commit details
    Browse the repository at this point in the history

  5. Merge pull request #30 from iniju/v2.0.1-stuck-at-flashscreen 

    Stuck after skipping upgrade.
    @flerda
    flerda committed Jan 22, 2013
    Configuration menu
    Copy the full SHA
    1d64c85 View commit details
    Browse the repository at this point in the history

  6. Issue 1619: Change "dynamic" to "filtered" deck.

    @iniju @flerda
    iniju authored and flerda committed Jan 22, 2013
    Configuration menu
    Copy the full SHA
    cc6ef22 View commit details
    Browse the repository at this point in the history

  7. Issue 1621: Change error messages for wrong time.

    @iniju @flerda
    iniju authored and flerda committed Jan 22, 2013
    Configuration menu
    Copy the full SHA
    5a970a4 View commit details
    Browse the repository at this point in the history

  8. Removing some extra whitespace.

    @iniju @flerda
    iniju authored and flerda committed Jan 22, 2013
    Configuration menu
    Copy the full SHA
    804f735 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #8 from flerda/v2.0.1-time-strings 

    Issue 1621: Change error messages for wrong time.
    @iniju
    iniju committed Jan 22, 2013
    Configuration menu
    Copy the full SHA
    e12dcfb View commit details
    Browse the repository at this point in the history

  10. Merge pull request #7 from flerda/v2.0.1-filtered 

    Issue 1619: Change "dynamic" to "filtered" deck.
    @iniju
    iniju committed Jan 22, 2013
    Configuration menu
    Copy the full SHA
    996e29d View commit details
    Browse the repository at this point in the history

  11. Merge pull request #9 from flerda/v2.0.1-whitespace 

    Removing some extra whitespace.
    @iniju
    iniju committed Jan 22, 2013
    Configuration menu
    Copy the full SHA
    d3ad375 View commit details
    Browse the repository at this point in the history

  12. Merge remote-tracking branch 'flerda/v2.0.1-dev' into v2.0.1-dev

    @iniju
    iniju committed Jan 22, 2013
    Configuration menu
    Copy the full SHA
    bf7282e View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2013

  1. Merge pull request #32 from iniju/v2.0.1-dev 

    Catch up merge from iniju into 2.0.1
    @flerda
    flerda committed Jan 23, 2013
    Configuration menu
    Copy the full SHA
    bd724ad View commit details
    Browse the repository at this point in the history

  2. make json serializations compatible with anki: Python's json.dumps() 

    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.
    @iniju
    iniju committed Jan 23, 2013
    Configuration menu
    Copy the full SHA
    6762874 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #31 from iniju/v2.0.1-json-escape-fix 

    Fix for JSON escaping.
    @flerda
    flerda committed Jan 23, 2013
    Configuration menu
    Copy the full SHA
    7fd41b5 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #33 from flerda/v2.0.1-dev 

    Catch up merge from 2.0.1 into 2.1
    @flerda
    flerda committed Jan 23, 2013
    Configuration menu
    Copy the full SHA
    d935e92 View commit details
    Browse the repository at this point in the history