Tobias Kaminsky
|
3dd157b20c
|
Merge pull request #2360 from nextcloud/fixVideoFullscreen
Hiding the action bar in case of fullscreen video playback
|
2018-03-20 13:57:47 +01:00 |
|
Mario Danic
|
86e05c48e1
|
Don’t show messages for pending delete users
Signed-off-by: Mario Danic <mario@lovelyhq.com>
|
2018-03-20 13:07:12 +01:00 |
|
tobiasKaminsky
|
cff5e5abc6
|
minor version was on wrong location:
30400301 instead of 30040301
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
|
2018-03-20 12:53:56 +01:00 |
|
Mario Danic
|
de345ed0c2
|
Update for version dev
Signed-off-by: Mario Danic <mario@lovelyhq.com>
|
2018-03-20 09:27:07 +01:00 |
|
Mario Danic
|
ab4d6f2934
|
Use variables
Signed-off-by: Mario Danic <mario@lovelyhq.com>
|
2018-03-20 09:05:24 +01:00 |
|
Mario Danic
|
94ecf17b63
|
Update for generic
Signed-off-by: Mario Danic <mario@lovelyhq.com>
|
2018-03-20 09:04:25 +01:00 |
|
Tobias Kaminsky
|
a8ac575e66
|
beautify ;-)
|
2018-03-20 08:43:46 +01:00 |
|
AndyScherzinger
|
9f5a70555e
|
Fix #1971 hiding the action bar in case of fullscreen video playback
|
2018-03-20 08:43:43 +01:00 |
|
Tobias Kaminsky
|
d0ccf38498
|
Merge pull request #2376 from nextcloud/update-android-job-again
Update android job
|
2018-03-20 08:42:46 +01:00 |
|
Mario Danic
|
18ac087a15
|
Update android job
Signed-off-by: Mario Danic <mario@lovelyhq.com>
|
2018-03-20 08:35:47 +01:00 |
|
Tobias Kaminsky
|
476fe6ac5a
|
Merge pull request #2342 from nextcloud/fix-svg
Use magical vectors
|
2018-03-20 08:31:19 +01:00 |
|
Andy Scherzinger
|
7ef227cb03
|
Merge pull request #2183 from nextcloud/generateThumbnailFromResizedImage
If no thumbnail exists, check if resized version exist and use this
|
2018-03-20 08:25:34 +01:00 |
|
tobiaskaminsky
|
4fdacf5fbb
|
30s timeout for checking if eTag changed
show conflict
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
|
2018-03-20 08:15:40 +01:00 |
|
tobiaskaminsky
|
1fb9412529
|
simplified after rebase
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
|
2018-03-20 08:04:09 +01:00 |
|
tobiasKaminsky
|
5ca5555fe6
|
If no thumbnail exists, check if resized version exist and generate thumbnail out of it
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
|
2018-03-20 08:04:09 +01:00 |
|
Tobias Kaminsky
|
81681f495a
|
Merge pull request #2367 from nextcloud/sortWithLong
Use long instead of integer
|
2018-03-20 08:01:54 +01:00 |
|
tobiasKaminsky
|
15579828bb
|
use long instead of integer
add fallback if number is too big
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
with '#' will be ignored, and an empty message aborts the commit.
|
2018-03-20 07:37:56 +01:00 |
|
Nextcloud bot
|
ce6fcdc06a
|
[tx-robot] updated from transifex
|
2018-03-20 01:41:22 +00:00 |
|
Tobias Kaminsky
|
e0dff302ca
|
daily dev 20180320
|
2018-03-20 00:34:43 +01:00 |
|
Mario Danic
|
182028c631
|
Remove useless replace
Signed-off-by: Mario Danic <mario@lovelyhq.com>
|
2018-03-19 20:04:03 +01:00 |
|
Andy Scherzinger
|
1f64297dc4
|
Merge pull request #2373 from nextcloud/check-wifi-on-offline-sync
Check if we’re on unmetered wifi
|
2018-03-19 18:43:12 +01:00 |
|
Mario Danic
|
5105709e0a
|
Update scopes
Signed-off-by: Mario Danic <mario@lovelyhq.com>
|
2018-03-19 14:51:47 +01:00 |
|
Mario Danic
|
43a471b8f6
|
Update ifs
Signed-off-by: Mario Danic <mario@lovelyhq.com>
|
2018-03-19 14:49:19 +01:00 |
|
Mario Danic
|
8e778844bf
|
Fix newlines
Signed-off-by: Mario Danic <mario@lovelyhq.com>
|
2018-03-19 14:47:29 +01:00 |
|
Mario Danic
|
857a31172c
|
Check if we’re on unmetered wifi
Signed-off-by: Mario Danic <mario@lovelyhq.com>
|
2018-03-19 14:42:13 +01:00 |
|
Mario Danic
|
c1dc6e570f
|
Fixes #2315 and other issues
Signed-off-by: Mario Danic <mario@lovelyhq.com>
|
2018-03-19 14:35:52 +01:00 |
|
Nextcloud bot
|
3b03e8c3e5
|
[tx-robot] updated from transifex
|
2018-03-19 01:43:10 +00:00 |
|
Nextcloud bot
|
c9a95bdae9
|
[tx-robot] updated from transifex
|
2018-03-18 01:40:40 +00:00 |
|
Nextcloud bot
|
3afaf2f3ee
|
[tx-robot] updated from transifex
|
2018-03-17 01:39:56 +00:00 |
|
Nextcloud bot
|
1450091004
|
[tx-robot] updated from transifex
|
2018-03-16 01:42:49 +00:00 |
|
Tobias Kaminsky
|
69f17a2dc0
|
daily dev 20180316
|
2018-03-16 00:34:42 +01:00 |
|
Andy Scherzinger
|
8a1d6acfad
|
Update lint-results.txt
|
2018-03-15 17:54:24 +01:00 |
|
Andy Scherzinger
|
2f8b93e7fe
|
Merge pull request #2222 from nextcloud/versionDevLib
Move lib implementation to flavors
|
2018-03-15 17:53:56 +01:00 |
|
tobiasKaminsky
|
9cf911b5c2
|
move lib implementation to flavors
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
|
2018-03-15 16:09:43 +01:00 |
|
Andy Scherzinger
|
fbe1d9842f
|
Merge pull request #2211 from nextcloud/serverVersionNotNullable
Instead of returning null on getServerVersion(), it returns now a version
|
2018-03-15 15:55:10 +01:00 |
|
tobiasKaminsky
|
8ee0168544
|
changes due to CR
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
|
2018-03-15 15:01:15 +01:00 |
|
tobiasKaminsky
|
08ff99e07d
|
instead of returning null on getServerVersion(), it returns now a very latest NC10 version
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
|
2018-03-15 15:01:12 +01:00 |
|
Andy Scherzinger
|
2ebcec12c7
|
Merge pull request #2090 from nextcloud/listFilesNull
List files can be null
|
2018-03-15 14:47:15 +01:00 |
|
tobiasKaminsky
|
84e9519807
|
changes due to CR
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
|
2018-03-15 14:40:01 +01:00 |
|
tobiaskaminsky
|
191a55a825
|
list files can be null
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
|
2018-03-15 14:39:59 +01:00 |
|
Andy Scherzinger
|
4b0b49f2af
|
Merge pull request #2253 from nextcloud/improve-sync
Improve syncing code
|
2018-03-15 13:05:39 +01:00 |
|
Mario Danic
|
b443737e80
|
Try to fix job detection
Signed-off-by: Mario Danic <mario@lovelyhq.com>
|
2018-03-15 12:37:46 +01:00 |
|
Mario Danic
|
28818b39e4
|
Fix a bug
Signed-off-by: Mario Danic <mario@lovelyhq.com>
|
2018-03-15 12:37:46 +01:00 |
|
Mario Danic
|
65cc28e79f
|
Remove locks
Signed-off-by: Mario Danic <mario@lovelyhq.com>
|
2018-03-15 12:37:44 +01:00 |
|
Mario Danic
|
0ddc264e0b
|
Rename a method
Signed-off-by: Mario Danic <mario@lovelyhq.com>
|
2018-03-15 12:37:43 +01:00 |
|
Mario Danic
|
26c8966eb3
|
Use getters & setters
Signed-off-by: Mario Danic <mario@lovelyhq.com>
|
2018-03-15 12:37:43 +01:00 |
|
Mario Danic
|
4f51489210
|
Scope
Signed-off-by: Mario Danic <mario@lovelyhq.com>
|
2018-03-15 12:37:42 +01:00 |
|
Mario Danic
|
2a558cee2b
|
Not needed
Signed-off-by: Mario Danic <mario@lovelyhq.com>
|
2018-03-15 12:37:42 +01:00 |
|
Mario Danic
|
0697f56f48
|
Schedule, just in case
Signed-off-by: Mario Danic <mario@lovelyhq.com>
|
2018-03-15 12:37:41 +01:00 |
|
Mario Danic
|
b70831e939
|
Check if internet is walled
Signed-off-by: Mario Danic <mario@lovelyhq.com>
|
2018-03-15 12:37:41 +01:00 |
|