Commit graph

451 commits

Author SHA1 Message Date
Andy Scherzinger
70e8f62581 Added 'Pending' placeholder for still-unknown size of incoming federated folders 2016-09-01 14:42:55 +02:00
Andy Scherzinger
f8e0ee9ce1 initial quota display implementation 2016-08-18 15:55:11 +02:00
Andy Scherzinger
e790d4a520 initial layout changes for in drawer quota display 2016-08-18 15:55:11 +02:00
Andy Scherzinger
aa98938a55 textfile --> text file 2016-08-16 11:58:42 +02:00
tobiasKaminsky
993264c8b1 wip 2016-08-16 11:58:42 +02:00
tobiasKaminsky
a3a6420ead filter for oc file list and local file list 2016-08-03 19:20:44 +02:00
tobiasKaminsky
eff2aa1971 rename instant upload path 2016-07-28 19:09:46 +02:00
tobiasKaminsky
98a679548a Merge remote-tracking branch 'remotes/origin/master' into multiSelectNew 2016-07-15 18:32:56 +02:00
Andy Scherzinger
fca1e0d2fd added line breaks according to CR 2016-07-14 23:31:48 +02:00
Bartosz Przybylski
098cf7dd46 Add confirmation dialog on account deletion 2016-07-14 23:31:46 +02:00
Andy Scherzinger
d1f9cae7f4 cleanup, accounts is handled differently with latest implementation (housekeeping here) 2016-07-14 22:42:23 +02:00
tobiasKaminsky
9d74b7e223 enabled all occurrences. 2016-07-14 22:42:18 +02:00
tobiasKaminsky
6c1deae1a2 use size computed by server 2016-07-13 11:04:43 +02:00
David A. Velasco
db6acc6868 Clean-up and small refactorings
Conflicts:
	src/com/owncloud/android/files/FileOperationsHelper.java
	src/com/owncloud/android/ui/fragment/ExtendedListFragment.java
