Commit graph

524 commits

Author SHA1 Message Date
Andy Scherzinger
2b2fb45732 Merge pull request #1292 from nextcloud/autoUploadLight
Make auto upload light working again
2017-08-10 16:27:04 +02:00
tobiasKaminsky
67c77adf40
removed some unused code to get the warnings down ;-) 2017-08-10 12:34:21 +02:00
tobiasKaminsky
fecc468307
removed some unused code to get the warnings down ;-) 2017-08-10 12:29:42 +02:00
Nextcloud bot
a532e269bd
[tx-robot] updated from transifex 2017-08-10 00:28:25 +00:00
Nextcloud bot
43b751605b
[tx-robot] updated from transifex 2017-08-09 00:27:29 +00:00
Victor Nidens
a9857b800c
Added warning when trying to reshare a file without necessary permissions 2017-08-08 15:18:35 +02:00
AndyScherzinger
f812d5b8c3
fix RTL issue 2017-08-08 13:00:05 +02:00
AndyScherzinger
19ec306b8c
remove unused layouts 2017-08-08 13:00:04 +02:00
AndyScherzinger
b82b72f2b3
add content description and rtl fixes 2017-08-08 13:00:03 +02:00
AndyScherzinger
2e947eac61
fix some rtl warnings 2017-08-08 13:00:03 +02:00
AndyScherzinger
d643d28c58
fix codacy warnings 2017-08-08 13:00:03 +02:00
AndyScherzinger
5d2b30d86c
removing unsed reources 2017-08-08 13:00:02 +02:00
AndyScherzinger
7e879f7bcd
lint: remove unused resources 2017-08-08 13:00:02 +02:00
AndyScherzinger
4781c0703f
remove further unused resources 2017-08-08 13:00:02 +02:00
AndyScherzinger
51c17f0614
codacy: remove unused code 2017-08-08 13:00:01 +02:00
AndyScherzinger
2cb8785fd0
lint: remove hardcoded strings 2017-08-08 13:00:00 +02:00
AndyScherzinger
29ff68bb79
rename icon work that isn't a menu icon 2017-08-08 13:00:00 +02:00
AndyScherzinger
667dd10ac7
remove further unused ressources (lint) 2017-08-08 12:59:59 +02:00
AndyScherzinger
13ecb580f1
remove first batch of unused resources 2017-08-08 12:59:59 +02:00
AndyScherzinger
7f22be5355
fix lint error 2017-08-08 12:59:57 +02:00
AndyScherzinger
fbcfa02142
fix lint errors 2017-08-08 12:59:57 +02:00
AndyScherzinger
21d1c56e4d
fix Combining Ellipsize and Maxlines (lint) 2017-08-08 12:59:56 +02:00
Mario Danic
c68f02ec57
Put custom folders intto expert
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:53 +02:00
Mario Danic
fb3e97bf10
Add expert mode
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:44 +02:00
Mario Danic
d099e7e52f
Fix up uploads menu
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:44 +02:00
Mario Danic
baf7d1e732
Return uploads control
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:42 +02:00
Mario Danic
cb5ef79176
Revert "Delete right button"
This reverts commit d8cbb904adf1f013b0b8b0ad6d377b35caaec006.
2017-08-08 12:59:42 +02:00
Mario Danic
2092a010b1
Revert "Remove uploads menu"
This reverts commit 92204c4367ef4e69e814c54c601a35b9d7c2a880.

Signed-off-by: Mario Danic <mario@lovelyhq.com>

# Conflicts:
#	src/main/java/com/owncloud/android/ui/activity/UploadListActivity.java
2017-08-08 12:59:42 +02:00
Mario Danic
157ceaba60
Bit of work on uploads
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:39 +02:00
AndyScherzinger
8848f99880
fixes after rebase 2017-08-08 12:59:38 +02:00
AndyScherzinger
09f6037b86
further cleanup after rebase 2017-08-08 12:59:36 +02:00
AndyScherzinger
3730883136
scrollable toolbar implementation for auto upload 2017-08-08 12:59:36 +02:00
tobiasKaminsky
9052abd9dd
rename "foldersync" -> "syncedFolder(s)" 2017-08-08 12:59:34 +02:00
tobiasKaminsky
1386726a4f
show "add folder" correctly if other folders are present 2017-08-08 12:59:33 +02:00
tobiasKaminsky
1f85abbe43
"set up custom folder" as element in xml and not in adapter 2017-08-08 12:59:33 +02:00
Mario Danic
98480ee4dc
Hopefully fix retries
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:30 +02:00
Mario Danic
006b62cd4e
Remove uploads menu
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:29 +02:00
Mario Danic
5087ff4537
Delete right button
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:26 +02:00
Mario Danic
447e6fd7ee
Fix custom folders
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:26 +02:00
Mario Danic
cb4017f095
No manual retry
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:23 +02:00
AndyScherzinger
a27d0c15f4
fix create item click for custom folder 2017-08-08 12:59:19 +02:00
AndyScherzinger
b152e32952
local folder picker mode implementation 2017-08-08 12:59:18 +02:00
AndyScherzinger
aff8a86b37
enable/disable save button depending on local/remote folder paths present/chosen 2017-08-08 12:59:18 +02:00
AndyScherzinger
1338f34307
custom folder creation: use custom headline and hide enable-switch 2017-08-08 12:59:18 +02:00
Mario Danic
cdf43866ea
Fix the build
Signed-off-by: Mario Danic <mario@lovelyhq.com>
2017-08-08 12:59:17 +02:00
AndyScherzinger
828284330d
fix after rebase 2017-08-08 12:59:15 +02:00
AndyScherzinger
ace7ad03c4
delete button (no function yet) 2017-08-08 12:59:15 +02:00
AndyScherzinger
e93cd2723f
implement correct local/remote folder picking in preference dialog 2017-08-08 12:59:14 +02:00
AndyScherzinger
b4ebfe0598
folder open icon 2017-08-08 12:59:12 +02:00
AndyScherzinger
de83a02156
open folder sync preference for new, custom folder (work in progress) 2017-08-08 12:59:12 +02:00