0
0
mirror of https://github.com/ankidroid/Anki-Android.git synced 2024-09-20 12:02:16 +02:00
Commit Graph

40 Commits

Author SHA1 Message Date
Alexander Grüneberg
69fedac4e1 Include v7 appcompat library.
Please reimport the project in Eclipse.
2014-04-04 13:21:21 -05:00
Donald W
3f78abba2f Update Google Gson to 2.2.4.
Only contains a single bugfix over 2.2.3, but may as well keep up to date.
Commit comment amended to follow http://git-scm.com/docs/git-commit style
as requested by #flerda
2014-01-19 16:24:42 +00:00
Nicolas Raoul
0111ba9ee0 Eclipse now seems to favor this order, why not 2013-10-09 19:23:29 +09:00
Houssam Salem
62402b989d Classpath for updated SDK tools 2013-06-09 00:09:48 +10:00
Flavio Lerda
adb03b990e Upgrade Gson library to 2.2.3.
This now includes the full distribution, including sources, javadoc, and
README and LICENSE files.
2013-04-21 09:10:10 +01:00
iniju
8dfecf3b64 issue 1501 and various improvements on unzipping code, importing
progress messages, fixes on import media bugs - updated according to
feedback2
2013-01-30 22:57:38 +01:00
Marek
024c83d8a5 Merge branch 'master' of https://github.com/nicolas-raoul/Anki-Android
Conflicts:
	.classpath
