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
|
cc5476e438
|
Merge pull request #85 from sschueller/develop
Release v1.0.20
|
2019-01-02 00:04:28 +01: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 |
|
Stefan Schüller
|
baa091bb2f
|
Merge pull request #84 from rex07/patch-2
Update AR Strings
|
2018-12-31 21:54:10 +01:00 |
|
Rex_sa
|
216417ffe2
|
fix
|
2018-12-31 23:45:33 +03:00 |
|
Stefan Schüller
|
fbbbaf919e
|
Merge branch 'develop' into Login
# Conflicts:
# app/src/main/java/net/schueller/peertube/activity/VideoListActivity.java
|
2018-12-31 20:55:19 +01:00 |
|
Stefan Schüller
|
d3a2e3ef50
|
Merge pull request #83 from sschueller/develop
Release v1.0.19
|
2018-12-31 20:49:27 +01:00 |
|
Stefan Schüller
|
275355bf9e
|
- Changelog
|
2018-12-31 20:48:36 +01:00 |
|
Stefan Schüller
|
ce70a0d15d
|
- Version bump
|
2018-12-31 20:45:50 +01:00 |
|
Stefan Schüller
|
f485f4efa7
|
- Added all supported languages
|
2018-12-31 20:45:08 +01:00 |
|
Stefan Schüller
|
9cc108827f
|
wip
|
2018-12-31 20:32:22 +01:00 |
|
Stefan Schüller
|
068dca5d09
|
Merge pull request #82 from lishoujun/develop
add languages MultiSelectListPreference. but not all languages.
|
2018-12-31 20:31:51 +01:00 |
|
lishoujun
|
6e2ef78751
|
add languages MultiSelectListPreference. but not all languages.
|
2019-01-01 02:15:35 +08:00 |
|
subhadipThinkpad
|
537eefda1f
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2018-12-31 23:15:34 +05:30 |
|
subhadipThinkpad
|
6535ac37c3
|
Codebase merged from master
|
2018-12-31 22:37:36 +05:30 |
|
Stefan Schüller
|
9f20a38560
|
Merge pull request #79 from sschueller/develop
Release v1.0.18
|
2018-12-31 09:25:47 +01:00 |
|
Stefan Schueller
|
9541ccf652
|
Version Bump
|
2018-12-31 09:17:12 +01:00 |
|
Stefan Schüller
|
e609325058
|
Merge branch 'develop' of ssh://github.com/sschueller/peertube-android into develop
|
2018-12-31 08:54:58 +01:00 |
|
Stefan Schüller
|
86f36a97eb
|
Added changelog
|
2018-12-31 08:54:10 +01:00 |
|
Stefan Schüller
|
449b09b69f
|
Merge pull request #76 from BoFFire/patch-1
Minor fix in arabic strings
|
2018-12-31 08:36:55 +01:00 |
|
Stefan Schüller
|
44034a8a41
|
Merge pull request #78 from lishoujun/develop
add null check to playerNotificationManager and player on Destroy
|
2018-12-31 08:36:23 +01:00 |
|
lishoujun
|
b21b4e945d
|
add null check to playerNotificationManager and player on Destroy
|
2018-12-31 14:50:52 +08:00 |
|
ButterflyOfFire
|
32f5a72450
|
Minor fix in arabic strings
|
2018-12-30 19:56:23 +01:00 |
|
Stefan Schüller
|
55f2c07321
|
Merge pull request #74 from BoFFire/stringlate-ar-2678
Updated ar (Arabic) translation
|
2018-12-30 17:43:09 +01:00 |
|
ButterflyOfFire
|
112edd2608
|
Updated ar (Arabic) translation
Commit made via Stringlate
|
2018-12-30 17:40:17 +01:00 |
|
Stefan Schueller
|
536dd626a9
|
Merge branch 'develop' into Login
|
2018-12-30 14:58:02 +01:00 |
|
Stefan Schüller
|
59942ad4c7
|
Merge pull request #73 from lishoujun/develop
update dependence. minor change
|
2018-12-30 14:50:16 +01:00 |
|
lishoujun
|
1db733d64f
|
update dependence. minor change
|
2018-12-30 14:15:59 +08:00 |
|
lishoujun
|
4888429115
|
Merge branch 'develop' of https://github.com/sschueller/peertube-android into develop
|
2018-12-30 10:00:36 +08:00 |
|
lishoujun
|
684809e383
|
Merge branch 'master' of https://github.com/lishoujun/peertube-android into develop
|
2018-12-30 09:43:45 +08:00 |
|
Stefan Schüller
|
50c1118ad1
|
Merge pull request #72 from sschueller/develop
Release v1.0.17
|
2018-12-29 22:38:44 +01:00 |
|
Stefan Schueller
|
5ce1225530
|
Merge branch 'develop' of ssh://github.com/sschueller/peertube-android into develop
|
2018-12-29 22:37:44 +01:00 |
|
Stefan Schueller
|
3f93ccfc92
|
Replaced more icon with fonts
|
2018-12-29 22:36:54 +01:00 |
|
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 |
|