mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-12-23 01:00:26 +03:00
Code Issues Projects Releases Packages Wiki Activity
8250 commits 221 branches 1589 tags 640 MiB
Commit graph

500 commits

Author SHA1 Message Date
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
Mario Danic
14c2d13c81
Custom folder RV item 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-08-08 12:59:03 +02:00
Mario Danic
662b08a12c
Add custom folder icon 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
 2017-08-08 12:59:03 +02:00
AndyScherzinger
48d66b36c9
fixed layout not displaying app bar 2017-08-08 12:59:03 +02:00
AndyScherzinger
4e82f5dc5f
also use star folder for action item 2017-08-08 12:59:02 +02:00
AndyScherzinger
a17e64da25
custom folder icon 2017-08-08 12:59:02 +02:00
AndyScherzinger
9899dbbf13
add item to the top (WiP) 2017-08-08 12:59:01 +02:00
AndyScherzinger
1f0a12bbdc
create folder icon 2017-08-08 12:59:01 +02:00
AndyScherzinger
3147a2c86a
add icons to the grid headers depending on the type 2017-08-08 12:59:00 +02:00
Nextcloud bot
81cc7eb5d7
[tx-robot] updated from transifex 2017-08-08 10:30:04 +00:00
Nextcloud bot
0ebb3c8ab5
[tx-robot] updated from transifex 2017-08-08 00:27:23 +00:00
Tobias Kaminsky
796fba0354 Merge branch 'master' into clearSuccessfulUploads 2017-08-07 08:14:15 +02:00
Andy Scherzinger
048f88524e Merge pull request #1214 from nextcloud/emptyMessageReceiveExternalFiles 
Show empty message when receiving external files
 2017-08-05 17:26:36 +01:00
Nextcloud bot
0c49d53a38
[tx-robot] updated from transifex 2017-08-05 00:27:03 +00:00
tobiasKaminsky
6e327673bb
revert description for clear successful uploads 2017-08-04 07:50:15 +02:00
Nextcloud bot
3a00aa8930
[tx-robot] updated from transifex 2017-08-03 00:27:18 +00:00
Nextcloud bot
fc8afbd18e
[tx-robot] updated from transifex 2017-08-02 00:27:56 +00:00
Nextcloud bot
12cd1ba651
[tx-robot] updated from transifex 2017-08-01 09:56:50 +00:00
Nextcloud bot
058b7bad6f
[tx-robot] updated from transifex 2017-08-01 00:27:42 +00:00
Nextcloud bot
a4db5bc8de
[tx-robot] updated from transifex 2017-07-31 00:26:22 +00:00
Nextcloud bot
9f8e1a0bac
[tx-robot] updated from transifex 2017-07-30 00:27:41 +00:00
Nextcloud bot
8e43cee7f8
[tx-robot] updated from transifex 2017-07-29 00:28:26 +00:00
Allan Nordhøy
f70c7fc5a7 Lowercase "groups" 2017-07-28 18:05:45 +02:00
tobiasKaminsky
732a65ca09
show empty message when receiving external files 2017-07-28 14:49:22 +02:00
tobiasKaminsky
26ab00d989
+ is now also white 2017-07-28 14:25:31 +02:00