2012-06-03 10:16:16 +02:00
Marek
f897e5dd21 merge conflict 2012-06-03 10:10:42 +02:00
iniju
349100683d moved test classes/library to separate project, yet to be committed 2012-05-16 23:28:15 +01:00
nobnago
80324a3f26 remove zeemote 2012-05-15 00:13:30 +02:00
nobnago
23e5ff271c speed up collection loading 2012-05-12 10:45:39 +02:00
Sascha Gennrich
3ec1b601f7 merge conflict 2012-03-30 12:01:02 +02:00
Nicolas Raoul
c26ff0bc57 Reverted a few unnecessary minor modifications 2012-03-28 16:02:59 +09:00
Marek Jasovsky
3d249aef96 Tibetan font support for CardBrowser and CardEditor 2012-03-27 22:36:47 +02:00
nobnago
2b4aed7d7b start work on tablet layout 2012-03-19 21:55:23 +01:00
nobnago
5601d32bab Merge branch 'libanki2.0'
Conflicts:
	.classpath
	AndroidManifest.xml
	res/drawable/widget_big_add.9.png
	res/drawable/widget_big_bg.9.png
	res/drawable/widget_big_button_bottom_right_pressed.png
	res/drawable/widget_big_ease2.9.png
	res/drawable/widget_big_ease2_rec.9.png
	res/drawable/widget_big_ease3.9.png
	res/drawable/widget_big_ease3_rec.9.png
	res/drawable/widget_big_ease4.9.png
	res/drawable/widget_big_eta.9.png
	res/drawable/widget_big_flipcard.9.png
	res/drawable/widget_big_help.9.png
	res/drawable/widget_big_opendeck.9.png
	res/layout-land/bottom_button.xml
	res/layout-small-land/studyoptions.xml
	res/layout-small/studyoptions.xml
	res/values-ar/01-core.xml
	res/values-ar/13-newfeatures.xml
	res/values-cs/02-strings.xml
	res/values-cs/03-dialogs.xml
	res/values-cs/10-preferences.xml
	res/values-cs/11-arrays.xml
	res/values-cs/13-newfeatures.xml
	res/values-de/02-strings.xml
	res/values-de/03-dialogs.xml
	res/values-de/07-cardbrowser.xml
	res/values-de/10-preferences.xml
	res/values-de/12-tutorial.xml
	res/values-el/02-strings.xml
	res/values-el/03-dialogs.xml
	res/values-el/10-preferences.xml
	res/values-el/11-arrays.xml
	res/values-el/12-tutorial.xml
	res/values-el/13-newfeatures.xml
	res/values-es/02-strings.xml
	res/values-es/03-dialogs.xml
	res/values-es/10-preferences.xml
	res/values-es/11-arrays.xml
	res/values-es/13-newfeatures.xml
	res/values-et/09-backup.xml
	res/values-et/12-tutorial.xml
	res/values-et/13-newfeatures.xml
	res/values-fr/01-core.xml
	res/values-fr/02-strings.xml
	res/values-fr/03-dialogs.xml
	res/values-fr/08-widget.xml
	res/values-fr/10-preferences.xml
	res/values-fr/11-arrays.xml
	res/values-fr/13-newfeatures.xml
	res/values-hu/02-strings.xml
	res/values-hu/03-dialogs.xml
	res/values-hu/04-network.xml
	res/values-hu/05-feedback.xml
	res/values-hu/06-statistics.xml
	res/values-hu/07-cardbrowser.xml
	res/values-hu/08-widget.xml
	res/values-hu/09-backup.xml
	res/values-hu/10-preferences.xml
	res/values-hu/11-arrays.xml
	res/values-it/01-core.xml
	res/values-it/02-strings.xml
	res/values-it/03-dialogs.xml
	res/values-it/04-network.xml
	res/values-it/06-statistics.xml
	res/values-it/07-cardbrowser.xml
	res/values-it/08-widget.xml
	res/values-it/09-backup.xml
	res/values-it/10-preferences.xml
	res/values-it/11-arrays.xml
	res/values-it/12-tutorial.xml
	res/values-it/13-newfeatures.xml
	res/values-ja/01-core.xml
	res/values-ja/02-strings.xml
	res/values-ja/03-dialogs.xml
	res/values-ja/04-network.xml
	res/values-ja/06-statistics.xml
	res/values-ja/07-cardbrowser.xml
	res/values-ja/08-widget.xml
	res/values-ja/09-backup.xml
	res/values-ja/10-preferences.xml
	res/values-ja/12-tutorial.xml
	res/values-ja/13-newfeatures.xml
	res/values-ko/01-core.xml
	res/values-nl/01-core.xml
	res/values-nl/02-strings.xml
	res/values-nl/03-dialogs.xml
	res/values-nl/08-widget.xml
	res/values-nl/09-backup.xml
	res/values-nl/10-preferences.xml
	res/values-nl/11-arrays.xml
	res/values-nl/12-tutorial.xml
	res/values-nl/13-newfeatures.xml
	res/values-no/01-core.xml
	res/values-no/02-strings.xml
	res/values-no/03-dialogs.xml
	res/values-no/08-widget.xml
	res/values-no/09-backup.xml
	res/values-no/10-preferences.xml
	res/values-pl/02-strings.xml
	res/values-pl/03-dialogs.xml
	res/values-pl/10-preferences.xml
	res/values-pl/11-arrays.xml
	res/values-pl/13-newfeatures.xml
	res/values-pt-rPT/01-core.xml
	res/values-pt-rPT/02-strings.xml
	res/values-pt-rPT/03-dialogs.xml
	res/values-pt-rPT/04-network.xml
	res/values-pt-rPT/05-feedback.xml
	res/values-pt-rPT/06-statistics.xml
	res/values-pt-rPT/07-cardbrowser.xml
	res/values-pt-rPT/08-widget.xml
	res/values-pt-rPT/10-preferences.xml
	res/values-pt-rPT/11-arrays.xml
	res/values-ru/03-dialogs.xml
	res/values-ru/10-preferences.xml
	res/values-ru/13-newfeatures.xml
	res/values-sv/02-strings.xml
	res/values-sv/03-dialogs.xml
	res/values-sv/10-preferences.xml
	res/values-sv/13-newfeatures.xml
	res/values-tr/03-dialogs.xml
	res/values-tr/10-preferences.xml
	res/values-tr/13-newfeatures.xml
	res/values-vi/01-core.xml
	res/values-vi/02-strings.xml
	res/values-vi/03-dialogs.xml
	res/values-vi/04-network.xml
	res/values-vi/05-feedback.xml
	res/values-vi/06-statistics.xml
	res/values-vi/10-preferences.xml
	res/values-vi/11-arrays.xml
	res/values-vi/13-newfeatures.xml
	res/values-zh-rCN/02-strings.xml
	res/values-zh-rCN/13-newfeatures.xml
	res/values/11-arrays.xml
	res/values/constants.xml
	src/com/ichi2/anim/ActivityTransitionAnimation.java
	src/com/ichi2/anki/About.java
	src/com/ichi2/anki/AnkiDroidApp.java
	src/com/ichi2/anki/AnkiDroidProxy.java
	src/com/ichi2/anki/CardBrowser.java
	src/com/ichi2/anki/CardEditor.java
	src/com/ichi2/anki/Deck.java
	src/com/ichi2/anki/DeckCreator.java
	src/com/ichi2/anki/DeckManager.java
	src/com/ichi2/anki/DeckPicker.java
	src/com/ichi2/anki/Feedback.java
	src/com/ichi2/anki/MetaDB.java
	src/com/ichi2/anki/MyAccount.java
	src/com/ichi2/anki/PersonalDeckPicker.java
	src/com/ichi2/anki/Preferences.java
	src/com/ichi2/anki/Reviewer.java
	src/com/ichi2/anki/SharedDeckPicker.java
	src/com/ichi2/anki/StudyOptions.java
	src/com/ichi2/anki/SyncClient.java
	src/com/ichi2/charts/ChartBuilder.java
	src/com/ichi2/libanki/Utils.java
	src/com/ichi2/themes/StyledDialog.java
	src/com/ichi2/themes/StyledProgressDialog.java
	src/com/ichi2/widget/WidgetDialog.java
