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

1044 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stefan Schüller
b9eeb06b5b
Merge pull request #203 from sschueller/develop 
fix https://github.com/sschueller/peertube-android/issues/202
 2020-07-04 22:37:14 +02:00
Stefan Schueller
3a29bf5985 fix https://github.com/sschueller/peertube-android/issues/202 2020-07-04 22:36:17 +02:00
Florian CUNY
70593c17ee Added preview of the current playback speed and video quality in the VideoOptionsFragment 2020-07-04 22:30:58 +02:00
Florian CUNY
8d7063ee78 Added VideoPlayerService#getPlayBackSpeed 2020-07-04 22:30:00 +02:00
Florian CUNY
12e4c7fa35 Made the preferences not retain the margin reserved to icons in SettingsActivity 
Android reserves some space next to a preference to let developers put an icon there.
As there aren't any icons, I added app:iconSpaceReserved="false" to all the preferences in order to "remove" this useless blank space.
 2020-07-04 21:41:24 +02:00
Florian CUNY
58c338880a Removed unused import in SettingsActivity.java 2020-07-04 21:38:29 +02:00
Stefan Schüller
3933f79bda
Merge pull request #200 from sschueller/develop 
Version 1.0.42
 2020-07-04 20:58:29 +02:00
Stefan Schueller
9f892a5065 Lib version bump 2020-07-04 20:57:35 +02:00
Stefan Schueller
1d2035e4f8 Version 1.0.42 2020-07-04 20:54:09 +02:00
Stefan Schueller
057c521a4a Fix merge 2020-07-04 20:50:26 +02:00
Stefan Schueller
d73527bac6 Merge branch 'develop' of https://hosted.weblate.org/git/peertube/android into develop 
 Conflicts:
	app/src/main/res/values-fr/strings.xml
	app/src/main/res/values-tr/strings.xml
 2020-07-04 20:48:17 +02:00
Stefan Schueller
9ffea41df5 Added more fields to server list 2020-07-04 20:46:32 +02:00
Stefan Schüller
b9d6aff740
Merge pull request #199 from Poslovitch/appbar-settings-activity 
Added appbar at the top of the SettingsActivity
 2020-07-04 19:39:27 +02:00
Florian CUNY
4f1a6fd97c Added appbar at the top of the SettingsActivity 2020-07-04 17:26:01 +02:00
Stefan Schueller
15ce004b26 Fixed https://github.com/sschueller/peertube-android/issues/194 with new Lib. 2020-07-04 17:01:49 +02:00
Don Kimberlin
d6d2f4a9ca
Merge pull request #10 from sschueller/develop 
synching up
 2020-07-04 07:35:26 -07:00
Stefan Schüller
555db86072
Merge pull request #195 from dhk2/fixnotification 
Add stop button to expanded notification, and stop and switch to audio in video window
 2020-07-04 16:27:35 +02:00
Stefan Schüller
21fa31e789
Merge pull request #198 from Poslovitch/french-translations 
Improved and added some French translations
 2020-07-04 16:26:35 +02:00
Stefan Schüller
6c140059e3
Merge pull request #197 from Poslovitch/untranslatable-strings 
Removed translations for untranslatable strings
 2020-07-04 16:25:40 +02:00
Florian CUNY
3505952187 Improved and added some French translations 2020-07-04 14:34:34 +02:00
Florian CUNY
6f51d8f6b3 Removed translations for untranslatable strings 2020-07-04 14:21:31 +02:00
dhk2
83898c81cd Bug fix for DateUtils not working as documented 2020-07-03 22:06:38 -07:00
dhk2
7790ca4592 Bug fix for DateUtils not working as documented 2020-07-03 21:58:56 -07:00
dhk2
d11d19e164 Bug fix for DateUtils not working as documented 2020-07-03 21:53:58 -07:00
dhk2
1d3a464c62 Bug fix for DateUtils not working as documented 2020-07-03 21:48:43 -07:00
dhk2
2c5248aebb Bug fix for DateUtils not working as documented 2020-07-03 21:41:35 -07:00
dhk2
39c38ca0fa Fixing unregister error for noisy audio 2020-07-03 20:35:53 -07:00
dhk2
a99e9978de Fixing unregister error for noisy audio 2020-07-03 20:33:14 -07:00
dhk2
9d1ffd77c3 Trying to assuage gits conflict adverse attitude 2020-07-03 20:09:33 -07:00
dhk2
63469d12be Trying to assuage gits conflict adverse attitude 2020-07-03 16:15:15 -07:00
dhk2
46f6cf5169 Trying to assuage gits conflict adverse attitude 2020-07-03 16:08:05 -07:00
dhk2
42ce468b31 Trying to assuage gits conflict adverse attitude 2020-07-03 16:06:14 -07:00
dhk2
6995d9fde6 adding controls to exit pip or switch to background audio 2020-07-03 16:02:57 -07:00
dhk2
fabb8a6d79 adding controls to exit pip or switch to background audio 2020-07-03 16:00:29 -07:00
dhk2
c05c67e7f8 adding controls to exit pip or switch to background audio 2020-07-03 15:53:38 -07:00
dhk2
81e92a421a adding controls to exit pip or switch to background audio 2020-07-03 15:50:54 -07:00
dhk2
76b3ddcf69 adding controls to exit pip or switch to background audio 2020-07-03 15:47:20 -07:00
dhk2
71bc325d49 adding controls to exit pip or switch to background audio 2020-07-03 15:44:22 -07:00
dhk2
33779e10a1 adding controls to exit pip or switch to background audio 2020-07-03 15:43:13 -07:00
dhk2
bec85eab89 adding controls to exit pip or switch to background audio 2020-07-03 15:41:42 -07:00
dhk2
b7fc1b02a3 adding controls to exit pip or switch to background audio 2020-07-03 15:40:12 -07:00
dhk2
f6cfe248f4 adding controls to exit pip or switch to background audio 2020-07-03 15:38:41 -07:00
dhk2
7c0f45c602 adding controls to exit pip or switch to background audio 2020-07-03 15:35:26 -07:00
dhk2
2bfc846ec0 adding controls to exit pip or switch to background audio 2020-07-03 15:32:19 -07:00
dhk2
dd455de955 adding controls to exit pip or switch to background audio 2020-07-03 15:28:03 -07:00
dhk2
35742c656e adding controls to exit pip or switch to background audio 2020-07-03 15:23:42 -07:00
dhk2
c4da2a5369 adding controls to exit pip or switch to background audio 2020-07-03 15:22:12 -07:00
dhk2
fb6462a67f adding controls to exit pip or switch to background audio 2020-07-03 15:17:31 -07:00
dhk2
a11a62ede4 adding controls to exit pip or switch to background audio 2020-07-03 15:04:57 -07:00
Don Kimberlin
d4b4f3f023
Merge pull request #9 from sschueller/develop 
arg still trying to get the stupid conflict messages over spaces to go away
 2020-07-03 14:54:29 -07:00