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

Commits on Oct 11, 2012

  1. support for zeemote plugin

    @iniju
    iniju committed Oct 11, 2012
    Configuration menu
    Copy the full SHA
    f899cb9 View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2012

  1. Merge branch 'master' of git://github.com/nobnago/Anki-Android into z… 

    …eemote_plugin

Conflicts:
	res/values-fa/06-statistics.xml
	src/com/ichi2/anki/AnkiDroidApp.java
    @iniju
    iniju committed Oct 26, 2012
    Configuration menu
    Copy the full SHA
    1845842 View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2012

  1. Merge branch 'master' of git://github.com/nicolas-raoul/Anki-Android … 

    …into zeemote_plugin
    @iniju
    iniju committed Nov 15, 2012
    Configuration menu
    Copy the full SHA
    554ddc3 View commit details
    Browse the repository at this point in the history

  2. further fix for latex, issue 1368

    @iniju
    iniju committed Nov 15, 2012
    Configuration menu
    Copy the full SHA
    3d6c56b View commit details
    Browse the repository at this point in the history

Commits on Dec 21, 2012

  1. First local changes, Zaur

    @qutorial
    qutorial committed Dec 21, 2012
    Configuration menu
    Copy the full SHA
    7e66444 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/nicolas-raoul/Anki-Android

    @qutorial
    qutorial committed Dec 21, 2012
    Configuration menu
    Copy the full SHA
    58854cf View commit details
    Browse the repository at this point in the history

Commits on Dec 31, 2012

  1. Merge branch 'master' of github.com:iniju/Anki-Android into zeemote_p… 

    …lugin

Conflicts:
	res/values-fa/06-statistics.xml
	src/com/ichi2/anki/StudyOptionsFragment.java
    @iniju
    iniju committed Dec 31, 2012
    Configuration menu
    Copy the full SHA
    0838a8b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of github.com:iniju/Anki-Android into zeemote_p… 

    …lugin

Conflicts:
	res/values-fa/06-statistics.xml
	src/com/ichi2/anki/StudyOptionsFragment.java
    @iniju
    iniju committed Dec 31, 2012
    Configuration menu
    Copy the full SHA
    2ff2f57 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of github.com:iniju/Anki-Android into zeemote_p… 

    …lugin
    @iniju
    iniju committed Dec 31, 2012
    Configuration menu
    Copy the full SHA
    add7f16 View commit details
    Browse the repository at this point in the history

Commits on Jan 3, 2013

  1. uncomment logs

    @nobnago
    nobnago committed Jan 3, 2013
    Configuration menu
    Copy the full SHA
    badbf87 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'android_market_2.0'

    @nobnago
    nobnago committed Jan 3, 2013
    Configuration menu
    Copy the full SHA
    b41eddb View commit details
    Browse the repository at this point in the history

  3. change icons back to red (needs to be undone before releasing 2.1) 

    Revert "change icons back to blue"