2016-07-09 19:49:37 +02:00
Andy Scherzinger
c875bbace1 Merge pull request #35 from nextcloud/feature_uploadsubfolders
Feature uploadsubfolders
2016-06-27 10:45:41 +02:00
Andy Scherzinger
ce803aa4e0 initial (functionless) account switcher for the drawer header and display size depending header sizing 2016-06-25 16:26:46 +02:00
tobiasKaminsky
1183e51c19 Merge remote-tracking branch 'owncloud/multiSelect' into multiSelectOwncloud
# Conflicts:
#	res/drawable-hdpi/ic_checkbox_marked.png
#	res/drawable-mdpi/ic_checkbox_marked.png
#	res/drawable-xhdpi/ic_checkbox_marked.png
#	res/drawable-xxhdpi/ic_checkbox_marked.png
#	res/layout/grid_image.xml
#	res/values/strings.xml
#	src/com/owncloud/android/notifications/NotificationBuilderWithProgressBar.java
#	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
#	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
#	src/com/owncloud/android/ui/dialog/RemoveFileDialogFragment.java
#	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
2016-06-23 21:10:58 +02:00
Andy Scherzinger
2c256bf53d added the ability to select all within a folder for upload - selection is discarded when navigating folders 2016-06-22 16:43:23 +02:00
Timo Witte
f68b53ba61 introduce upload subfolders configuration variable 2016-06-19 16:43:12 +02:00
Andy Scherzinger
cecab96b2f implementation of #1193 - optimizing the uploader layout and taking user configured sorting into account 2016-06-13 21:49:57 +02:00
jabarros
26c7a451e1 Change 'Favorite/Unfavorite' item menu to 'Set/Unset as available offline' 2016-06-01 17:07:13 +02:00
Andy Scherzinger
74a05bb2a9 moved logs from drawer menu to "More" section in the settings 2016-05-18 12:35:57 +02:00
Juan Carlos González Cabrero
c494290130 Fix string typo 2016-04-21 11:34:38 +02:00
David A. Velasco
e43c1d6b3f Improved error handling when copying shared link to clipboard 2016-04-21 11:31:48 +02:00
David A. Velasco
68b96ce0db Error dialogs in Uploader updated, both messages and implementation 2016-04-14 09:39:10 +02:00
David A. Velasco
9d005d636f Refatoring, warnings clean-up, improved error logic 2016-04-14 09:39:10 +02:00
Juan Carlos González Cabrero
1b680c606b Update error handling parsing the received uri 2016-04-14 09:39:10 +02:00
Juan Carlos González Cabrero
da6b0c0162 Update dialog for sharing no files to be more intuitive 2016-04-14 09:39:10 +02:00
David A. Velasco
f6ea9b597a Merge branch 'master' into reliable_uploads_actions_uploads_view
Conflicts FIXED in res/values/styles.xml (trivial)
2016-03-30 13:27:09 +02:00
Andy Scherzinger
d893654bc1 Fix Headline in share edit and user search 2016-03-22 13:29:23 +01:00
David A. Velasco
15eb8b493b Merge branch 'master' into reliable_uploads_actions_uploads_view 2016-03-21 17:42:13 +01:00
Juan Carlos González Cabrero
94864bb094 Update strings, comments and removed some conditions 2016-03-21 09:45:27 +01:00
Juan Carlos González Cabrero
55fdcee912 New switch in share via link to allow editing 2016-03-21 09:31:34 +01:00
Juan Carlos González Cabrero
b1d46eb8ab Change error label for uploads when app is killed 2016-03-18 14:03:33 +01:00
Juan Carlos González Cabrero
f556c5d684 Upload failed strings updated 2016-03-18 10:47:19 +01:00
Juan Carlos González Cabrero
f150dce25c Refactor clear options for uploads avoiding clear the current ones 2016-03-18 09:22:42 +01:00
David A. Velasco
e181253410 Retrying an upload failed due to wrong credentials checks if stored credentials were already updated before asking to the user 2016-03-17 13:23:25 +01:00
David A. Velasco
772d640bc8 Fixed status message in uploads view 2016-03-16 19:17:01 +01:00
Juan Carlos González Cabrero
a969250b23 Adapt autocompletion to the web UI 2016-03-16 13:46:05 +01:00
Juan Carlos González Cabrero
a7efcf6a2f Add the remote suggestion to the MatrixCursor instead of the JSON array, wich could not parse the path correctly 2016-03-16 13:46:05 +01:00
David A. Velasco
ec9b705536 Wording and padding fixes in uploads list 2016-03-08 13:17:55 +01:00
Juan Carlos González Cabrero
a506014d58 Checking of local file when an upload retry is requested 2016-02-24 10:41:50 +01:00
David A. Velasco
286dc8fafd Merge branch 'master' into reliable_uploads_actions_uploads_view 2016-02-22 10:21:46 +01:00
David A. Velasco
82b0b7a84f Merge branch 'master' into reliable_uploads_actions_uploads_view 2016-02-15 14:59:04 +01:00
Juan Carlos González Cabrero
9fe62d15ea Refresh listview when clear failed/finished uploads clicked 2016-02-15 10:58:53 +01:00
Andy Scherzinger
9d9bc6958b changes color of the OK button and the text 2016-02-12 12:29:05 +01:00
Andy Scherzinger
cbf134a6e2 move strings to resource file 2016-02-12 12:29:05 +01:00
David A. Velasco
3885db5013 Positive button of remove dialog(s) changed to 'Yes' 2016-02-09 08:59:35 +01:00
David A. Velasco
6eca835d1d Renamed scaring 'delete account' to 'remove account' 2016-02-04 14:51:54 +01:00
David A. Velasco
7931c321f2 Merge pull request #1461 from owncloud/manage_space_activity
Added own Activity to manage space instead of default "Clear data" button in device settings
2016-02-04 14:50:53 +01:00