2012-03-10 19:03:24 +01:00
nobnago
8a3151cafe add achartengine source code in order to fix the bugs 2012-02-02 21:14:01 +01:00
nobnago
ba43053e30 latest achartengine 2012-01-30 11:50:02 +01:00
Flavio Lerda
a9c07b4dea Add libraries entry as required by SDK Tools r16. 2012-01-29 22:01:41 +00:00
nobnago
28c868d157 achartengine 2012-01-26 23:05:20 +01:00
nobnago
5b11315b00 newest achartengine 2012-01-26 12:07:25 +01:00
iniju
aeca2f8647 issue 905: OutOfMemory when getting list of shared decks 2012-01-20 02:48:54 +00:00
nobnago
bc1453968a proceed work on libanki 2.0 2012-01-02 14:43:17 +01:00
nobnago
a13fc55480 Merge branch 'master' into libanki2.0
Conflicts:
	.classpath
	res/layout/studyoptions.xml
	src/com/ichi2/anki/AnkiDb.java
	src/com/ichi2/anki/AnkiDroidApp.java
	src/com/ichi2/anki/Card.java
	src/com/ichi2/anki/CardHistoryEntry.java
	src/com/ichi2/anki/CardModel.java
	src/com/ichi2/anki/Deck.java
	src/com/ichi2/anki/DeckPicker.java
	src/com/ichi2/anki/DeckPreferences.java
	src/com/ichi2/anki/DeckTask.java
	src/com/ichi2/anki/Fact.java
	src/com/ichi2/anki/FieldModel.java
	src/com/ichi2/anki/Model.java
	src/com/ichi2/anki/Reviewer.java
	src/com/ichi2/anki/StudyOptions.java
	src/com/ichi2/anki/WidgetStatus.java
	src/com/ichi2/anki/services/DownloadManagerService.java
	src/com/ichi2/async/Connection.java
	src/com/ichi2/charts/ChartBuilder.java
	src/com/ichi2/libanki/Utils.java
