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

Multimedia editing features merge request #112

Open
wants to merge 99 commits into
base: v2.1-dev
Choose a base branch
from
Open

Multimedia editing features merge request #112

wants to merge 99 commits into from

Conversation

qutorial
Copy link

@qutorial qutorial commented Feb 1, 2013

Hello, Nicolas.

I have merged with the v2.1-dev branch and ask to pull, please.

There are some issues with our code, but we believe, they are minor.

  1. Version has to be controlled in the xml string files
  2. 14-multimedia-editor.xml has to be translated to other languages.
  3. From Reviewer we still run old CardEditor, which allows to edit cards and their tags in old style
  4. New multimedia card editor does not (yet) support tags, but it is simple to integrate.
  5. Of-course we need testing and so on, but already now this editor is amazingly helpful:
  • translation of words to study langauges
  • google image search (search for formulas, when studying chemistry)
  • pronunciation in german, english and spanish
  • support for color dict
  • support for audio recording
    ... This stuff already allows to add much more use into the cards!
    :) We use it ourselves!

iniju and others added 30 commits October 11, 2012 20:30
@iniju
support for zeemote plugin
f899cb9
@iniju
Merge branch 'master' of git://github.com/nobnago/Anki-Android into z…
1845842 
…eemote_plugin

Conflicts:
	res/values-fa/06-statistics.xml
	src/com/ichi2/anki/AnkiDroidApp.java
@iniju
Merge branch 'master' of git://github.com/nicolas-raoul/Anki-Android …
554ddc3 
…into zeemote_plugin
@iniju
further fix for latex, issue 1368
3d6c56b
@qutorial
First local changes, Zaur
7e66444
@qutorial
Merge branch 'master' of https://github.com/nicolas-raoul/Anki-Android
58854cf
@iniju
Merge branch 'master' of github.com:iniju/Anki-Android into zeemote_p…
0838a8b 
…lugin

Conflicts:
	res/values-fa/06-statistics.xml
	src/com/ichi2/anki/StudyOptionsFragment.java
@iniju
Merge branch 'master' of github.com:iniju/Anki-Android into zeemote_p…
2ff2f57 
…lugin

Conflicts:
	res/values-fa/06-statistics.xml
	src/com/ichi2/anki/StudyOptionsFragment.java
@iniju
Merge branch 'master' of github.com:iniju/Anki-Android into zeemote_p…
add7f16 
…lugin
@nobnago
uncomment logs
badbf87
@nobnago
Merge branch 'android_market_2.0'
b41eddb
@nobnago
change icons back to red (needs to be undone before releasing 2.1)
050e7a1 
Revert "change icons back to blue"

This reverts commit 6c275b8.
@nobnago
bump version to 2.1alpha0
68fd246
@nobnago
version 32
ec18a0d
@nobnago
clear newfeatures list
3076809
@nobnago
localisation
b85175e
@nobnago
Merge branch 'zeemote_plugin' of https://github.com/iniju/Anki-Android
c4895fe
@nobnago
update new features
71a0191
@nobnago
localisation
fbd15b3
@nobnago
bump version to 2.1alpha1
1b3ef69
@bibstha
Information on individual packages
ec9b043
@qutorial
Multimedia editing started
d4671dc
@qutorial
Controllers started
6213d32
@qutorial
The same activity to edit image
61adfc6
@bibstha
Implemented BasicImageFieldController
87e20eb
@qutorial
Syntax corrected a bit
0dd0b36
@qutorial
Field changing implementation started
5852405
@qutorial
Controller refactoring, step to field cloning
513c183
@bibstha
IField can say if the contained media is temporary
e7f02a7
@bibstha
Merged with Qutorial FragmentActivity
496c607
qutorial and others added 30 commits January 24, 2013 13:56
@qutorial
Media fixes
cdc4cf0
@bibstha
MultimediaCardEditor can now edit notes and cards
900f406
@qutorial
Merging with Bibek
2cebfd9
@bibstha
Fixed slide movements
11d2d4c
@qutorial
Crashes with images
13030bd
@bibstha
preventing null pointer in bitmaputil
5b19dd6
@qutorial
Different html for different Android versions in Image Search
c37e2d8
@qutorial
Before rotation photo bug correction
b3c9763
@bibstha
AudioView state transition fixed
0f9f577
@bibstha
Card Delete implemented
e4af83c
@qutorial
Image rotation bug
e1a7a78
@qutorial
Fixes by bibek, incl delete button
10dc96c
@bibstha
Change of deck possible in MMCardEditor
f696810
@bibstha
Fixed scrolling
2a9ef1b
@qutorial
Null field bug fix
7f252ab
@qutorial
merged with Bibek, there ScrollView added
4cac7a8
@bibstha
Deckpicker also uses MMCardEditor
268d47b
@qutorial
Multimedia Editor throws replaced, translated
300bdee
@qutorial
Merged with bibek, new improvements ot Multimedia Activity
86adc42
@qutorial
Before merging with 2.1
f3dc460
@qutorial
Fixes for storage and Activity states
22467fe
@qutorial
trash removed
8407c66
@qutorial
tittle removed from colordict integration text
86fe5f5
@qutorial
Fix in glosbe translation, when no results
971d128
@qutorial
Null pointer bug fixed in bitmap util
b7bafda
@qutorial
Audio View corrections
c45bf03
@qutorial
Swap feature
7920dc5
@qutorial
Deleted mixed field
cc66692
@qutorial
Half merged
b41c95d
@qutorial
Merging done
ffe06e0
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@qutorial @nicolas-raoul @iniju @nobnago @bibstha