This reverts commit 6c275b8.
    @nobnago
    nobnago committed Jan 3, 2013
    Configuration menu
    Copy the full SHA
    050e7a1 View commit details
    Browse the repository at this point in the history

  4. bump version to 2.1alpha0

    @nobnago
    nobnago committed Jan 3, 2013
    Configuration menu
    Copy the full SHA
    68fd246 View commit details
    Browse the repository at this point in the history

  5. version 32

    @nobnago
    nobnago committed Jan 3, 2013
    Configuration menu
    Copy the full SHA
    ec18a0d View commit details
    Browse the repository at this point in the history

  6. clear newfeatures list

    @nobnago
    nobnago committed Jan 3, 2013
    Configuration menu
    Copy the full SHA
    3076809 View commit details
    Browse the repository at this point in the history

  7. localisation

    @nobnago
    nobnago committed Jan 3, 2013
    Configuration menu
    Copy the full SHA
    b85175e View commit details
    Browse the repository at this point in the history

  8. Merge branch 'zeemote_plugin' of https://github.com/iniju/Anki-Android

    @nobnago
    nobnago committed Jan 3, 2013
    Configuration menu
    Copy the full SHA
    c4895fe View commit details
    Browse the repository at this point in the history

  9. update new features

    @nobnago
    nobnago committed Jan 3, 2013
    Configuration menu
    Copy the full SHA
    71a0191 View commit details
    Browse the repository at this point in the history

  10. localisation

    @nobnago
    nobnago committed Jan 3, 2013
    Configuration menu
    Copy the full SHA
    fbd15b3 View commit details
    Browse the repository at this point in the history

  11. bump version to 2.1alpha1

    @nobnago
    nobnago committed Jan 3, 2013
    Configuration menu
    Copy the full SHA
    1b3ef69 View commit details
    Browse the repository at this point in the history

  12. Information on individual packages

    @bibstha
    bibstha committed Jan 3, 2013
    Configuration menu
    Copy the full SHA
    ec9b043 View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2013

  1. Multimedia editing started

    @qutorial
    qutorial committed Jan 5, 2013
    Configuration menu
    Copy the full SHA
    d4671dc View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2013

  1. Controllers started

    @qutorial
    qutorial committed Jan 9, 2013
    Configuration menu
    Copy the full SHA
    6213d32 View commit details
    Browse the repository at this point in the history

  2. The same activity to edit image

    @qutorial
    qutorial committed Jan 9, 2013
    Configuration menu
    Copy the full SHA
    61adfc6 View commit details
    Browse the repository at this point in the history

  3. Implemented BasicImageFieldController

    @bibstha
    bibstha committed Jan 9, 2013
    Configuration menu
    Copy the full SHA
    87e20eb View commit details
    Browse the repository at this point in the history

  4. Syntax corrected a bit

    @qutorial
    qutorial committed Jan 9, 2013
    Configuration menu
    Copy the full SHA
    0dd0b36 View commit details
    Browse the repository at this point in the history

  5. Field changing implementation started

    @qutorial
    qutorial committed Jan 9, 2013
    Configuration menu
    Copy the full SHA
    5852405 View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2013

  1. Controller refactoring, step to field cloning

    @qutorial
    qutorial committed Jan 11, 2013
    Configuration menu
    Copy the full SHA
    513c183 View commit details
    Browse the repository at this point in the history

  2. IField can say if the contained media is temporary

    @bibstha
    bibstha committed Jan 11, 2013
    Configuration menu
    Copy the full SHA
    e7f02a7 View commit details
    Browse the repository at this point in the history

  3. Merged with Qutorial FragmentActivity

    @bibstha
    bibstha committed Jan 11, 2013
    Configuration menu
    Copy the full SHA
    496c607 View commit details
    Browse the repository at this point in the history

  4. Cloning made

    @qutorial
    qutorial committed Jan 11, 2013
    Configuration menu
    Copy the full SHA
    b519ebc View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2013

  1. AudioView implmentation in progress

    @bibstha
    bibstha committed Jan 12, 2013
    Configuration menu
    Copy the full SHA
    885c2cc View commit details
    Browse the repository at this point in the history

  2. AudioView supports listening to recordfinishevent

    @bibstha
    bibstha committed Jan 12, 2013
    Configuration menu
    Copy the full SHA
    b1456e9 View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2013

  1. Glosbe integration finished, first iteration

    @qutorial
    qutorial committed Jan 15, 2013
    Configuration menu
    Copy the full SHA
    4c52f18 View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2013

  1. Pronunciation mp3 file address computed from Beolingus

    @qutorial
    qutorial committed Jan 18, 2013
    Configuration menu
    Copy the full SHA
    28a9a37 View commit details
    Browse the repository at this point in the history

  2. Before adding support for many languages

    @qutorial
    qutorial committed Jan 18, 2013
    Configuration menu
    Copy the full SHA
    7d566b5 View commit details
    Browse the repository at this point in the history

  3. Multiple languagesm pronunciation loading

    @qutorial
    qutorial committed Jan 18, 2013
    Configuration menu
    Copy the full SHA
    5dd6402 View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2013

  1. Finished audio controller

    @bibstha
    bibstha committed Jan 19, 2013
    Configuration menu
    Copy the full SHA
    9cac86b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'qutorial_master'

    @bibstha
    bibstha committed Jan 19, 2013
    Configuration menu
    Copy the full SHA
    9ff68ee View commit details
    Browse the repository at this point in the history

Commits on Jan 20, 2013

  1. Refactoring : beolingus parsing separated

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

  2. Merging hard :)

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

  3. Towards playin pronunciation

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

  4. Activity behavior bugs fixed

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

  5. Two translation bugs fixed

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

  6. Translation continued

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

  7. Pronunciation and translation activities translated

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

  8. Fixed issue with null audioString

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

  9. Merging with upstream

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

  10. Merge remote-tracking branch 'bibstha/master'

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

  11. Merged with upstream and Bibek, player not working

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

Commits on Jan 21, 2013

  1. More condition check on MediaPlayer status

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

  2. Merging with bibek

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

  3. ColorDict integrated

    @qutorial
    qutorial committed Jan 21, 2013
    Configuration menu
    Copy the full SHA
    2bc2052 View commit details
    Browse the repository at this point in the history

  4. Image search half way

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

