Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ankidroid/Anki-Android
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: palcu/Anki-Android
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 19 commits
  • 1,366 files changed
  • 4 contributors

Commits on Jan 23, 2013

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

    Update 2.0.1 branch from flerda
    @flerda
    flerda committed Jan 23, 2013
    Configuration menu
    Copy the full SHA
    b08a918 View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2013

  1. Merge pull request #3 from flerda/v2.0.1-dev 

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

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

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

Commits on Jan 31, 2013

  1. Bumped version to 2.0.1beta13

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

  2. moving connections shutdown to separate thread instead of GUI thread

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

  3. Merge pull request #7 from iniju/v2.0.1-upgrade-wizard-exception-on-c… 

    …ancel-upload

moving connections shutdown to separate thread instead of GUI thread
    @flerda
    flerda committed Jan 31, 2013
    Configuration menu
    Copy the full SHA
    975d16f View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2013

  1. Bumped version to 2.0.1beta14

    @nicolas-raoul
    nicolas-raoul committed Feb 1, 2013
    Configuration menu
    Copy the full SHA
    d504aaa View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2013

  1. Commented logging

    @nicolas-raoul
    nicolas-raoul committed Feb 7, 2013
    Configuration menu
    Copy the full SHA
    f81bfbc View commit details
    Browse the repository at this point in the history

  2. change icons to blue → stable version" 

    This reverts commit 83cd0f2.
    @nicolas-raoul
    nicolas-raoul committed Feb 7, 2013
    Configuration menu
    Copy the full SHA
    d0c1d58 View commit details
    Browse the repository at this point in the history

  3. Bumped version 2.0.1

    @nicolas-raoul
    nicolas-raoul committed Feb 7, 2013
    Configuration menu
    Copy the full SHA
    eac0483 View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2013

  1. Reset master to only include README.md file.

    @flerda
    flerda committed Feb 10, 2013
    Configuration menu
    Copy the full SHA
    1253aa2 View commit details
    Browse the repository at this point in the history

  2. Specify repository.

    @flerda
    flerda committed Feb 10, 2013
    Configuration menu
    Copy the full SHA
    7792e29 View commit details
    Browse the repository at this point in the history

  3. Update instructions after 2.0.1 release.

    @flerda
    flerda committed Feb 10, 2013
    Configuration menu
    Copy the full SHA
    723e849 View commit details
    Browse the repository at this point in the history

  4. Add .gitignore

    @flerda
    flerda committed Feb 10, 2013
    2 Configuration menu
    Copy the full SHA
    3de9e1e View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2013

  1. Update checkout command to not track remote branch. 

    We want users to be tracking pushing to their own branch, not the
organization repository.

Also, move the name of the branch to the end of the command, so it is
easier for people to edit after copying and pasting.
    @flerda
    flerda committed Mar 7, 2013
    Configuration menu
    Copy the full SHA
    a154c41 View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2013

  1. Add Travis CI build status to README file.

    Flavio Lerda committed Apr 20, 2013
    Configuration menu
    Copy the full SHA
    ab8a725 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #36 from flerda/master 

    Add Travis CI build status to README file.
    @flerda
    flerda committed Apr 20, 2013
    Configuration menu
    Copy the full SHA
    167676c View commit details
    Browse the repository at this point in the history

  3. Refresh to Travis CI configuration. 

    This commit updates the Travis Continuous Integration configuration to
make it work again.

I chose a different approach to installing the SDK, that avoid depending
on the order in which things are returned by the tool and breaks each
time something changes (like a new release). Instead use static links to
the SDK components that we need.

Since the continuous build is not reliable enough (or at least I am not
sure it is), also only notify myself of failures.
    @flerda
    flerda authored and Flavio Lerda committed Apr 20, 2013
    Configuration menu
    Copy the full SHA
    3e0b4ea View commit details
    Browse the repository at this point in the history

  4. Merge pull request #37 from flerda/master 

    Refresh to Travis CI configuration.
    @flerda
    flerda committed Apr 20, 2013
    Configuration menu
    Copy the full SHA
    4c818ab View commit details
    Browse the repository at this point in the history
Loading