Commit graph

10131 commits

Author SHA1 Message Date
Tobias Kaminsky
8a5a6ce9b0
Merge pull request #2095 from nextcloud/fix-2094
Fix #2094
2018-02-06 06:39:00 +00:00
Nextcloud bot
e57c47ab5b
[tx-robot] updated from transifex 2018-02-06 01:39:35 +00:00
Nextcloud bot
3c01a0dd59
[tx-robot] updated from transifex 2018-02-04 01:39:28 +00:00
Tobias Kaminsky
8aac87540f daily dev 20180204 2018-02-04 00:59:24 +01:00
Andy Scherzinger
0009b259cd
Merge pull request #2088 from nextcloud/installLocation
Force install location to internal, even if this is default
2018-02-03 22:02:58 +01:00
Mario Danic
e27b2f7689 Fix #2094
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-02-03 10:38:37 +01:00
Nextcloud bot
39116962b9
[tx-robot] updated from transifex 2018-02-03 01:39:15 +00:00
tobiaskaminsky
13e99f8482
force install location to internal, even if this is default
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-02-02 09:32:02 +01:00
Nextcloud bot
5eeeab171a
[tx-robot] updated from transifex 2018-02-02 01:41:41 +00:00
Nextcloud bot
87aed75104
[tx-robot] updated from transifex 2018-02-01 05:46:50 +00:00
Nextcloud bot
68c60d3287
[tx-robot] updated from transifex 2018-02-01 01:41:58 +00:00
Tobias Kaminsky
93a6fd4ce7 daily dev 20180201 2018-02-01 01:08:42 +01:00
Tobias Kaminsky
bbd57d4f10
Merge pull request #2072 from tilosp/prioritize-screenshots
Auto upload: Prioritize Screenshots Folder
2018-01-31 14:56:05 +01:00
Tilo Spannagel
52f1e58535
Auto upload: Prioritize Screenshots Folder
Signed-off-by: Tilo Spannagel <development@tilosp.de>
2018-01-31 13:15:45 +01:00
Tobias Kaminsky
c368df4f3c
Merge pull request #2080 from nextcloud/300rc3
3.0.0 RC3
2018-01-31 10:15:30 +01:00
Tobias Kaminsky
50153b7340
Merge pull request #2079 from nextcloud/fix143upgrade
Fix upgrade from 1.4.3 to 3.0.0
2018-01-31 10:15:12 +01:00
tobiasKaminsky
5b160add9c
simplify
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-31 10:07:55 +01:00
tobiasKaminsky
3a7f5fc47c
3.0.0 RC3
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-31 09:57:47 +01:00
tobiasKaminsky
56b7e3afc4
Fix upgrade from 1.4.3 to 3.0.0
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-31 09:51:30 +01:00
Tobias Kaminsky
1853deb143
Merge pull request #2078 from nextcloud/correctE2Ename
Store info that file is encrypted
2018-01-31 09:08:53 +01:00
tobiasKaminsky
b0a1152a75
store info that file is encrypted
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-31 08:47:50 +01:00
Tobias Kaminsky
d1c53093cc
Merge pull request #2068 from nextcloud/snackbarOnlyIfActivityExists
show download snackbar only if activity exists
2018-01-31 08:10:32 +01:00
Tobias Kaminsky
44bef145a2
Merge pull request #2066 from nextcloud/fix-autoupload-2
Fix auto restart of pending Auto Upload entries
2018-01-31 07:37:17 +01:00
tobiaskaminsky
d9435fcf1d
show download snackbar only if activity exists
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-31 07:35:41 +01:00
Nextcloud bot
09337e9cea
[tx-robot] updated from transifex 2018-01-31 01:39:53 +00:00
Tobias Kaminsky
6dc5815276 daily dev 20180131 2018-01-31 00:55:05 +01:00
Tobias Kaminsky
9512f425b3 Merge branch 'master' of github.com:/nextcloud/android 2018-01-31 00:30:36 +01:00
Mario Đanić
737ce03e51
Merge pull request #2067 from nextcloud/hardenExternalStorage
getExternalFilesDir(null) can be null --> preventing NPE
2018-01-30 19:26:05 +01:00
Mario Đanić
f4670cf602
Merge pull request #2071 from nextcloud/e2eFlagOnlyOnFolders
E2e flag only on folders
2018-01-30 19:24:22 +01:00
Mario Đanić
2f071c2a5f
Merge pull request #2074 from nextcloud/bugfix/2070
Fixes #2070: Move the responsibility of FAB's theming to theris owner
2018-01-30 19:23:50 +01:00
Bartosz Przybylski
2e8c417ed7 Fixes #2070: Move the responsibility of FAB's theming to theris owner
Since ExtendedListFragment is owning all FAB's where is no need for any other activity to alter the theming of those buttons. ThemeUtils are wide accessible, and at the time of construction, so apply the theming there.
2018-01-30 17:12:02 +01:00
tobiaskaminsky
3ae0610b7a
add default values
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-30 13:20:13 +01:00
tobiaskaminsky
c1a2221b88
e2e flag only on folder
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-30 13:14:34 +01:00
tobiaskaminsky
f080bdb70e
getExternalFilesDir(null) an be null --> preventing NPE
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-30 08:37:15 +01:00
Nextcloud bot
dcb82998f8
[tx-robot] updated from transifex 2018-01-30 01:41:11 +00:00
Tobias Kaminsky
1edd87fcc8 daily dev 20180130 2018-01-30 01:14:30 +01:00
Mario Danic
6bb9636dcb Just a test
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-01-29 20:55:33 +01:00
Andy Scherzinger
dbba847001
Merge pull request #2064 from nextcloud/fixE2EuserID
Use fetched userID
2018-01-29 20:42:02 +01:00
tobiasKaminsky
601138099a
bump version
fix webpage -> website

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
2018-01-29 16:50:02 +01:00
tobiaskaminsky
91f624524d
use fetched userID
Signed-off-by: tobiaskaminsky <tobias@kaminsky.me>
2018-01-29 16:50:02 +01:00
Mario Đanić
8bf7aa24bf
Merge pull request #2062 from nextcloud/fix-for-autoupload
Fix for autoupload
2018-01-29 16:48:53 +01:00
Mario Danic
30dd629364 Check internetSet all arguments as nullable
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-01-29 10:29:31 +01:00
Tobias Kaminsky
9d89d0554e
Update UploadsStorageManager.java
line wrap
2018-01-29 10:28:04 +01:00
Mario Danic
18ad2d858b Fix up request
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-01-29 10:18:10 +01:00
Mario Đanić
1028bb351d
Merge pull request #2052 from nextcloud/tintDeleteDialog
Tint delete account dialog buttons
2018-01-29 09:15:51 +01:00
Mario Danic
4880e783bf Fix
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-01-29 09:12:56 +01:00
Andy Scherzinger
29e4a8aa43
Merge pull request #2057 from nextcloud/fix-2043
Update dependencies
2018-01-29 09:11:51 +01:00
Mario Danic
0feaa84149 Fix auto uploads
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-01-29 09:11:41 +01:00
Mario Danic
676d7d5d31
Update dependencies
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2018-01-29 08:57:07 +01:00
Tobias Kaminsky
19ca990db8
Merge pull request #2058 from nextcloud/fix-issues-with-services
Fix crashing issue on bootup
2018-01-29 08:54:51 +01:00