summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #22757 from owncloud/apply-licenseC. Montero Luque2016-03-01316-201/+625
|\ | | | | Update copyright information and author file
| * Add new appsLukas Reschke2016-03-019-4/+33
| |
| * Remove Scrutinizer Auto FixerLukas Reschke2016-03-0193-93/+3
| |
| * Map MaciLukas Reschke2016-03-0115-3/+14
| |
| * Update author informationLukas Reschke2016-03-01273-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-dirC. Montero Luque2016-03-011-2/+8
|\ \ | | | | | | Exclude custom data directory from integrity checker
| * \ Merge branch 'master' into exclude-custom-data-dirC. Montero Luque2016-03-0130-333/+510
| |\ \
| * | | Exclude custom data directory from integrity checkerLukas Reschke2016-03-011-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-rootC. Montero Luque2016-03-013-4/+77
|\ \ \ \ | |_|/ / |/| | | allow putting the part file in the view root
| * | | Merge branch 'master' into part-file-rootC. Montero Luque2016-03-017-292/+30
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #22742 from owncloud/ceph-keystone-readinessC. Montero Luque2016-03-017-292/+30
|\ \ \ \ | |_|_|/ |/| | | Use readiness notification socket to be absolutely sure this works
| * | | local entrypoint.sh isn't needed - all fixes are upstreamMorris Jobke2016-03-012-276/+1
| | | |
| * | | Use sockets for startup notification in primary storage testsMorris Jobke2016-03-012-14/+13
| | | |
| * | | Use readiness notification socket to be absolutely sure this worksRobin McCorkell2016-02-294-2/+16
| | | |
| | * | add config sampleRobin Appelman2016-03-011-0/+8
| | | |
| | * | allow putting the part file in the view rootRobin Appelman2016-03-012-4/+69
| |/ / |/| |
* | | Merge pull request #22699 from owncloud/checksum_int_testThomas Müller2016-03-015-2/+325
|\ \ \ | | | | | | | | Checksum intergration tests and fixes
| * | | Save some calls to refreshInfo during uploadVincent Petry2016-03-011-4/+5
| | | |
| * | | Fix unit testsRoeland Jago Douma2016-03-011-5/+7
| | | |
| * | | Checksums on chunked filesRoeland Jago Douma2016-03-011-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 fileRoeland Jago Douma2016-03-012-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 testRoeland Jago Douma2016-03-013-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_booksThomas Müller2016-03-0118-39/+155
|\ \ \ | |/ / |/| | remove remote address book if access was revoked
| * | increase version numberBjoern Schiessle2016-03-011-1/+1
| | |
| * | Handle null caseThomas Müller2016-03-011-2/+5
| | |
| * | fix doc-blockBjoern Schiessle2016-02-291-0/+1
| | |
| * | remove synced remote address book if the remote server revoked access to his ↵Bjoern Schiessle2016-02-297-7/+39
| | | | | | | | | | | | system address book
| * | remove remote address book if the admin removes the server from the trusted ↵Bjoern Schiessle2016-02-299-18/+97
| | | | | | | | | | | | servers list
| * | reuse the url_hash instead of calculating a new hash for the address bookBjoern Schiessle2016-02-265-13/+14
| | |
* | | Merge pull request #22681 from owncloud/add-autodiscovery-for-ocsThomas Müller2016-03-0115-36/+458
|\ \ \ | | | | | | | | Add autodiscovery support to server-to-server sharing implementation
| * | | Fix Scrutinizer issuesLukas Reschke2016-02-292-0/+3
| | | |
| * | | Add autodiscovery support to server-to-server sharingLukas Reschke2016-02-2615-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-testremoteThomas Müller2016-03-014-28/+65
|\ \ \ \ | | | | | | | | | | use ocs discover endpoint to test remote
| * | | | Only use scanner if remote is an ownCloudLukas Reschke2016-03-011-1/+17
| | | | |
| * | | | /shareinfo is not requiredLukas Reschke2016-03-012-0/+8
| | | | |
| * | | | Fix testsLukas Reschke2016-03-011-20/+14
| | | | |
| * | | | Add missing trailing slashLukas Reschke2016-03-012-3/+3
| | | | |
| * | | | use ocs discover endpoint to test remoteRobin Appelman2016-03-012-8/+27
| | |_|/ | |/| |
* | | | Merge pull request #17451 from owncloud/apps-disablebrokenappafterenableThomas Müller2016-03-012-28/+78
|\ \ \ \ | | | | | | | | | | Disable app that bricks the server after enabling
| * | | | Disable app that bricks the server after enablingVincent Petry2016-02-292-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_linkshareThomas Müller2016-03-013-0/+41
|\ \ \ \ \ | | | | | | | | | | | | For now only allow 1 link share per file/folder
| * | | | | Intergration testsRoeland Jago Douma2016-03-012-0/+32
| | | | | |
| * | | | | For now only allow 1 link share per file/folderRoeland Jago Douma2016-03-011-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-listeningThomas Müller2016-03-018-3/+499
|\ \ \ \ \ \ | | | | | | | | | | | | | | Hides nodes from listing that the user has no access to
| * | | | | | Hides nodes from listing that the user has no access toLukas Reschke2016-02-298-3/+499
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #22613 from owncloud/quota-changedavreturnvaluewhennoquotasetThomas Müller2016-03-019-22/+157
|\ \ \ \ \ \ | | | | | | | | | | | | | | Don't return quota when none set
| * | | | | | Return -3 for unlimited quotaVincent Petry2016-02-299-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/scrollbarThomas Müller2016-03-011-1/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | make scrollbar less obnoxious: tad narrower, rounded corners
| * | | | | | | make scrollbar less obnoxious: tad narrower, rounded cornersJan-Christoph Borchardt2016-02-261-1/+2
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #22677 from ↵Thomas Müller2016-03-013-8/+39
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/allow-to-overwrite-single-l10n-string-via-theme Allow to overwrite a single language string via the theme folder