tobiasKaminsky
|
77f9902f17
|
Merge remote-tracking branch 'remotes/origin/master' into uploadWhenCharging
|
2016-09-03 20:10:51 +02:00 |
|
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
|
ac695b7444
|
fix sharing for beta
|
2016-07-30 18:38:21 +02:00 |
|
tobiasKaminsky
|
9587af3e9d
|
Merge remote-tracking branch 'remotes/origin/master' into uploadWhenCharging
|
2016-07-30 16:56: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 |
|
masensio
|
9fd38ca0dd
|
Changes from comments in Code Review: staring and NPE
|
2016-02-03 16:03:10 +01:00 |
|
masensio
|
dc2fdb9744
|
Changes from comments in Code Review: Strings and minor things
|
2016-02-03 14:28:12 +01:00 |
|
masensio
|
14530aa7b8
|
Changes from comments in PR Code Review
|
2016-02-03 13:45:53 +01:00 |
|
masensio
|
3d623ca911
|
Review string manage_space_description
|
2016-02-03 13:37:47 +01:00 |
|
masensio
|
96ce49707b
|
Clean app data (keeping the PASSCODE untouched) from ManageSpaceActivity
|
2016-02-03 13:37:45 +01:00 |
|
masensio
|
d6653ef684
|
Add android:manageSpaceActivity to AndroidManifest.xml. Create empty activity ManageSpaceActivity.java
|
2016-02-03 13:37:43 +01:00 |
|
tobiasKaminsky
|
5b7f44e0f7
|
renamed security category to details for further use
moved position
|
2016-02-02 17:45:01 +01:00 |
|
David A. Velasco
|
9761b34c76
|
Merge pull request #1439 from owncloud/wording-fixes
Wording fixes, simplify some strings and fix capitalization
|
2016-02-02 17:33:25 +01:00 |
|
masensio
|
9c57aafab5
|
Review appereance of Uploads View
|
2016-01-27 13:59:51 +01:00 |
|
masensio
|
44f2894731
|
Checking Uploads with the same name
|
2016-01-26 17:53:13 +01:00 |
|
masensio
|
2f231561af
|
Checking Priviledges Error failed uploads
|
2016-01-25 15:20:50 +01:00 |
|
masensio
|
29cb1277c3
|
Checking File Error failed uploads
|
2016-01-25 14:54:31 +01:00 |
|
masensio
|
15d5350ef6
|
Checking Folder Error failed uploads
|
2016-01-25 14:23:23 +01:00 |
|
masensio
|
198c1bf3b0
|
Checking Credential Error failed uploads: show error as Credential error and relogin
|
2016-01-25 13:02:22 +01:00 |
|
masensio
|
b6f8e93504
|
Checking Network Connection failed uploads
|
2016-01-25 10:59:53 +01:00 |
|
David A. Velasco
|
0d4c9b9961
|
Show error message from server when update of permissions fail
|
2016-01-20 12:22:24 +01:00 |
|
Jan-Christoph Borchardt
|
61a1d97abc
|
wording fixes, simplify some strings and fix capitalization
|
2016-01-18 15:10:50 +01:00 |
|
David A. Velasco
|
d826451e2d
|
Added buttons to unshare (working) and finish (not working) in EditShareFragment layout
|
2016-01-11 12:17:11 +01:00 |
|
David A. Velasco
|
5fcb70beee
|
Added fragment to edit share permissions with basic layout
|
2016-01-11 12:17:08 +01:00 |
|
masensio
|
2181239c6d
|
Merge branch 'master' into reliable_uploads_actions_uploads_view
|
2016-01-08 11:21:23 +01:00 |
|
tobiasKaminsky
|
6bd7065c73
|
wip
|
2016-01-05 11:16:00 +01:00 |
|
masensio
|
a840e67a68
|
Add 'Uploads' option into NavigationDrawer
|
2015-12-11 08:43:33 +01:00 |
|
masensio
|
dc0aea30f0
|
Merge branch 'master' into reliable_uploads
Conflicts:
AndroidManifest.xml
res/values/strings.xml
src/com/owncloud/android/datamodel/OCFile.java
src/com/owncloud/android/db/ProviderMeta.java
src/com/owncloud/android/files/FileMenuFilter.java
src/com/owncloud/android/files/FileOperationsHelper.java
src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java
src/com/owncloud/android/files/services/FileUploader.java
src/com/owncloud/android/operations/SynchronizeFolderOperation.java
src/com/owncloud/android/operations/UploadFileOperation.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/utils/FileStorageUtils.java
|
2015-12-10 17:18:52 +01:00 |
|
Maria Asensio
|
896e4859c0
|
Merge pull request #1168 from owncloud/avoidDuplicateFiles
Avoid duplicate files
|
2015-12-09 09:27:54 +01:00 |
|
masensio
|
59442c80ea
|
Update string
|
2015-12-03 12:58:22 +01:00 |
|
tobiasKaminsky
|
04fc2e3cc2
|
changed according to latest discussion
|
2015-12-01 22:00:53 +01:00 |
|
masensio
|
e08513a762
|
Delete any rest of old public share/unshare flow
|
2015-11-25 09:32:26 +01:00 |
|
David A. Velasco
|
729a9b7c77
|
Set or clear password to protect public link in ShareFileFragment
|
2015-11-25 09:32:19 +01:00 |
|
David A. Velasco
|
f1b3208f1a
|
Updated ShareFileFragment layout with extra section for public shares
|
2015-11-25 09:32:15 +01:00 |
|
tobiasKaminsky
|
2aac1e5270
|
Merge remote-tracking branch 'remotes/upstream/master' into avoidDuplicateFiles_Master
|
2015-11-21 08:48:40 +01:00 |
|
Maria Asensio
|
19cce9c90f
|
Merge pull request #1184 from Wikinaut/show-certificate-digest
fix #1024 show cert fingerprints when adding new account w/ untrusted certificate
|
2015-11-06 11:23:30 +01:00 |
|
masensio
|
d1294ca584
|
Good behaviiour in servers not supporting SHAREE API: show the menu option and a messsage when try to share with a new user/group
|
2015-10-30 16:50:49 +01:00 |
|
David A. Velasco
|
33a9d1f447
|
Get rid of dependency on Context in CreateShareOperation
|
2015-10-30 16:41:59 +01:00 |
|
masensio
|
fcdef568ea
|
Remove share_group_indicator string
|
2015-10-30 16:39:23 +01:00 |
|
masensio
|
ceffbc4aa8
|
Remove unshare with users/groups option from the menu
|
2015-10-30 16:39:21 +01:00 |
|
David A. Velasco
|
305536f8c2
|
Users and groups retrieved from server to fill search suggestions
|
2015-10-30 16:31:08 +01:00 |
|
masensio
|
1fbc44b574
|
Add new string for share_groups_indicator
|
2015-10-30 16:28:41 +01:00 |
|
David A. Velasco
|
e3d509a451
|
Complete search widget to send search requests to parent activity
|
2015-10-30 16:28:35 +01:00 |
|
David A. Velasco
|
bc5687b74a
|
Changed title in sharing dialog from 'Share link' to 'Sharing' (seen in web UI)
|
2015-10-30 15:23:00 +01:00 |
|
masensio
|
c6c5b732c7
|
Add get list of users in the library
|
2015-10-30 15:22:12 +01:00 |
|
masensio
|
f28faf0c26
|
Show the layout to hsare with user in phone and tablet
|
2015-10-30 15:21:48 +01:00 |
|
masensio
|
8e3d7bdc8f
|
Create the layout to share with a user
|
2015-10-30 15:10:42 +01:00 |
|
masensio
|
3a527a8fe4
|
Add 'Share with users/groups' to long press menu
|
2015-10-30 15:04:34 +01:00 |
|
masensio
|
b9ef747a0b
|
Merge branch 'master' into sync_full_folder
Conflicts:
owncloud-android-library
src/com/owncloud/android/files/services/FileUploader.java
|
2015-10-27 08:52:17 +01:00 |
|
tobiasKaminsky
|
e92297ccaf
|
split "on charging" to photo and video
|
2015-10-18 12:51:08 +02:00 |
|
tobiasKaminsky
|
e5caabd104
|
Merge remote-tracking branch 'remotes/upstream/master' into uploadWhenCharging
|
2015-10-18 12:50:54 +02:00 |
|
tobiasKaminsky
|
1db620124a
|
update according to jan
|
2015-10-18 10:21:29 +02:00 |
|