2011-12-16 18:08:45 +01:00
Nicolas Raoul
617ef7af0d Looks like the classpath has changed with the recent Android SDK changes, if it is just me then please let me know or revert 2011-11-15 16:27:15 +09:00
An Thanh Nguyen
cbaf386a5d Add a test class and modify the manifest file to be able to run tests 2011-11-07 22:41:42 +00:00
nobnago
172c065f8e Merge branch 'master' into libanki2.0
Conflicts:
	.classpath
	res/layout/card_editor.xml
	res/layout/flashcard.xml
	res/layout/studyoptions.xml
	res/layout/studyoptions_limit_dialog_contents.xml
	res/values-de/11-arrays.xml
	res/values/11-arrays.xml
	res/values/colors.xml
	res/values/strings.xml
	src/com/ichi2/anki/AnkiDb.java
	src/com/ichi2/anki/Card.java
	src/com/ichi2/anki/CardBrowser.java
	src/com/ichi2/anki/CardEditor.java
	src/com/ichi2/anki/Deck.java
	src/com/ichi2/anki/DeckCreator.java
	src/com/ichi2/anki/DeckPicker.java
	src/com/ichi2/anki/DeckTask.java
	src/com/ichi2/anki/Feedback.java
	src/com/ichi2/anki/MetaDB.java
	src/com/ichi2/anki/Model.java
	src/com/ichi2/anki/Preferences.java
	src/com/ichi2/anki/Reviewer.java
	src/com/ichi2/anki/Statistics.java
	src/com/ichi2/anki/Stats.java
	src/com/ichi2/anki/StudyOptions.java
	src/com/ichi2/anki/WidgetStatus.java
	src/com/ichi2/charts/ChartBuilder.java
	src/com/ichi2/libanki/Utils.java
2011-10-13 14:52:12 +02:00
Jean-Michel Fayard
d34d02b754 modifying classpath 2011-10-12 16:29:26 +02:00
unknown
7ee78ec304 Updated Zeemote SDK to version 1.5.1 2011-09-09 21:49:08 +02:00
nobnago
d26058cbb0 add group selection 2011-06-23 14:56:37 +02:00
nobnago
f939a01b34 Merge branch 'master' into libanki2.0
Conflicts:
	.classpath
	libs/achartengine-0.6.0.r140-1.5.jar
	src/com/ichi2/anki/CardEditor.java
	src/com/ichi2/anki/Deck.java
	src/com/ichi2/anki/DeckPicker.java
	src/com/ichi2/anki/FactAdder.java
	src/com/ichi2/anki/Reviewer.java
	src/com/ichi2/anki/Statistics.java
	src/com/ichi2/anki/StudyOptions.java
	src/com/ichi2/anki/WidgetStatus.java
2011-06-20 22:42:49 +02:00
Nicolas Raoul
11644b54d0 Put all libraries in the same directory, fixed Ant compilation 2011-05-19 11:58:06 +09:00
Nicolas Raoul
cf09dafcc7 Solved conflicts 2011-05-18 17:33:25 +09:00
nobnago
646f43e65b readd statistics, change to new achartengine, add average 2011-05-16 23:49:43 +02:00
Tomasz Mirski
a55350ce0a Connecting but answerCard not working 2011-03-29 18:50:49 +02:00
Cyril M. Hansen
198582f83d personal devlt env : it seems the problem with the permission was a consequence of target sdk=4 2011-03-13 09:45:27 +01:00
nobnago
96d5139c4e hopefully fixes 1.5-issue with charts 2011-02-17 11:42:10 +01:00
nobnago
48c0f0c467 some chart layout, add zoom 2011-02-15 23:44:07 +01:00
nobnago
af29e7e803 newer achartdroidversion, some layoutwork on charts 2011-02-15 12:19:08 +01:00
nobnago
3dee0c0607 add achartengine.jar into classpath 2011-02-15 10:15:38 +01:00