Commit Graph

221 Commits

Author SHA1 Message Date
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
Stefan Schüller
49428addcd
Merge pull request #47 from rex07/patch-1
Update strings
2018-12-18 08:33:27 +01:00
Rex_sa
d0d330700c
Update strings
Fix typo
2018-12-18 06:43:10 +00:00
Rex_sa
492837f056
Update strings 2018-12-18 06:33:41 +00:00
Stefan Schüller
050f16094e
Merge pull request #46 from sschueller/develop
Release v1.0.8
2018-12-17 21:33:13 +01:00
Stefan Schueller
519fdb7b00 - Restart video play activity with correct data on trigger from notification 2018-12-17 21:32:01 +01:00
Stefan Schueller
eeb2fcd5f0 - Fixed permission missing for Android Pie 2018-12-17 21:07:49 +01:00
Stefan Schüller
142ed3d053
Merge pull request #44 from sschueller/develop
Release v1.0.7
2018-12-17 19:00:10 +01:00
Stefan Schueller
de7ca4f451 - Fixed crash when stopping playback in notification
- Audio output change detection (headphones unplugged)
- Android 5.0 Support (untested)
2018-12-17 18:54:09 +01:00
Stefan Schueller
67fcb14b0c - WiP 2018-12-17 18:11:41 +01:00
Stefan Schüller
cd5f3e038d
Merge pull request #40 from sschueller/develop
- Missing assets
2018-12-15 22:46:40 +01:00
Stefan Schueller
c86ebdcf2c - Missing assets 2018-12-15 22:45:02 +01:00
Stefan Schüller
ef92ee51a5
Merge pull request #37 from sschueller/develop
Release 1.0.6
2018-12-15 22:03:02 +01:00
Stefan Schueller
a874dc0d5a - Torrent video notice 2018-12-15 22:00:44 +01:00