 Maria Asensio
|
896e4859c0
Merge pull request #1168 from owncloud/avoidDuplicateFiles
|
9 years ago |
 tobiasKaminsky
|
5d77cfc62d
fix 1313
|
9 years ago |
 David A. Velasco
|
0199ef3ef2
Fixed NPE in synchronization of full account
|
9 years ago |
|
David A. Velasco
|
5c24e55421
Grant that ShareActivity is correctly refreshed if public share was removed in the server
|
9 years ago |
|
David A. Velasco
|
9b4d153e90
Updated handling of enforced password for public shares depending on server capabilities
|
9 years ago |
|
masensio
|
e08513a762
Delete any rest of old public share/unshare flow
|
9 years ago |
|
David A. Velasco
|
729a9b7c77
Set or clear password to protect public link in ShareFileFragment
|
9 years ago |
|
tobiasKaminsky
|
2aac1e5270
Merge remote-tracking branch 'remotes/upstream/master' into avoidDuplicateFiles_Master
|
9 years ago |
|
masensio
|
35922a08c1
Read capabilities for showing Share Options
|
9 years ago |
|
masensio
|
f65152c5fb
Refactor saveSharesInFolder in FileDataStorageManager. Set the Content Values using prepareInsertShares method
|
9 years ago |
|
masensio
|
fdcf0ebbc8
Fix saveSharesDB, duplicated rows
|
9 years ago |
|
David A. Velasco
|
5e0f46cc2e
Added operation to create shares with a sharee, separated from operation to create shares via link
|
9 years ago |
|
masensio
|
c49cc06d3d
Get users/group from Server, to fill in 'Share with' list
|
9 years ago |
|
masensio
|
9cdaddefa3
Use UnshareOperation instead an AsyncTask, for unshare with
|
9 years ago |
|
masensio
|
a00b272903
Adapt UnshareLinkOperation to support also ShareType: USER or GROUP. UnshareLinkOperation --> UnshareOperation
|
9 years ago |
|
tobiasKaminsky
|
fc0dfecf1a
fixed travis bug
|
9 years ago |
|
masensio
|
55dc0da79a
Get shares from Database, fix in insert shares in DB
|
9 years ago |
|
masensio
|
72987c296f
Get shares from Database (WIP)
|
9 years ago |
|
David A. Velasco
|
0db4fc9b17
Sync user and group shares into database
|
9 years ago |
|
masensio
|
bcfa07f565
Fix Select Local Version or Keep Both behaviour when solving file coflict
|
9 years ago |
|
David A. Velasco
|
44023a6059
Clean-up: removed unused imports and methods, and commented code
|
9 years ago |
|
David A. Velasco
|
95bebe9382
Remove conflict badge from ancestors when conflict is solved there are no more conflicts below
|
9 years ago |
|
David A. Velasco
|
7399508e05
Removed conflict badge when conflict is solved
|
9 years ago |
|
David A. Velasco
|
a2aa0479fc
Added conflict icon to folders containing files with conflicts
|
9 years ago |
|
David A. Velasco
|
e6c1454458
Persist conflicts in local database and show with an icon in the list of files
|
9 years ago |
|
tobiasKaminsky
|
4b8a5a9c92
#819, part 2: Instant uploads, depends on setting
|
9 years ago |
 Jorge Antonio Diaz-Benito Soriano
|
21c391c0b2
Removes a static modifier that sneaked in
|
10 years ago |
|
Jorge Antonio Diaz-Benito Soriano
|
ccf8741fab
Added copy action
|
10 years ago |
|
Jorge Antonio Diaz-Benito Soriano
|
fe5b6aa4a8
Added copy action
|
10 years ago |
 purigarcia
|
61e6191342
change the name of the method from keepInSync to favorite. Other changes commented in the review
|
9 years ago |
