greg/thorium-fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
184 Commits 1 Branch 0 Tags 7.8 MiB
06e9715754
Commit Graph

184 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stefan Schueller
47cf90727a WIP 2018-12-29 22:10:13 +01:00
Stefan Schueller
45f0531394 Merge branch 'develop' into Login 
# Conflicts:
#	app/src/main/res/values/strings.xml
 2018-12-29 16:43:58 +01:00
Stefan Schüller
c0d2d1c757
Merge pull request #69 from lishoujun/develop 
Translate app to Chinese
 2018-12-29 16:41:44 +01:00
lishoujun
b9c1df10c8 Merge branch 'develop' of https://github.com/lishoujun/peertube-android into develop 2018-12-29 23:26:07 +08:00
lishoujun
b038d06eda add chinese translate. 2018-12-29 23:02:44 +08:00
Stefan Schüller
4f60af831b
Merge pull request #68 from sschueller/develop 
Release v1.0.16
 2018-12-29 15:47:30 +01:00
Stefan Schueller
d3ce980acc Version Bump 2018-12-29 15:46:21 +01:00
Stefan Schueller
26d951e07d Local videos 2018-12-29 15:20:06 +01:00
Stefan Schueller
d7d597f235 Fullscreen Button 2018-12-29 15:09:20 +01:00
Stefan Schueller
f468a9998f Fullscreen Button 2018-12-29 14:21:08 +01:00
Stefan Schueller
36c36a3ea7 Added Licenses 2018-12-29 14:19:54 +01:00
Stefan Schueller
0753881e1e Added Licenses 2018-12-29 14:19:17 +01:00
lishoujun
6cab93bae4 add chinese translate. 2018-12-29 01:06:35 +08:00
Stefan Schueller
8175956bc0 Merge branch 'develop' into Login 
# Conflicts:
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/net/schueller/peertube/activity/LoginActivity.java
#	app/src/main/java/net/schueller/peertube/activity/VideoListActivity.java
#	app/src/main/res/values/strings.xml
 2018-12-26 20:19:21 +01:00
Stefan Schueller
1b9a61df19 Readme update 2018-12-26 20:11:57 +01:00
Stefan Schüller
23de1af500
Merge pull request #66 from sschueller/develop 
Release v1.0.15
 2018-12-26 20:03:03 +01:00
Stefan Schueller
8fc6099892 - Android playback control 
- Audio focus added
 2018-12-26 20:01:29 +01:00
Stefan Schüller
ec7a3b4ffa
Merge pull request #65 from sschueller/develop 
Release v1.0.14
 2018-12-26 16:32:21 +01:00
Stefan Schueller
187e7f2dc3 - Version Bump 2018-12-26 16:30:54 +01:00
Stefan Schueller
a98ae31d35 - Video speed UI improvements 2018-12-26 16:15:34 +01:00
Stefan Schueller
de52e1d9d5 - Kill notification when app is killed 2018-12-26 15:24:02 +01:00
Stefan Schüller
4f5e1d2111
Merge pull request #63 from sschueller/develop 
Release v1.0.13
 2018-12-25 14:51:03 +01:00
Stefan Schüller
67690dd278 - Version bump 2018-12-25 14:49:36 +01:00
Stefan Schüller
d266ed4383 - Moved playspeed into options menu 2018-12-25 14:44:52 +01:00
Stefan Schüller
a4be7d8869 Merge remote-tracking branch 'GitHub/develop' into develop 2018-12-25 14:24:28 +01:00
Stefan Schüller
e15311b3d3 Merge remote-tracking branch 'GitHub/develop' into develop 2018-12-25 14:22:53 +01:00
Stefan Schüller
37549177f7 - Added options menu to video playback 
- Changed video background color to black
- Changed layout of video OSD
 2018-12-25 14:22:16 +01:00
Stefan Schüller
7c3664be9e
Merge pull request #62 from mgdx/develop 
Theme Settings:
 2018-12-25 13:17:49 +01:00
Stefan Schüller
9668678702
Merge pull request #61 from digiwizkid/develop 
Playback speed feature added
 2018-12-25 13:17:35 +01:00
mgdx
761862efd3 Theme Settings: 
- Fix trouble when apps launch for the first time
- Display selected color into settings
- Display msg when color change from settings
 2018-12-25 01:21:26 +01:00
subhadipThinkpad
3e97ec2529 Merge conflict resolved 2018-12-24 20:29:02 +05:30
subhadipThinkpad
b4de986ddb Master codebase marged 2018-12-24 16:12:25 +05:30
Stefan Schüller
8194eb6770
Merge pull request #59 from mgdx/develop 
French translation completed
 2018-12-24 10:21:29 +01:00
subhadipThinkpad
a86f9d3913 Playback speed feature implemented 2018-12-24 10:00:32 +05:30
mgdx
a1bafa7c1f French translation completed 2018-12-24 01:19:57 +01:00
korok
10d2274f52 Merge https://github.com/sschueller/peertube-android 
Update
 2018-12-23 22:37:37 +01:00
Stefan Schüller
645c9bc4b4
Merge pull request #58 from sschueller/develop 
Release v1.0.12
 2018-12-23 16:55:54 +01:00
Stefan Schueller
ae3d4bd8c8 - Settings Theme fix 2018-12-23 16:54:27 +01:00
Stefan Schueller
22450294a1 - Update to Androidx libs 
- Removed bottom bar view dependency
- Switched Icon Font Library
 2018-12-23 16:42:01 +01:00
Stefan Schüller
d9ad009af6
Merge pull request #54 from sschueller/develop 
Release v1.0.11
 2018-12-21 22:02:20 +01:00
Stefan Schueller
55007c6789 Merge branch 'develop' of ssh://github.com/sschueller/peertube-android into develop 2018-12-21 22:00:15 +01:00
Stefan Schueller
d84f2782b7 - Themes and Darkmode 2018-12-21 21:59:10 +01:00
korok
6e78776b64 Merge https://github.com/sschueller/peertube-android 
Update
 2018-12-18 23:41:35 +01:00
Stefan Schüller
a3f8eeced7
Merge pull request #50 from PaulLesur/translation/french 
French translation completed
 2018-12-18 21:39:42 +01:00
Paul
8948eeac9b French translation completed 2018-12-18 21:29:41 +01:00
Stefan Schueller
6163011acd Merge branch 'develop' into Login 
# Conflicts:
#	app/src/main/res/values/strings.xml
 2018-12-18 21:21:58 +01:00
Stefan Schüller
8d75335e54
Merge pull request #49 from sschueller/develop 
Release v1.0.10
 2018-12-18 21:10:45 +01:00
Stefan Schueller
5073875f70 - URL validation 2018-12-18 21:07:03 +01:00
Stefan Schueller
0fed677e6e Merge branch 'develop' of ssh://github.com/sschueller/peertube-android into develop 2018-12-18 20:44:41 +01:00
Stefan Schueller
a1ea242a80 - Adaptive icon 2018-12-18 20:44:23 +01:00