Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #22757 from owncloud/apply-license | C. Montero Luque | 2016-03-01 | 316 | -201/+625 |
|\ | | | | | Update copyright information and author file | ||||
| * | Add new apps | Lukas Reschke | 2016-03-01 | 9 | -4/+33 |
| | | |||||
| * | Remove Scrutinizer Auto Fixer | Lukas Reschke | 2016-03-01 | 93 | -93/+3 |
| | | |||||
| * | Map Maci | Lukas Reschke | 2016-03-01 | 15 | -3/+14 |
| | | |||||
| * | Update author information | Lukas Reschke | 2016-03-01 | 273 | -123/+597 |
| | | | | | | | | Probably nice for the people that contributed to 9.0 to see themselves in the AUTHORS file :) | ||||
* | | Merge pull request #22756 from owncloud/exclude-custom-data-dir | C. Montero Luque | 2016-03-01 | 1 | -2/+8 |
|\ \ | | | | | | | Exclude custom data directory from integrity checker | ||||
| * \ | Merge branch 'master' into exclude-custom-data-dir | C. Montero Luque | 2016-03-01 | 30 | -333/+510 |
| |\ \ | |||||
| * | | | Exclude custom data directory from integrity checker | Lukas Reschke | 2016-03-01 | 1 | -2/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should not scan any custom data directory in the integrity checker as well. Otherwise this would lead to a massive increased update time that may likely exceed the timeout. To test this: 1. Install ownCloud 8.2.2, set as data dir another folder than `data` such as `data-asdf`. Make sure that folder lives in the web root as well. 2. Update that instance to 9.0.0 beta2 => Errors are shown in the code integrity check 3. Apply this patch and trigger the rescan in the admin settings => No errors are shown anymore (can also do a new update with that patch applied) Fixes https://github.com/owncloud/core/issues/22698 | ||||
* | | | | Merge pull request #22684 from owncloud/part-file-root | C. Montero Luque | 2016-03-01 | 3 | -4/+77 |
|\ \ \ \ | |_|/ / |/| | | | allow putting the part file in the view root | ||||
| * | | | Merge branch 'master' into part-file-root | C. Montero Luque | 2016-03-01 | 7 | -292/+30 |
| |\ \ \ | |/ / / |/| | | | |||||
* | | | | Merge pull request #22742 from owncloud/ceph-keystone-readiness | C. Montero Luque | 2016-03-01 | 7 | -292/+30 |
|\ \ \ \ | |_|_|/ |/| | | | Use readiness notification socket to be absolutely sure this works | ||||
| * | | | local entrypoint.sh isn't needed - all fixes are upstream | Morris Jobke | 2016-03-01 | 2 | -276/+1 |
| | | | | |||||
| * | | | Use sockets for startup notification in primary storage tests | Morris Jobke | 2016-03-01 | 2 | -14/+13 |
| | | | | |||||
| * | | | Use readiness notification socket to be absolutely sure this works | Robin McCorkell | 2016-02-29 | 4 | -2/+16 |
| | | | | |||||
| | * | | add config sample | Robin Appelman | 2016-03-01 | 1 | -0/+8 |
| | | | | |||||
| | * | | allow putting the part file in the view root | Robin Appelman | 2016-03-01 | 2 | -4/+69 |
| |/ / |/| | | |||||
* | | | Merge pull request #22699 from owncloud/checksum_int_test | Thomas Müller | 2016-03-01 | 5 | -2/+325 |
|\ \ \ | | | | | | | | | Checksum intergration tests and fixes | ||||
| * | | | Save some calls to refreshInfo during upload | Vincent Petry | 2016-03-01 | 1 | -4/+5 |
| | | | | |||||
| * | | | Fix unit tests | Roeland Jago Douma | 2016-03-01 | 1 | -5/+7 |
| | | | | |||||
| * | | | Checksums on chunked files | Roeland Jago Douma | 2016-03-01 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | | | | | | We should also store checksums on chunked files. We do not checksum individual chunks but only the final file. | ||||
| * | | | Remove checksum on upload of non checksumed file | Roeland Jago Douma | 2016-03-01 | 2 | -1/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we overwrite a checksumed file with a file without a checksum we should remove the checksum from the server. This is done by setting the column to empty. | ||||
| * | | | Checksum intergration test | Roeland Jago Douma | 2016-03-01 | 3 | -0/+305 |
| | |/ | |/| | | | | | | | | | | | | | | | | | | | * Upload file with checksum * Chunked upload with checksum * Copy file with checksum should also copy the checksum * Moving a file with checksum should also move the checksum * Uploading a file with checksum and overwriting it with a file without cheksum should remove the checksum | ||||
* | | | Merge pull request #22686 from owncloud/cleanup_remote_address_books | Thomas Müller | 2016-03-01 | 18 | -39/+155 |
|\ \ \ | |/ / |/| | | remove remote address book if access was revoked | ||||
| * | | increase version number | Bjoern Schiessle | 2016-03-01 | 1 | -1/+1 |
| | | | |||||
| * | | Handle null case | Thomas Müller | 2016-03-01 | 1 | -2/+5 |
| | | | |||||
| * | | fix doc-block | Bjoern Schiessle | 2016-02-29 | 1 | -0/+1 |
| | | | |||||
| * | | remove synced remote address book if the remote server revoked access to his ↵ | Bjoern Schiessle | 2016-02-29 | 7 | -7/+39 |
| | | | | | | | | | | | | system address book | ||||
| * | | remove remote address book if the admin removes the server from the trusted ↵ | Bjoern Schiessle | 2016-02-29 | 9 | -18/+97 |
| | | | | | | | | | | | | servers list | ||||
| * | | reuse the url_hash instead of calculating a new hash for the address book | Bjoern Schiessle | 2016-02-26 | 5 | -13/+14 |
| | | | |||||
* | | | Merge pull request #22681 from owncloud/add-autodiscovery-for-ocs | Thomas Müller | 2016-03-01 | 15 | -36/+458 |
|\ \ \ | | | | | | | | | Add autodiscovery support to server-to-server sharing implementation | ||||
| * | | | Fix Scrutinizer issues | Lukas Reschke | 2016-02-29 | 2 | -0/+3 |
| | | | | |||||
| * | | | Add autodiscovery support to server-to-server sharing | Lukas Reschke | 2016-02-26 | 15 | -36/+456 |
| | | | | | | | | | | | | | | | | Adds autodiscovery support to server-to-server sharing as specified in the specification. If no discovery data is found it is using the fallback ownCloud endpoints for legacy support. | ||||
* | | | | Merge pull request #22728 from owncloud/external-share-testremote | Thomas Müller | 2016-03-01 | 4 | -28/+65 |
|\ \ \ \ | | | | | | | | | | | use ocs discover endpoint to test remote | ||||
| * | | | | Only use scanner if remote is an ownCloud | Lukas Reschke | 2016-03-01 | 1 | -1/+17 |
| | | | | | |||||
| * | | | | /shareinfo is not required | Lukas Reschke | 2016-03-01 | 2 | -0/+8 |
| | | | | | |||||
| * | | | | Fix tests | Lukas Reschke | 2016-03-01 | 1 | -20/+14 |
| | | | | | |||||
| * | | | | Add missing trailing slash | Lukas Reschke | 2016-03-01 | 2 | -3/+3 |
| | | | | | |||||
| * | | | | use ocs discover endpoint to test remote | Robin Appelman | 2016-03-01 | 2 | -8/+27 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #17451 from owncloud/apps-disablebrokenappafterenable | Thomas Müller | 2016-03-01 | 2 | -28/+78 |
|\ \ \ \ | | | | | | | | | | | Disable app that bricks the server after enabling | ||||
| * | | | | Disable app that bricks the server after enabling | Vincent Petry | 2016-02-29 | 2 | -28/+78 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If an app is getting enabled in the web UI, an ajax call is now made to make sure the server still works. If it doesn't, it sends an emergency app disabling call to disable the breaking app. | ||||
* | | | | | Merge pull request #22700 from owncloud/only_1_linkshare | Thomas Müller | 2016-03-01 | 3 | -0/+41 |
|\ \ \ \ \ | | | | | | | | | | | | | For now only allow 1 link share per file/folder | ||||
| * | | | | | Intergration tests | Roeland Jago Douma | 2016-03-01 | 2 | -0/+32 |
| | | | | | | |||||
| * | | | | | For now only allow 1 link share per file/folder | Roeland Jago Douma | 2016-03-01 | 1 | -0/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #22692 This is a temp fix util we get #22327 We just block it in the OCS Share API since we have 1 endpoint now anyway. | ||||
* | | | | | | Merge pull request #22731 from owncloud/hide-nodes-from-listening | Thomas Müller | 2016-03-01 | 8 | -3/+499 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Hides nodes from listing that the user has no access to | ||||
| * | | | | | | Hides nodes from listing that the user has no access to | Lukas Reschke | 2016-02-29 | 8 | -3/+499 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge pull request #22613 from owncloud/quota-changedavreturnvaluewhennoquotaset | Thomas Müller | 2016-03-01 | 9 | -22/+157 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Don't return quota when none set | ||||
| * | | | | | | Return -3 for unlimited quota | Vincent Petry | 2016-02-29 | 9 | -22/+157 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Returns -3 for unlimited quota in Webdav response. Also adjusted personal page to show unlimited quota when set. | ||||
* | | | | | | | Merge pull request #22667 from owncloud/scrollbar | Thomas Müller | 2016-03-01 | 1 | -1/+2 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | make scrollbar less obnoxious: tad narrower, rounded corners | ||||
| * | | | | | | | make scrollbar less obnoxious: tad narrower, rounded corners | Jan-Christoph Borchardt | 2016-02-26 | 1 | -1/+2 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge pull request #22677 from ↵ | Thomas Müller | 2016-03-01 | 3 | -8/+39 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/allow-to-overwrite-single-l10n-string-via-theme Allow to overwrite a single language string via the theme folder |