Commits on Jan 22, 2013

  1. Visual lifts, image search ready

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

Commits on Jan 23, 2013

  1. Activity fixes, translation fixes

    @qutorial
    qutorial committed Jan 23, 2013
    Configuration menu
    Copy the full SHA
    5bd88f7 View commit details
    Browse the repository at this point in the history

  2. Activity image files removed from git

    @qutorial
    qutorial committed Jan 23, 2013
    Configuration menu
    Copy the full SHA
    9917c4c View commit details
    Browse the repository at this point in the history

  3. Adding new card works

    @bibstha
    bibstha committed Jan 23, 2013
    Configuration menu
    Copy the full SHA
    bd0c65d View commit details
    Browse the repository at this point in the history

  4. Missing files added

    @bibstha
    bibstha committed Jan 23, 2013
    Configuration menu
    Copy the full SHA
    1cce3f4 View commit details
    Browse the repository at this point in the history

  5. Cleanup: removed .orig files

    @bibstha
    bibstha committed Jan 23, 2013
    Configuration menu
    Copy the full SHA
    73f3fe9 View commit details
    Browse the repository at this point in the history

  6. Testing with 2.1

    @qutorial
    qutorial committed Jan 23, 2013
    Configuration menu
    Copy the full SHA
    020c381 View commit details
    Browse the repository at this point in the history

  7. Merging with bibek

    @qutorial
    qutorial committed Jan 23, 2013
    Configuration menu
    Copy the full SHA
    55815cb View commit details
    Browse the repository at this point in the history

  8. 1.6 bug solved, images look better

    @qutorial
    qutorial committed Jan 23, 2013
    Configuration menu
    Copy the full SHA
    4727b2f View commit details
    Browse the repository at this point in the history

  9. Text field controller translated

    @qutorial
    qutorial committed Jan 23, 2013
    Configuration menu
    Copy the full SHA
    0602a7a View commit details
    Browse the repository at this point in the history

  10. Text field controller well commented

    @qutorial
    qutorial committed Jan 23, 2013
    Configuration menu
    Copy the full SHA
    955f020 View commit details
    Browse the repository at this point in the history

  11. MultimediaCardEditor now supports change of Models

    @bibstha
    bibstha committed Jan 23, 2013
    Configuration menu
    Copy the full SHA
    b46ac18 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'master' of https://github.com/qutorial/Anki-Android

    @bibstha
    bibstha committed Jan 23, 2013
    Configuration menu
    Copy the full SHA
    27dd47a View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2013

  1. Editing loads properly, saving not tested yet

    @bibstha
    bibstha committed Jan 24, 2013
    Configuration menu
    Copy the full SHA
    8b4c848 View commit details
    Browse the repository at this point in the history

  2. bug fixing, towards audio view

    @qutorial
    qutorial committed Jan 24, 2013
    Configuration menu
    Copy the full SHA
    3fcddad View commit details
    Browse the repository at this point in the history

  3. Media fixes

    @qutorial
    qutorial committed Jan 24, 2013
    Configuration menu
    Copy the full SHA
    cdc4cf0 View commit details
    Browse the repository at this point in the history

  4. MultimediaCardEditor can now edit notes and cards

    @bibstha
    bibstha committed Jan 24, 2013
    Configuration menu
    Copy the full SHA
    900f406 View commit details
    Browse the repository at this point in the history

  5. Merging with Bibek

    @qutorial
    qutorial committed Jan 24, 2013
    Configuration menu
    Copy the full SHA
    2cebfd9 View commit details
    Browse the repository at this point in the history

  6. Fixed slide movements

    @bibstha
    bibstha committed Jan 24, 2013
    Configuration menu
    Copy the full SHA
    11d2d4c View commit details
    Browse the repository at this point in the history

  7. Crashes with images

    @qutorial
    qutorial committed Jan 24, 2013
    Configuration menu
    Copy the full SHA
    13030bd View commit details
    Browse the repository at this point in the history

  8. preventing null pointer in bitmaputil

    @bibstha
    bibstha committed Jan 24, 2013
    Configuration menu
    Copy the full SHA
    5b19dd6 View commit details
    Browse the repository at this point in the history

  9. Different html for different Android versions in Image Search

    @qutorial
    qutorial committed Jan 24, 2013
    Configuration menu
    Copy the full SHA
    c37e2d8 View commit details
    Browse the repository at this point in the history

  10. Before rotation photo bug correction

    @qutorial
    qutorial committed Jan 24, 2013
    Configuration menu
    Copy the full SHA
    b3c9763 View commit details
    Browse the repository at this point in the history

  11. AudioView state transition fixed

    @bibstha
    bibstha committed Jan 24, 2013
    Configuration menu
    Copy the full SHA
    0f9f577 View commit details
    Browse the repository at this point in the history

  12. Card Delete implemented

    @bibstha
    bibstha committed Jan 24, 2013
    Configuration menu
    Copy the full SHA
    e4af83c View commit details
    Browse the repository at this point in the history

  13. Image rotation bug

    @qutorial
    qutorial committed Jan 24, 2013
    Configuration menu
    Copy the full SHA
    e1a7a78 View commit details
    Browse the repository at this point in the history

  14. Fixes by bibek, incl delete button

    @qutorial
    qutorial committed Jan 24, 2013
    Configuration menu
    Copy the full SHA
    10dc96c View commit details
    Browse the repository at this point in the history

  15. Change of deck possible in MMCardEditor

    @bibstha
    bibstha committed Jan 24, 2013
    Configuration menu
    Copy the full SHA
    f696810 View commit details
    Browse the repository at this point in the history

  16. Fixed scrolling

    @bibstha
    bibstha committed Jan 24, 2013
    Configuration menu
    Copy the full SHA
    2a9ef1b View commit details
    Browse the repository at this point in the history

  17. Null field bug fix

    @qutorial
    qutorial committed Jan 24, 2013
    Configuration menu
    Copy the full SHA
    7f252ab View commit details
    Browse the repository at this point in the history

  18. merged with Bibek, there ScrollView added

    @qutorial
    qutorial committed Jan 24, 2013
    Configuration menu
    Copy the full SHA
    4cac7a8 View commit details
    Browse the repository at this point in the history

  19. Deckpicker also uses MMCardEditor

    @bibstha
    bibstha committed Jan 24, 2013
    Configuration menu
    Copy the full SHA
    268d47b View commit details
    Browse the repository at this point in the history

  20. Multimedia Editor throws replaced, translated

    @qutorial
    qutorial committed Jan 24, 2013
    Configuration menu
    Copy the full SHA
    300bdee View commit details
    Browse the repository at this point in the history

  21. Merged with bibek, new improvements ot Multimedia Activity

    @qutorial
    qutorial committed Jan 24, 2013
    Configuration menu
    Copy the full SHA
    86adc42 View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2013

  1. Before merging with 2.1

    @qutorial
    qutorial committed Jan 25, 2013
    Configuration menu
    Copy the full SHA
    f3dc460 View commit details
    Browse the repository at this point in the history

  2. Fixes for storage and Activity states

    @qutorial
    qutorial committed Jan 25, 2013
    Configuration menu
    Copy the full SHA
    22467fe View commit details
    Browse the repository at this point in the history

  3. trash removed

    @qutorial
    qutorial committed Jan 25, 2013
    Configuration menu
    Copy the full SHA
    8407c66 View commit details
    Browse the repository at this point in the history

