Commit Graph

  • 50c1118ad1
    Merge pull request #72 from sschueller/develop Stefan Schüller 2018-12-29 22:38:44 +0100
  • 5ce1225530 Merge branch 'develop' of ssh://github.com/sschueller/peertube-android into develop #72 Stefan Schueller 2018-12-29 22:37:44 +0100
  • 3f93ccfc92 Replaced more icon with fonts Stefan Schueller 2018-12-29 22:36:54 +0100
  • 47cf90727a WIP Stefan Schueller 2018-12-29 22:10:13 +0100
  • 45f0531394 Merge branch 'develop' into Login Stefan Schueller 2018-12-29 16:43:58 +0100
  • c0d2d1c757
    Merge pull request #69 from lishoujun/develop Stefan Schüller 2018-12-29 16:41:44 +0100
  • b9c1df10c8 Merge branch 'develop' of https://github.com/lishoujun/peertube-android into develop #69 lishoujun 2018-12-29 23:26:07 +0800
  • b038d06eda add chinese translate. lishoujun 2018-12-29 23:02:44 +0800
  • 4f60af831b
    Merge pull request #68 from sschueller/develop Stefan Schüller 2018-12-29 15:47:30 +0100
  • d3ce980acc Version Bump #68 Stefan Schueller 2018-12-29 15:46:21 +0100
  • 26d951e07d Local videos Stefan Schueller 2018-12-29 15:20:06 +0100
  • d7d597f235 Fullscreen Button Stefan Schueller 2018-12-29 15:09:20 +0100
  • f468a9998f Fullscreen Button Stefan Schueller 2018-12-29 14:21:08 +0100
  • 36c36a3ea7 Added Licenses Stefan Schueller 2018-12-29 14:19:54 +0100
  • 0753881e1e Added Licenses Stefan Schueller 2018-12-29 14:19:17 +0100
  • 6cab93bae4 add chinese translate. lishoujun 2018-12-29 01:06:35 +0800
  • 8175956bc0 Merge branch 'develop' into Login Stefan Schueller 2018-12-26 20:19:21 +0100
  • 1b9a61df19 Readme update Stefan Schueller 2018-12-26 20:11:57 +0100
  • 23de1af500
    Merge pull request #66 from sschueller/develop Stefan Schüller 2018-12-26 20:03:03 +0100
  • 8fc6099892 - Android playback control - Audio focus added #66 Stefan Schueller 2018-12-26 20:01:29 +0100
  • ec7a3b4ffa
    Merge pull request #65 from sschueller/develop Stefan Schüller 2018-12-26 16:32:21 +0100
  • 187e7f2dc3 - Version Bump #65 Stefan Schueller 2018-12-26 16:30:54 +0100
  • a98ae31d35 - Video speed UI improvements Stefan Schueller 2018-12-26 16:15:34 +0100
  • de52e1d9d5 - Kill notification when app is killed Stefan Schueller 2018-12-26 15:24:02 +0100
  • 4f5e1d2111
    Merge pull request #63 from sschueller/develop Stefan Schüller 2018-12-25 14:51:03 +0100
  • 67690dd278 - Version bump #63 Stefan Schüller 2018-12-25 14:49:36 +0100
  • d266ed4383 - Moved playspeed into options menu Stefan Schüller 2018-12-25 14:44:52 +0100
  • a4be7d8869 Merge remote-tracking branch 'GitHub/develop' into develop Stefan Schüller 2018-12-25 14:24:28 +0100
  • e15311b3d3 Merge remote-tracking branch 'GitHub/develop' into develop Stefan Schüller 2018-12-25 14:22:53 +0100
  • 37549177f7 - Added options menu to video playback - Changed video background color to black - Changed layout of video OSD Stefan Schüller 2018-12-25 14:22:16 +0100
  • 7c3664be9e
    Merge pull request #62 from mgdx/develop Stefan Schüller 2018-12-25 13:17:49 +0100
  • 9668678702
    Merge pull request #61 from digiwizkid/develop Stefan Schüller 2018-12-25 13:17:35 +0100
  • 761862efd3 Theme Settings: #62 mgdx 2018-12-25 01:21:26 +0100
  • 3e97ec2529 Merge conflict resolved #61 subhadipThinkpad 2018-12-24 20:24:59 +0530
  • b4de986ddb Master codebase marged subhadipThinkpad 2018-12-24 16:12:25 +0530
  • 8194eb6770
    Merge pull request #59 from mgdx/develop Stefan Schüller 2018-12-24 10:21:29 +0100
  • a86f9d3913 Playback speed feature implemented subhadipThinkpad 2018-12-24 10:00:32 +0530
  • a1bafa7c1f French translation completed #59 mgdx 2018-12-24 01:19:57 +0100
  • 10d2274f52 Merge https://github.com/sschueller/peertube-android korok 2018-12-23 22:37:37 +0100
  • 645c9bc4b4
    Merge pull request #58 from sschueller/develop Stefan Schüller 2018-12-23 16:55:54 +0100
  • ae3d4bd8c8 - Settings Theme fix #58 Stefan Schueller 2018-12-23 16:54:27 +0100
  • 22450294a1 - Update to Androidx libs - Removed bottom bar view dependency - Switched Icon Font Library Stefan Schueller 2018-12-23 16:42:01 +0100
  • d9ad009af6
    Merge pull request #54 from sschueller/develop Stefan Schüller 2018-12-21 22:02:20 +0100
  • 55007c6789 Merge branch 'develop' of ssh://github.com/sschueller/peertube-android into develop #54 Stefan Schueller 2018-12-21 22:00:15 +0100
  • d84f2782b7 - Themes and Darkmode Stefan Schueller 2018-12-21 21:59:10 +0100
  • 6e78776b64 Merge https://github.com/sschueller/peertube-android korok 2018-12-18 23:41:35 +0100
  • a3f8eeced7
    Merge pull request #50 from PaulLesur/translation/french Stefan Schüller 2018-12-18 21:39:42 +0100
  • 8948eeac9b French translation completed #50 Paul 2018-12-18 21:29:41 +0100
  • 6163011acd Merge branch 'develop' into Login Stefan Schueller 2018-12-18 21:21:58 +0100
  • 8d75335e54
    Merge pull request #49 from sschueller/develop Stefan Schüller 2018-12-18 21:10:45 +0100
  • 5073875f70 - URL validation #49 Stefan Schueller 2018-12-18 21:07:03 +0100
  • 0fed677e6e Merge branch 'develop' of ssh://github.com/sschueller/peertube-android into develop Stefan Schueller 2018-12-18 20:44:41 +0100
  • a1ea242a80 - Adaptive icon Stefan Schueller 2018-12-18 20:44:23 +0100
  • 49428addcd
    Merge pull request #47 from rex07/patch-1 Stefan Schüller 2018-12-18 08:33:27 +0100
  • d0d330700c
    Update strings #47 Rex_sa 2018-12-18 06:43:10 +0000
  • 492837f056
    Update strings Rex_sa 2018-12-18 06:33:41 +0000
  • 050f16094e
    Merge pull request #46 from sschueller/develop Stefan Schüller 2018-12-17 21:33:13 +0100
  • 519fdb7b00 - Restart video play activity with correct data on trigger from notification #46 Stefan Schueller 2018-12-17 21:32:01 +0100
  • eeb2fcd5f0 - Fixed permission missing for Android Pie Stefan Schueller 2018-12-17 21:07:49 +0100
  • 142ed3d053
    Merge pull request #44 from sschueller/develop Stefan Schüller 2018-12-17 19:00:10 +0100
  • de7ca4f451 - Fixed crash when stopping playback in notification - Audio output change detection (headphones unplugged) - Android 5.0 Support (untested) #44 Stefan Schueller 2018-12-17 18:54:09 +0100
  • 67fcb14b0c - WiP Stefan Schueller 2018-12-17 18:11:41 +0100
  • 1486167bf3 Add detection of unplugged headphone & stop video activity function for that #42 korok 2018-12-16 20:02:31 +0100
  • cd5f3e038d
    Merge pull request #40 from sschueller/develop Stefan Schüller 2018-12-15 22:46:40 +0100
  • c86ebdcf2c - Missing assets #40 Stefan Schueller 2018-12-15 22:45:02 +0100
  • ef92ee51a5
    Merge pull request #37 from sschueller/develop Stefan Schüller 2018-12-15 22:03:02 +0100
  • a874dc0d5a - Torrent video notice #37 Stefan Schueller 2018-12-15 22:00:44 +0100
  • a6ce0a570d - Video player moved into service - Video notification and background playback Stefan Schueller 2018-12-15 21:59:59 +0100
  • 6a50094fda - Share ability Stefan Schueller 2018-12-15 14:24:11 +0100
  • 152ccbd3ac
    Merge pull request #33 from sschueller/develop Stefan Schüller 2018-12-02 17:32:48 +0100
  • 82c1d19abd - Version Bump #33 Stefan Schueller 2018-12-02 17:29:13 +0100
  • 43b10c680d - Better search Stefan Schueller 2018-12-02 17:28:18 +0100
  • d65243945f Merge branch 'develop' into Login Stefan Schueller 2018-12-02 15:12:17 +0100
  • bc8d0788be Merge branch 'master' into Login Stefan Schueller 2018-12-02 15:09:56 +0100
  • 57c3079c68 - Prevent fatal when server URL is invalid Stefan Schueller 2018-12-02 14:59:14 +0100
  • 1179f75677
    Merge pull request #32 from sschueller/develop Stefan Schüller 2018-12-02 14:49:57 +0100
  • 7120a36091 - Remove unavailable feature #32 Stefan Schueller 2018-12-02 14:44:34 +0100
  • 0cd6972a30 - Moved permissions to only ask when required Stefan Schueller 2018-12-02 14:40:44 +0100
  • 484de114a4 Merge branch 'develop' of ssh://github.com/sschueller/peertube-android into develop Stefan Schueller 2018-12-02 14:29:34 +0100
  • 0f34a0f816
    Merge pull request #31 from PaulLesur/bugfix/screen_off Stefan Schüller 2018-12-02 14:28:49 +0100
  • 36aa4d07ac
    Merge pull request #28 from PaulLesur/translation/french Stefan Schüller 2018-12-02 14:28:30 +0100
  • 914c247463 - loing WIP Stefan Schueller 2018-12-02 14:27:00 +0100
  • deb4e7b526 [Bugfix] Screen doesn't turn off when playing a video #31 Paul 2018-11-30 11:25:42 +0100
  • b2c93eace6 [Translation] Strings translated to french #28 Paul 2018-11-29 15:14:20 +0100
  • c0dd67167a - URL cleanup - WIP: Login activity Stefan Schueller 2018-11-13 22:16:30 +0100
  • f8cfd7ea8c - Cleanup - Removed play services Stefan Schueller 2018-11-13 21:04:06 +0100
  • 91d4b0c9ad - Server selection stubs Stefan Schueller 2018-11-11 14:53:32 +0100
  • f176aabb60
    Merge pull request #21 from sschueller/develop Stefan Schüller 2018-11-11 14:09:02 +0100
  • cb091c0694 - Updated readme #21 Stefan Schueller 2018-11-11 14:08:18 +0100
  • 9ceed22423
    Merge pull request #20 from sschueller/develop Stefan Schüller 2018-11-11 01:24:04 +0100
  • 6a0e92aa0d - Removed unused permissions #20 Stefan Schueller 2018-11-11 01:22:28 +0100
  • 6c53bf6c22 - fixed default NSFW setting Stefan Schueller 2018-11-11 01:15:06 +0100
  • 6e7d85c74a - Implemented basic search Stefan Schueller 2018-11-10 22:40:27 +0100
  • 79ab5e55dd
    Merge pull request #19 from sschueller/develop Stefan Schüller 2018-11-10 17:51:03 +0100
  • 2552d13382 - Update to SDK 28 #19 Stefan Schueller 2018-11-10 17:48:09 +0100
  • c27ecd713e - License Stefan Schueller 2018-11-08 00:01:04 +0100
  • 85e0862414 - Full screen on landscape Stefan Schueller 2018-11-07 23:50:54 +0100
  • 3709b6c043 - gradle update - added nsfw Stefan Schueller 2018-11-07 23:11:19 +0100
  • 15dbfbfaee
    Merge pull request #17 from sschueller/develop Stefan Schüller 2018-07-01 17:06:39 +0200
  • 7ffc0444d3 - added search data service #17 Stefan Schueller 2018-07-01 17:04:50 +0200