Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Change occurence of ownCloud (#352) | Morris Jobke | 2016-07-11 | 1 | -3/+2 |
| | |||||
* | [tx-robot] updated from transifex | Nextcloud bot | 2016-07-11 | 2 | -0/+4 |
| | |||||
* | [tx-robot] updated from transifex | Nextcloud bot | 2016-07-10 | 2 | -0/+4 |
| | |||||
* | [tx-robot] updated from transifex | Nextcloud bot | 2016-07-09 | 10 | -0/+20 |
| | |||||
* | combine if statements | Robin Appelman | 2016-07-08 | 1 | -13/+10 |
| | |||||
* | handle errors while getting fileinfo | Robin Appelman | 2016-07-08 | 1 | -1/+1 |
| | |||||
* | Fix type hinting | Robin Appelman | 2016-07-08 | 1 | -1/+2 |
| | |||||
* | hint global handlebars | Robin Appelman | 2016-07-08 | 1 | -0/+2 |
| | |||||
* | dont overwrite a variable with a different type | Robin Appelman | 2016-07-08 | 1 | -3/+3 |
| | |||||
* | [tx-robot] updated from transifex | Nextcloud bot | 2016-07-08 | 2 | -16/+16 |
| | |||||
* | Merge pull request #333 from nextcloud/sync-master | Lukas Reschke | 2016-07-07 | 4 | -3/+82 |
|\ | | | | | Sync master | ||||
| * | Simplify test code and don't show anything if no date is set | Morris Jobke | 2016-07-07 | 2 | -10/+4 |
| | | |||||
| * | add unit tests | Morris Jobke | 2016-07-07 | 1 | -3/+40 |
| | | |||||
| * | Update header during update callback | Morris Jobke | 2016-07-07 | 1 | -5/+5 |
| | | |||||
| * | Not set expiration date is represented as 0 | Morris Jobke | 2016-07-07 | 1 | -1/+4 |
| | | |||||
| * | add "Never" if expiration date is not set | Morris Jobke | 2016-07-07 | 1 | -2/+3 |
| | | |||||
| * | Add expiration date to share by link view | Morris Jobke | 2016-07-07 | 2 | -0/+41 |
| | | |||||
| * | Merge branch 'master' into sync-master | Morris Jobke | 2016-07-07 | 30 | -70/+435 |
| |\ | |||||
| * | | Revert "[tx-robot] updated from transifex" | Morris Jobke | 2016-07-07 | 6 | -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 transifex | Jenkins for ownCloud | 2016-07-07 | 2 | -2/+2 |
| | | | |||||
| * | | fix swift primary object store test (#25281) | Thomas Müller | 2016-07-05 | 1 | -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 transifex | Jenkins for ownCloud | 2016-07-04 | 2 | -0/+38 |
| | | | |||||
| * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-07-02 | 2 | -0/+34 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Nextcloud bot | 2016-07-07 | 2 | -20/+20 |
| |/ |/| | |||||
* | | [tx-robot] updated from transifex | Nextcloud bot | 2016-07-06 | 22 | -48/+158 |
| | | |||||
* | | Merge remote-tracking branch 'upstream/master' into master-sync-upstream | Lukas Reschke | 2016-07-01 | 4 | -3/+20 |
|\| | |||||
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-29 | 2 | -0/+2 |
| | | |||||
| * | Fix getting the certificate bundle for dav external storage (#25274) | Robin Appelman | 2016-06-27 | 1 | -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 Appelman | 2016-06-27 | 1 | -2/+17 |
| | | | | | | | | | | | | * More explicit http status codes * handle unavailable fed shares while testing for availability | ||||
* | | Merge remote-tracking branch 'upstream/master' into master-sync-upstream | Lukas Reschke | 2016-06-27 | 3 | -17/+98 |
|\| | |||||
| * | Add explicit delete permission to link shares | Vincent Petry | 2016-06-24 | 3 | -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-sync | Lukas Reschke | 2016-06-26 | 6 | -5/+154 |
|\| | |||||
| * | Increase fed share timeout from 3 to 10 + unit tests | Vincent Petry | 2016-06-22 | 2 | -6/+6 |
| | | |||||
| * | Add timeouts to make the UI usable again when a remote share is unreachable | Joas Schilling | 2016-06-22 | 2 | -3/+13 |
| | | |||||
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-22 | 2 | -0/+2 |
| | | |||||
| * | fix broken unit test (#25198) | Thomas Müller | 2016-06-21 | 1 | -1/+8 |
| | | |||||
| * | Filter out group shares for owner where owner is included (#25190) | Vincent Petry | 2016-06-21 | 2 | -2/+132 |
| | | |||||
* | | Merge remote-tracking branch 'upstream/master' into master-sync-upstream | Lukas Reschke | 2016-06-21 | 9 | -20/+118 |
|\| | |||||
| * | Catch exceptions while creating shared mounts (#25077) | Robin Appelman | 2016-06-20 | 2 | -11/+25 |
| | | |||||
| * | Merge pull request #25159 from owncloud/share-app-initorder | Vincent Petry | 2016-06-20 | 1 | -3/+3 |
| |\ | | | | | | | Delay files_sharing's registerMountProviders | ||||
| | * | Delay files_sharing's registerMountProviders | Vincent Petry | 2016-06-17 | 1 | -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 FS | Vincent Petry | 2016-06-17 | 2 | -5/+9 |
| | | | |||||
| * | | disable cleanFolder for the federated share storage | Robin Appelman | 2016-06-14 | 2 | -1/+43 |
| |/ | |||||
| * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-14 | 2 | -0/+38 |
| | | |||||
* | | Merge pull request #57 from nextcloud/fdrop-template | Lukas Reschke | 2016-06-13 | 1 | -2/+31 |
|\ \ | | | | | | | smaller files drop fixes | ||||
| * | | smaller files drop fixes | Arthur Schiwon | 2016-06-11 | 1 | -2/+31 |
| | | | | | | | | | | | | | | | | | | * fix infinite spinner on blacklisted files * move HTML to template * indentation | ||||
* | | | Merge branch 'master' of https://github.com/owncloud/core into downstream-160611 | Arthur Schiwon | 2016-06-11 | 7 | -23/+113 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | Merge pull request #25003 from owncloud/fix_ocs_path_response | Vincent Petry | 2016-06-10 | 3 | -21/+65 |
| |\ | | | | | | | Fix OCS Share API path response | ||||
| | * | Extend unit tests | Roeland Jago Douma | 2016-06-07 | 1 | -1/+33 |
| | | | |||||
| | * | Fix unit tests | Roeland Jago Douma | 2016-06-07 | 2 | -9/+21 |
| | | |