Commits on Jan 27, 2013

  1. tittle removed from colordict integration text

    @qutorial
    qutorial committed Jan 27, 2013
    Configuration menu
    Copy the full SHA
    86fe5f5 View commit details
    Browse the repository at this point in the history

Commits on Jan 28, 2013

  1. Fix in glosbe translation, when no results

    @qutorial
    qutorial committed Jan 28, 2013
    Configuration menu
    Copy the full SHA
    971d128 View commit details
    Browse the repository at this point in the history

  2. Null pointer bug fixed in bitmap util

    @qutorial
    qutorial committed Jan 28, 2013
    Configuration menu
    Copy the full SHA
    b7bafda View commit details
    Browse the repository at this point in the history

  3. Audio View corrections

    @qutorial
    qutorial committed Jan 28, 2013
    Configuration menu
    Copy the full SHA
    c45bf03 View commit details
    Browse the repository at this point in the history

Commits on Jan 29, 2013

  1. Swap feature

    @qutorial
    qutorial committed Jan 29, 2013
    Configuration menu
    Copy the full SHA
    7920dc5 View commit details
    Browse the repository at this point in the history

  2. Deleted mixed field

    @qutorial
    qutorial committed Jan 29, 2013
    Configuration menu
    Copy the full SHA
    cc66692 View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2013

  1. Half merged

    @qutorial
    qutorial committed Feb 1, 2013
    Configuration menu
    Copy the full SHA
    b41c95d View commit details
    Browse the repository at this point in the history

  2. Merging done

    @qutorial
    qutorial committed Feb 1, 2013
    Configuration menu
    Copy the full SHA
    ffe06e0 View commit details
    Browse the repository at this point in the history