Commit graph

10242 commits

Author SHA1 Message Date
Tobias Kaminsky
93d7001fb2
Merge pull request #2385 from nextcloud/accountMightNull
Drawer: check if account is null
2018-03-22 12:05:29 +01:00
Mario Danic
e36d0c5b0a Fix year
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-03-22 07:47:10 +01:00
Nextcloud bot
604a8b3126
[tx-robot] updated from transifex 2018-03-22 01:42:23 +00:00
Tobias Kaminsky
36d8bfa7cc daily dev 20180322 2018-03-22 00:34:35 +01:00
tobiasKaminsky
88b4ef9ffc
add @Nullable to warn via IDE
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-03-21 14:14:01 +01:00
tobiasKaminsky
de5bec442a
file not found
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-03-21 14:11:56 +01:00
tobiasKaminsky
b826fa4d9c
check if account is null
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-03-21 13:42:55 +01:00
tobiasKaminsky
da077e0195
catch all exceptions
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-03-21 13:17:55 +01:00
tobiaskaminsky
685e30d62d
context might be null, so fallback
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-03-21 12:50:19 +01:00
Andy Scherzinger
9a97e436d8
Merge pull request #2354 from nextcloud/enlargeAutoUploadHeaderIcon
UX: improve auto upload list header
2018-03-21 11:32:18 +01:00
AndyScherzinger
d87f669de7
CR: use butterknife for view binding 2018-03-21 10:20:55 +01:00
AndyScherzinger
fca2d906fa
Fix CR 2018-03-21 10:20:55 +01:00
AndyScherzinger
a9dfa2e93a
cleanup icon work 2018-03-21 10:20:54 +01:00
AndyScherzinger
0db19eae12
improve auto upload list header 2018-03-21 10:20:45 +01:00
Nextcloud bot
cec4232c04
[tx-robot] updated from transifex 2018-03-21 01:43:39 +00:00
Tobias Kaminsky
4f38369812 daily dev 20180321 2018-03-21 00:34:40 +01:00
Andy Scherzinger
3e7db6b4b8
Merge pull request #2380 from nextcloud/semanticVersioning
minor version was on wrong location
2018-03-20 19:18:07 +01:00
Tobias Kaminsky
1cbee0e903
Merge pull request #2352 from nextcloud/walledGardenOnlyOnWifi
check walled garden only on wifi
2018-03-20 14:43:44 +01:00
tobiasKaminsky
f733f7b0bb
using evernote
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-03-20 14:27:27 +01:00
tobiasKaminsky
1802a38fd7
changes due to CR
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-03-20 14:27:27 +01:00
tobiasKaminsky
de51e9c004
check walled garden only on wifi
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-03-20 14:27:27 +01:00
tobiaskaminsky
8e94b271d1
also use snapshot for lint
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-03-20 14:25:52 +01:00
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