Peertube
/
Thorium-android-app
mirror of https://github.com/sschueller/peertube-android
1
0
Fork 0
Code Issues Releases Wiki Activity

Commit Graph

  • b46a09fc37
         Merge pull request #117 from sschueller/develop Stefan Schüller 2019-01-20 18:14:38 +0100
  • 2583175eca Version bump, string fix #117 Stefan Schüller 2019-01-20 18:01:34 +0100
  • baab761542 Merge branch 'develop' of ssh://github.com/sschueller/peertube-android into develop Stefan Schüller 2019-01-20 17:53:02 +0100
  • a4864a71a8 Account details and account video list added Stefan Schueller 2019-01-06 15:22:14 +0100
  • e60761fa72 change the list image's padding. from 12 to 0. lishoujun 2019-01-19 23:29:14 +0800
  • cc99343205
         Merge pull request #111 from lishoujun/develop Stefan Schüller 2019-01-19 14:49:03 +0100
  • 6c333c8e29
         Merge pull request #112 from digiwizkid/patch-1 Stefan Schüller 2019-01-19 14:48:50 +0100
  • ce6a5a49b2
         Fixed the closing </string> issue #112 Digiwizkid 2019-01-19 19:14:58 +0530
  • 75b9b807c6 update gradle version suggested by as #111 lishoujun 2019-01-19 00:40:05 +0800
  • ca62a926a5
         Merge pull request #110 from oktay454/patch-1 Stefan Schüller 2019-01-16 10:17:47 +0100
  • 3cb21e13e5
         Incorrect translation correction #110 Kemal Oktay 2019-01-15 23:12:02 +0300
  • 9726843772
         Turkish Translation added Kemal Oktay 2019-01-15 22:57:36 +0300
  • 172fb3901d
         Merge pull request #108 from lishoujun/develop Stefan Schüller 2019-01-14 09:05:50 +0100
  • 029814e14e add login values check. update Chinese translate. #108 lishoujun 2019-01-12 20:40:32 +0800
  • a67f6591e3
         Merge pull request #106 from sschueller/develop Stefan Schüller 2019-01-09 21:29:22 +0100
  • 1869cff5b0 Version Bump #106 Stefan Schueller 2019-01-09 21:21:47 +0100
  • 8f96a266b8 Version Bump Stefan Schueller 2019-01-09 21:18:21 +0100
  • 6545d57000 Merge remote-tracking branch 'origin/develop' into develop Stefan Schueller 2019-01-09 21:13:38 +0100
  • bd2dbda775 Wip Stefan Schüller 2019-01-09 18:13:42 +0100
  • 63664c5f52 Wip Stefan Schüller 2019-01-09 18:05:56 +0100
  • f3f65eb7d9 Wip Stefan Schüller 2019-01-09 17:53:26 +0100
  • e0d7830c43 Wip Stefan Schüller 2019-01-09 08:40:28 +0100
  • e3774137af - NSFW Filter labeling Stefan Schüller 2019-01-08 16:34:25 +0100
  • efd5fe263d
         Merge branch 'develop' into stringlate-ru-7046 #100 ferhad.necef 2019-01-08 12:11:30 +0300
  • 17c1c8558d Updated ru (Russian) translation #101 ferhad.necef 2019-01-08 11:35:34 +0300
  • e73cd177a9 Updated ru (Russian) translation ferhad.necef 2019-01-08 06:52:35 +0300
  • 66a874f577 WiP Stefan Schueller 2019-01-07 22:33:10 +0100
  • 19065b516c Merge branch 'develop' of ssh://github.com/sschueller/peertube-android into develop Stefan Schueller 2019-01-07 21:40:33 +0100
  • a0d88194b3
         Merge pull request #99 from digiwizkid/develop Stefan Schüller 2019-01-07 21:13:10 +0100
  • d1d7143d77 Bengali Translation added #99 subhadipThinkpad 2019-01-07 03:35:05 +0530
  • 5dfa88b506 Video quality selection setting feature added subhadipThinkpad 2019-01-07 02:43:25 +0530
  • 5bbcd8c3bf Merge remote-tracking branch 'upstream/develop' into develop subhadipThinkpad 2019-01-06 23:18:28 +0530
  • cd2726de80 Moved torrent progressbas into video OSD Stefan Schueller 2019-01-06 14:56:40 +0100
  • ec8a38dcee
         Merge pull request #94 from ferhadnecef/stringlate-ru-9064 Stefan Schüller 2019-01-06 14:23:41 +0100
  • 94ac570b01
         Merge pull request #98 from sschueller/develop Stefan Schüller 2019-01-06 14:23:23 +0100
  • c932f24bbc Changelog update #98 Stefan Schueller 2019-01-06 14:21:57 +0100
  • 56de865ad2 Version bump and readme update Stefan Schueller 2019-01-06 14:19:31 +0100
  • f94eb12f27 - Cleaned up Stefan Schueller 2019-01-06 14:13:05 +0100
  • 3f0c275cdc - Cleaned up full screen button and activation Stefan Schueller 2019-01-06 13:28:07 +0100
  • a397822c23 - Added duration to video list Stefan Schüller 2019-01-06 03:23:18 +0100
  • d0d3f6c634 - Moved video playback into fragment Stefan Schüller 2019-01-06 02:28:13 +0100
  • 9fa7a3bbc7 - Moved video playback into fragment Stefan Schüller 2019-01-06 02:22:55 +0100
  • 33a0f501ae - Moved video playback into fragment Stefan Schüller 2019-01-06 02:14:03 +0100
  • 4edf67a0f2
         Merge pull request #97 from sschueller/develop Stefan Schüller 2019-01-05 23:06:41 +0100
  • 0c11d8fba5 - Like / dislike cleanup - Video download - Version bump #97 Stefan Schüller 2019-01-05 23:05:01 +0100
  • 06e9715754
         Merge branch 'develop' into stringlate-ru-9064 #94 ferhad.necef 2019-01-05 15:38:48 +0300
  • 0e87a1c673
         Merge pull request #96 from sschueller/develop Stefan Schüller 2019-01-04 23:39:37 +0100
  • 77579315c5 Version bump #96 Stefan Schüller 2019-01-04 23:38:08 +0100
  • 64deb952d9 Merge branch 'develop' of ssh://github.com/sschueller/peertube-android into develop Stefan Schüller 2019-01-04 23:32:44 +0100
  • 33dc848a93 - Like / dislike, basic functionality Stefan Schüller 2019-01-04 23:32:07 +0100
  • 991a758605
         Merge pull request #95 from lishoujun/develop Stefan Schüller 2019-01-04 23:20:49 +0100
  • f61eeb5eca - Moved video metadata into fragment Stefan Schüller 2019-01-04 23:19:10 +0100
  • 10f3daf60b Updated ru (Russian) translation #95 ferhad.necef 2019-01-04 17:30:58 +0300
  • 875cb0fd54 add log to debug #86 lishoujun 2019-01-04 23:52:09 +0800
  • 46c3241d10
         Merge pull request #93 from ferhadnecef/stringlate-ru-9079 Stefan Schüller 2019-01-04 15:44:36 +0100
  • af08efdaab Updated ru (Russian) translation ferhad.necef 2019-01-04 17:36:34 +0300
  • c10c3c01a7 Updated ru (Russian) translation #93 ferhad.necef 2019-01-04 17:30:58 +0300
  • ccc0b41db1
         Merge pull request #92 from lishoujun/develop Stefan Schüller 2019-01-03 16:46:12 +0100
  • a5cc3f29b2 change the super class to CommonActivity. Put common thing like NightMode or Apptheme in CommonActivity. So the business activity will be more clean. #92 lishoujun 2019-01-03 23:41:39 +0800
  • c5af712dc7
         Merge pull request #91 from lishoujun/develop Stefan Schüller 2019-01-03 16:17:20 +0100
  • 811134588a translate zh. some string should not be translate add translatable false mark. #91 lishoujun 2019-01-03 22:40:24 +0800
  • 641b515a4c Merge remote-tracking branch 'upstream/develop' into develop subhadipThinkpad 2019-01-03 19:58:03 +0530
  • 32c46319a0
         Merge pull request #90 from lishoujun/develop Stefan Schüller 2019-01-03 08:10:31 +0100
  • ba0db9c3db fix crash #90 lishoujun 2019-01-03 09:51:28 +0800
  • eca8a54e7f
         Merge pull request #89 from lishoujun/develop Stefan Schüller 2019-01-02 19:27:07 +0100
  • 92396200e2 I think torrentStream should be stoped when activity onDestroy. add some log to debug. handle nullpointer #89 lishoujun 2019-01-03 01:12:17 +0800
  • 7c84457fe3 Merge branch 'develop' of https://github.com/sschueller/peertube-android into develop lishoujun 2019-01-02 22:18:52 +0800
  • 77ddc86e5f
         Merge pull request #88 from rex07/patch-3 Stefan Schüller 2019-01-02 13:15:09 +0100
  • c190b5f46c
         update ar #88 Rex_sa 2019-01-02 07:11:34 +0300
  • cc5476e438
         Merge pull request #85 from sschueller/develop Stefan Schüller 2019-01-02 00:04:28 +0100
  • 31d93fffd3 Merge branch 'Login' into develop #85 Stefan Schüller 2019-01-01 23:57:00 +0100
  • 654e2be933 - Basic Login Stefan Schüller 2019-01-01 23:56:26 +0100
  • cbe2bb45e3 update dependence. minor change lishoujun 2019-01-01 12:40:46 +0800
  • baa091bb2f
         Merge pull request #84 from rex07/patch-2 Stefan Schüller 2018-12-31 21:54:10 +0100
  • 216417ffe2
         fix #84 Rex_sa 2018-12-31 23:45:33 +0300
  • fbbbaf919e Merge branch 'develop' into Login Stefan Schüller 2018-12-31 20:55:19 +0100
  • d3a2e3ef50
         Merge pull request #83 from sschueller/develop Stefan Schüller 2018-12-31 20:49:27 +0100
  • 275355bf9e - Changelog #83 Stefan Schüller 2018-12-31 20:48:36 +0100
  • ce70a0d15d - Version bump Stefan Schüller 2018-12-31 20:45:50 +0100
  • f485f4efa7 - Added all supported languages Stefan Schüller 2018-12-31 20:45:08 +0100
  • 9cc108827f wip Stefan Schüller 2018-12-31 20:32:22 +0100
  • 068dca5d09
         Merge pull request #82 from lishoujun/develop Stefan Schüller 2018-12-31 20:31:51 +0100
  • 6e2ef78751 add languages MultiSelectListPreference. but not all languages. #82 lishoujun 2019-01-01 02:15:35 +0800
  • 537eefda1f Merge remote-tracking branch 'upstream/develop' into develop subhadipThinkpad 2018-12-31 23:15:34 +0530
  • 6535ac37c3 Codebase merged from master subhadipThinkpad 2018-12-31 22:37:36 +0530
  • 9f20a38560
         Merge pull request #79 from sschueller/develop Stefan Schüller 2018-12-31 09:25:47 +0100
  • 9541ccf652 Version Bump v1.0.18 #79 Stefan Schueller 2018-12-31 09:17:12 +0100
  • e609325058 Merge branch 'develop' of ssh://github.com/sschueller/peertube-android into develop Stefan Schüller 2018-12-31 08:54:58 +0100
  • 86f36a97eb Added changelog Stefan Schüller 2018-12-31 08:54:10 +0100
  • 449b09b69f
         Merge pull request #76 from BoFFire/patch-1 Stefan Schüller 2018-12-31 08:36:55 +0100
  • 44034a8a41
         Merge pull request #78 from lishoujun/develop Stefan Schüller 2018-12-31 08:36:23 +0100
  • b21b4e945d add null check to playerNotificationManager and player on Destroy #78 lishoujun 2018-12-31 14:50:52 +0800
  • 32f5a72450
         Minor fix in arabic strings #76 ButterflyOfFire 2018-12-30 19:56:23 +0100
  • 55f2c07321
         Merge pull request #74 from BoFFire/stringlate-ar-2678 Stefan Schüller 2018-12-30 17:43:09 +0100
  • 112edd2608 Updated ar (Arabic) translation #74 ButterflyOfFire 2018-12-30 17:40:17 +0100
  • 536dd626a9 Merge branch 'develop' into Login Stefan Schueller 2018-12-30 14:58:02 +0100
  • 59942ad4c7
         Merge pull request #73 from lishoujun/develop Stefan Schüller 2018-12-30 14:50:16 +0100
  • 1db733d64f update dependence. minor change #73 lishoujun 2018-12-30 14:15:59 +0800
  • 4888429115 Merge branch 'develop' of https://github.com/sschueller/peertube-android into develop lishoujun 2018-12-30 10:00:36 +0800
  • 684809e383 Merge branch 'master' of https://github.com/lishoujun/peertube-android into develop lishoujun 2018-12-30 09:43:45 +0800