Commit Graph

211 Commits

Author SHA1 Message Date
Stefan Schueller
8f96a266b8 Version Bump 2019-01-09 21:18:21 +01:00
Stefan Schueller
6545d57000 Merge remote-tracking branch 'origin/develop' into develop 2019-01-09 21:13:38 +01:00
Stefan Schüller
bd2dbda775 Wip 2019-01-09 18:13:42 +01:00
Stefan Schüller
63664c5f52 Wip 2019-01-09 18:05:56 +01:00
Stefan Schüller
f3f65eb7d9 Wip 2019-01-09 17:53:26 +01:00
Stefan Schüller
e0d7830c43 Wip 2019-01-09 08:40:28 +01:00
Stefan Schüller
e3774137af - NSFW Filter labeling 2019-01-08 16:34:25 +01:00
Stefan Schueller
66a874f577 WiP 2019-01-07 22:33:10 +01:00
Stefan Schueller
19065b516c Merge branch 'develop' of ssh://github.com/sschueller/peertube-android into develop 2019-01-07 21:40:33 +01:00
Stefan Schüller
a0d88194b3
Merge pull request #99 from digiwizkid/develop
Video quality selection settings and Bengali translation
2019-01-07 21:13:10 +01:00
subhadipThinkpad
d1d7143d77 Bengali Translation added 2019-01-07 03:35:05 +05:30
subhadipThinkpad
5dfa88b506 Video quality selection setting feature added 2019-01-07 02:43:25 +05:30
subhadipThinkpad
5bbcd8c3bf Merge remote-tracking branch 'upstream/develop' into develop 2019-01-06 23:18:28 +05:30
Stefan Schueller
cd2726de80 Moved torrent progressbas into video OSD 2019-01-06 14:56:40 +01:00
Stefan Schüller
ec8a38dcee
Merge pull request #94 from ferhadnecef/stringlate-ru-9064
Updated ru (Russian) translation
2019-01-06 14:23:41 +01:00
Stefan Schueller
c932f24bbc Changelog update 2019-01-06 14:21:57 +01:00
Stefan Schueller
56de865ad2 Version bump and readme update 2019-01-06 14:19:31 +01:00
Stefan Schueller
f94eb12f27 - Cleaned up 2019-01-06 14:13:05 +01:00
Stefan Schueller
3f0c275cdc - Cleaned up full screen button and activation 2019-01-06 13:28:07 +01:00
Stefan Schüller
a397822c23 - Added duration to video list 2019-01-06 03:23:18 +01:00
Stefan Schüller
d0d3f6c634 - Moved video playback into fragment 2019-01-06 02:28:13 +01:00
Stefan Schüller
9fa7a3bbc7 - Moved video playback into fragment 2019-01-06 02:22:55 +01:00
Stefan Schüller
33a0f501ae - Moved video playback into fragment 2019-01-06 02:14:03 +01:00
Stefan Schüller
0c11d8fba5 - Like / dislike cleanup
- Video download
- Version bump
2019-01-05 23:05:01 +01:00
ferhad.necef
06e9715754
Merge branch 'develop' into stringlate-ru-9064 2019-01-05 15:38:48 +03:00
Stefan Schüller
77579315c5 Version bump 2019-01-04 23:38:08 +01:00
Stefan Schüller
64deb952d9 Merge branch 'develop' of ssh://github.com/sschueller/peertube-android into develop 2019-01-04 23:32:44 +01:00
Stefan Schüller
33dc848a93 - Like / dislike, basic functionality 2019-01-04 23:32:07 +01:00
Stefan Schüller
991a758605
Merge pull request #95 from lishoujun/develop
add log to debug #86 fatal
2019-01-04 23:20:49 +01:00
Stefan Schüller
f61eeb5eca - Moved video metadata into fragment 2019-01-04 23:19:10 +01:00
ferhad.necef
10f3daf60b Updated ru (Russian) translation 2019-01-04 23:59:45 +08:00
lishoujun
875cb0fd54 add log to debug #86 2019-01-04 23:54:19 +08:00
Stefan Schüller
46c3241d10
Merge pull request #93 from ferhadnecef/stringlate-ru-9079
Updated ru (Russian) translation
2019-01-04 15:44:36 +01:00
ferhad.necef
af08efdaab Updated ru (Russian) translation 2019-01-04 17:36:34 +03:00
ferhad.necef
c10c3c01a7 Updated ru (Russian) translation 2019-01-04 17:30:58 +03:00
Stefan Schüller
ccc0b41db1
Merge pull request #92 from lishoujun/develop
add common activity
2019-01-03 16:46:12 +01:00
lishoujun
a5cc3f29b2 change the super class to CommonActivity.
Put common thing like NightMode or Apptheme in CommonActivity.
So the business activity will be more clean.
2019-01-03 23:41:39 +08:00
Stefan Schüller
c5af712dc7
Merge pull request #91 from lishoujun/develop
translate zh
2019-01-03 16:17:20 +01:00
lishoujun
811134588a translate zh.
some string should not be translate add translatable false mark.
2019-01-03 22:42:28 +08:00
subhadipThinkpad
641b515a4c Merge remote-tracking branch 'upstream/develop' into develop 2019-01-03 19:58:03 +05:30
Stefan Schüller
32c46319a0
Merge pull request #90 from lishoujun/develop
fix crash
2019-01-03 08:10:31 +01:00
lishoujun
ba0db9c3db fix crash 2019-01-03 09:51:28 +08:00
Stefan Schüller
eca8a54e7f
Merge pull request #89 from lishoujun/develop
Stop torrentStream  when activity onDestroy.
2019-01-02 19:27:07 +01:00
lishoujun
92396200e2 I think torrentStream should be stoped when activity onDestroy.
add some log to debug.
handle nullpointer
2019-01-03 01:12:17 +08:00
lishoujun
7c84457fe3 Merge branch 'develop' of https://github.com/sschueller/peertube-android into develop 2019-01-02 22:18:52 +08:00
Stefan Schüller
77ddc86e5f
Merge pull request #88 from rex07/patch-3
update ar
2019-01-02 13:15:09 +01:00
Rex_sa
c190b5f46c
update ar 2019-01-02 07:11:34 +03:00
Stefan Schüller
31d93fffd3 Merge branch 'Login' into develop 2019-01-01 23:57:00 +01:00
Stefan Schüller
654e2be933 - Basic Login 2019-01-01 23:56:26 +01:00
lishoujun
cbe2bb45e3 update dependence. minor change 2019-01-01 12:40:46 +08:00