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.

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

Release/1.6 #39

Merged
merged 94 commits into from
Apr 22, 2016
Merged

Release/1.6 #39

merged 94 commits into from
Apr 22, 2016

Commits on Mar 19, 2016

  1. Configuration menu
    Copy the full SHA
    6771131 View commit details
    Browse the repository at this point in the history
  2. add gcm to gradle dependencies

    move gcm to product flavour
    KirillMakarov committed Mar 19, 2016
    Configuration menu
    Copy the full SHA
    685ed0c View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    93b6300 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    21d94a3 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    93c0f38 View commit details
    Browse the repository at this point in the history
  6. update version to dev

    KirillMakarov committed Mar 19, 2016
    Configuration menu
    Copy the full SHA
    3b679d3 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    c9e2c9d View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    bbad429 View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2016

  1. Add device to model

    KirillMakarov committed Mar 20, 2016
    Configuration menu
    Copy the full SHA
    f645afa View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b63d859 View commit details
    Browse the repository at this point in the history
  3. add get devices to Api

    KirillMakarov committed Mar 20, 2016
    Configuration menu
    Copy the full SHA
    ca25cf8 View commit details
    Browse the repository at this point in the history
  4. add device request

    KirillMakarov committed Mar 20, 2016
    Configuration menu
    Copy the full SHA
    fb0e71f View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    7dc8b07 View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2016

  1. Merge branch 'release/1.6_pushes' into release/1.6

    Conflicts:
    	app/build.gradle
    	app/src/main/java/org/stepic/droid/core/StepicCoreComponent.java
    	app/src/main/java/org/stepic/droid/view/fragments/VideoFragment.kt
    KirillMakarov committed Mar 25, 2016
    Configuration menu
    Copy the full SHA
    61d03a3 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    ada4c15 View commit details
    Browse the repository at this point in the history
  3. Merge branch 'master' into release/1.6

    Readme was updated
    KirillMakarov committed Mar 25, 2016
    Configuration menu
    Copy the full SHA
    0a7223a View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2016

  1. Configuration menu
    Copy the full SHA
    10274e7 View commit details
    Browse the repository at this point in the history
  2. remove unused drawables

    KirillMakarov committed Mar 26, 2016
    Configuration menu
    Copy the full SHA
    de02903 View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2016

  1. fix seeking when video paused, fix audio focus when change time of vi…

    …deo, fix screen switch off
    KirillMakarov committed Mar 29, 2016
    Configuration menu
    Copy the full SHA
    6f85cc2 View commit details
    Browse the repository at this point in the history
  2. update version

    KirillMakarov committed Mar 29, 2016
    Configuration menu
    Copy the full SHA
    d4af4b1 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    ca07ef6 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    9028a25 View commit details
    Browse the repository at this point in the history
  5. Merge branch 'release/1.5.4_hotfix' into release/1.6

    Conflicts:
    	app/build.gradle
    	app/src/main/java/org/stepic/droid/view/fragments/VideoFragment.kt
    KirillMakarov committed Mar 29, 2016
    Configuration menu
    Copy the full SHA
    5d2bc06 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    dd05c5b View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    17e321e View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    087add5 View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2016

  1. Configuration menu
    Copy the full SHA
    7685562 View commit details
    Browse the repository at this point in the history
  2. update build version

    KirillMakarov committed Mar 30, 2016
    Configuration menu
    Copy the full SHA
    25e3171 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    e86c833 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    ee062ac View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    815fdda View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2016

  1. Configuration menu
    Copy the full SHA
    2520276 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    5dcc889 View commit details
    Browse the repository at this point in the history
  3. extract color util

    KirillMakarov committed Mar 31, 2016
    Configuration menu
    Copy the full SHA
    164742c View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    cea25b8 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    6f60f5f View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2016

  1. Configuration menu
    Copy the full SHA
    1616485 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4282b2f View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    a89f065 View commit details
    Browse the repository at this point in the history
  4. extract settings in activity, make available app settings in system s…

    …ettings, make animation for setting activity
    KirillMakarov committed Apr 1, 2016
    Configuration menu
    Copy the full SHA
    003cc25 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    05a278a View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    10b73b4 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    306fe89 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    e7b7fec View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    c39b6cd View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2016

  1. Configuration menu
    Copy the full SHA
    69b41ef View commit details
    Browse the repository at this point in the history
  2. rever gradle changes

    KirillMakarov committed Apr 2, 2016
    Configuration menu
    Copy the full SHA
    addcea1 View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2016

  1. Configuration menu
    Copy the full SHA
    89a7bc0 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    cfb19d7 View commit details
    Browse the repository at this point in the history
  3. make notification preferences device specific (not user specific, bec…

    …ause it is not sync with server)
    KirillMakarov committed Apr 4, 2016
    Configuration menu
    Copy the full SHA
    2f60da9 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2016

  1. Configuration menu
    Copy the full SHA
    4320109 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    5466d92 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    519cd86 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    a4ed1b4 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    66f9e93 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    75d608f View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2016

  1. Configuration menu
    Copy the full SHA
    9a704ac View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    24d3c47 View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2016

  1. Configuration menu
    Copy the full SHA
    a26ade6 View commit details
    Browse the repository at this point in the history
  2. fix bug in gradle, when tests are not working

    move tests in right path
    add tests for htmlHelper
    add action to notifications
    KirillMakarov committed Apr 7, 2016
    Configuration menu
    Copy the full SHA
    cec2640 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    ae01caa View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    c26d4d5 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    fcfaeb4 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    5d0a7b5 View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2016

  1. Configuration menu
    Copy the full SHA
    62abbb4 View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2016

  1. update gradle

    KirillMakarov committed Apr 11, 2016
    Configuration menu
    Copy the full SHA
    73aaa53 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b88669d View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    9f8d092 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    37ae31b View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2016

  1. Configuration menu
    Copy the full SHA
    811cb9b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    d722f52 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    d84cd3c View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    a030064 View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2016

  1. Configuration menu
    Copy the full SHA
    37f32fe View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    60b737b View commit details
    Browse the repository at this point in the history
  3. update to new version

    KirillMakarov committed Apr 17, 2016
    Configuration menu
    Copy the full SHA
    cada5c5 View commit details
    Browse the repository at this point in the history
  4. remove obsolete metric

    KirillMakarov committed Apr 17, 2016
    Configuration menu
    Copy the full SHA
    b1b8236 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    3734648 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    90a5e26 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    10e4ecc View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    3e947bf View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    7bb62e5 View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2016

  1. downgrade gradle because of … an anonymous inner class … that doesn't…

    … come with an
    
                                associated EnclosingMethod attribute. This class was probably produced by a
                                compiler that did not target the modern .class file format. The recommended
                                solution is to recompile the class from source, using an up-to-date compiler
                                and without specifying any "-target" type options. The consequence of ignoring
                                this warning is that reflective operations on this class will incorrectly
    KirillMakarov committed Apr 18, 2016
    Configuration menu
    Copy the full SHA
    aee9b8e View commit details
    Browse the repository at this point in the history
  2. increment build version

    KirillMakarov committed Apr 18, 2016
    Configuration menu
    Copy the full SHA
    008a3bd View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2016

  1. Configuration menu
    Copy the full SHA
    c34fcc3 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    de24fa2 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    afc9440 View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2016

  1. Configuration menu
    Copy the full SHA
    61494d8 View commit details
    Browse the repository at this point in the history
  2. increment version code

    KirillMakarov committed Apr 21, 2016
    Configuration menu
    Copy the full SHA
    07cba6a View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    88b1464 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    79dabe0 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    5385938 View commit details
    Browse the repository at this point in the history
  6. remove obsolete extras

    KirillMakarov committed Apr 21, 2016
    Configuration menu
    Copy the full SHA
    fea882b View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    14ab5f4 View commit details
    Browse the repository at this point in the history