summaryrefslogtreecommitdiffstats
path: root/apps/files_sharing
Commit message (Collapse)AuthorAgeFilesLines
* Change occurence of ownCloud (#352)Morris Jobke2016-07-111-3/+2
|
* [tx-robot] updated from transifexNextcloud bot2016-07-112-0/+4
|
* [tx-robot] updated from transifexNextcloud bot2016-07-102-0/+4
|
* [tx-robot] updated from transifexNextcloud bot2016-07-0910-0/+20
|
* combine if statementsRobin Appelman2016-07-081-13/+10
|
* handle errors while getting fileinfoRobin Appelman2016-07-081-1/+1
|
* Fix type hintingRobin Appelman2016-07-081-1/+2
|
* hint global handlebarsRobin Appelman2016-07-081-0/+2
|
* dont overwrite a variable with a different typeRobin Appelman2016-07-081-3/+3
|
* [tx-robot] updated from transifexNextcloud bot2016-07-082-16/+16
|
* Merge pull request #333 from nextcloud/sync-masterLukas Reschke2016-07-074-3/+82
|\ | | | | Sync master
| * Simplify test code and don't show anything if no date is setMorris Jobke2016-07-072-10/+4
| |
| * add unit testsMorris Jobke2016-07-071-3/+40
| |
| * Update header during update callbackMorris Jobke2016-07-071-5/+5
| |
| * Not set expiration date is represented as 0Morris Jobke2016-07-071-1/+4
| |
| * add "Never" if expiration date is not setMorris Jobke2016-07-071-2/+3
| |
| * Add expiration date to share by link viewMorris Jobke2016-07-072-0/+41
| |
| * Merge branch 'master' into sync-masterMorris Jobke2016-07-0730-70/+435
| |\
| * | Revert "[tx-robot] updated from transifex"Morris Jobke2016-07-076-74/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 3731b2a006eca1e96d4087212a5e779c85a002e4. Revert "[tx-robot] updated from transifex" This reverts commit 94d91113f1206161b00bbc28da00aaf80bcd0a3e. Revert "[tx-robot] updated from transifex" This reverts commit e7cc8bac1e26935ed3bceb2b777659cc72cafdf2. Revert "[tx-robot] updated from transifex" This reverts commit 59fc3ff45a98e305ad65069d31fc78081fa88dc6. Revert "[tx-robot] updated from transifex" This reverts commit 6a89a63d2e5f6d807f6e99823b76f3cfea268c29. Revert "[tx-robot] updated from transifex" This reverts commit b0bad03234329113988d7d9c9cf2613d8f031c5f.
| * | [tx-robot] updated from transifexJenkins for ownCloud2016-07-072-2/+2
| | |
| * | fix swift primary object store test (#25281)Thomas Müller2016-07-051-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Wait for socket to be open * Fix call on null * Allow DB access for MountProviderTest Makes unit tests pass when using object store, since their FS access is actually oc_filecache DB access. It is currently not possible to mock or bypass the logic from "SharedMount::verifyMountPoint()" triggered by this test.
| * | [tx-robot] updated from transifexJenkins for ownCloud2016-07-042-0/+38
| | |
| * | [tx-robot] updated from transifexJenkins for ownCloud2016-07-022-0/+34
| | |
* | | [tx-robot] updated from transifexNextcloud bot2016-07-072-20/+20
| |/ |/|
* | [tx-robot] updated from transifexNextcloud bot2016-07-0622-48/+158
| |
* | Merge remote-tracking branch 'upstream/master' into master-sync-upstreamLukas Reschke2016-07-014-3/+20
|\|
| * [tx-robot] updated from transifexJenkins for ownCloud2016-06-292-0/+2
| |
| * Fix getting the certificate bundle for dav external storage (#25274)Robin Appelman2016-06-271-1/+1
| | | | | | | | | | | | * Fix getting the certificate bundle for dav external storages * Log the original exception in dav external storage
| * handle unavailable fed shares while testing for availability (#25277)Robin Appelman2016-06-271-2/+17
| | | | | | | | | | | | * More explicit http status codes * handle unavailable fed shares while testing for availability
* | Merge remote-tracking branch 'upstream/master' into master-sync-upstreamLukas Reschke2016-06-273-17/+98
|\|
| * Add explicit delete permission to link sharesVincent Petry2016-06-243-16/+98
| | | | | | | | | | | | | | | | | | | | | | | | Link shares always allowed deletion, however internally the permissions were stored as 7 which lacked delete permissions. This created an inconsistency in the Webdav permissions. This fix makes sure we include delete permissions in the share permissions, which now become 15. In case a client is still passing 7 for legacy reasons, it gets converted automatically to 15.
* | Merge remote-tracking branch 'upstream/master' into master-upstream-syncLukas Reschke2016-06-266-5/+154
|\|
| * Increase fed share timeout from 3 to 10 + unit testsVincent Petry2016-06-222-6/+6
| |
| * Add timeouts to make the UI usable again when a remote share is unreachableJoas Schilling2016-06-222-3/+13
| |
| * [tx-robot] updated from transifexJenkins for ownCloud2016-06-222-0/+2
| |
| * fix broken unit test (#25198)Thomas Müller2016-06-211-1/+8
| |
| * Filter out group shares for owner where owner is included (#25190)Vincent Petry2016-06-212-2/+132
| |
* | Merge remote-tracking branch 'upstream/master' into master-sync-upstreamLukas Reschke2016-06-219-20/+118
|\|
| * Catch exceptions while creating shared mounts (#25077)Robin Appelman2016-06-202-11/+25
| |
| * Merge pull request #25159 from owncloud/share-app-initorderVincent Petry2016-06-201-3/+3
| |\ | | | | | | Delay files_sharing's registerMountProviders
| | * Delay files_sharing's registerMountProvidersVincent Petry2016-06-171-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | This moves registerMountProviders until after the sharing backends were registered. In some situations registerMountProviders will trigger listeners which might require filesystem access which itself would mount shares, which itself requires the sharing backends to be initialized.
| * | Make getShareFolder use given view instead of static FSVincent Petry2016-06-172-5/+9
| | |
| * | disable cleanFolder for the federated share storageRobin Appelman2016-06-142-1/+43
| |/
| * [tx-robot] updated from transifexJenkins for ownCloud2016-06-142-0/+38
| |
* | Merge pull request #57 from nextcloud/fdrop-templateLukas Reschke2016-06-131-2/+31
|\ \ | | | | | | smaller files drop fixes
| * | smaller files drop fixesArthur Schiwon2016-06-111-2/+31
| | | | | | | | | | | | | | | | | | * fix infinite spinner on blacklisted files * move HTML to template * indentation
* | | Merge branch 'master' of https://github.com/owncloud/core into downstream-160611Arthur Schiwon2016-06-117-23/+113
|\ \ \ | |/ / |/| / | |/
| * Merge pull request #25003 from owncloud/fix_ocs_path_responseVincent Petry2016-06-103-21/+65
| |\ | | | | | | Fix OCS Share API path response
| | * Extend unit testsRoeland Jago Douma2016-06-071-1/+33
| | |
| | * Fix unit testsRoeland Jago Douma2016-06-072-9/+21
| | |