8d2238e055
Merge pull request #22796 from owncloud/fix-encryption-on-version-restore
...
Keep "encryptedVersion" when calling `\OC\Files\View::copy`
2016-03-03 16:31:11 +01:00
72c8187cbb
Keep "encryptedVersion" when calling `\OC\Files\View::copy`
...
When calling `\OC\Files\View::copy` we should also keep the version to ensure that the file will always have the correct version attached and can be successfully decrypted.
To test this the following steps are necessary (from https://github.com/owncloud/core/issues/22781#issuecomment-191328982 ):
1. setup a new ownCloud 9.0 beta2
2. enable encryption
2. upload a docx (5.7MB large)
3. upload the same file again and overwrite the existing file
4. I can download the original file and the first version
5. I restore the first version
6. restored version can no longer be downloaded with the error described above
The manual cache operation in `\OCA\Files_Versions\Storage` is unfortunately necessary since `\OCA\Files_Versions\Storage::copyFileContents` is not using `\OCP\Files\Storage::moveFromStorage` in the case when an object storage is used. Due to the workaround added in 54cea05271
2016-03-03 14:15:36 +01:00
e55c52c078
Exclude the assets folder from integrity check
...
We should not scan the assets folder as this can contain user specific content. Partially addresses https://github.com/owncloud/core/issues/22803
2016-03-03 13:46:41 +01:00
4d69e562a0
Merge pull request #22757 from owncloud/apply-license
...
Update copyright information and author file
2016-03-01 15:36:37 -05:00
c353d51810
Remove Scrutinizer Auto Fixer
2016-03-01 17:48:23 +01:00
c430f5ba53
Map Maci
2016-03-01 17:45:05 +01:00
933f60e314
Update author information
...
Probably nice for the people that contributed to 9.0 to see themselves in the AUTHORS file :)
2016-03-01 17:25:15 +01:00
2d68c1b945
Exclude custom data directory from integrity checker
...
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
2016-03-01 17:16:10 +01:00
5fe5233f41
Merge pull request #22681 from owncloud/add-autodiscovery-for-ocs
...
Add autodiscovery support to server-to-server sharing implementation
2016-03-01 11:27:28 +01:00
fd4742d430
Merge pull request #22613 from owncloud/quota-changedavreturnvaluewhennoquotaset
...
Don't return quota when none set
2016-03-01 08:30:58 +01:00
71e5de3865
Merge pull request #22677 from owncloud/allow-to-overwrite-single-l10n-string-via-theme
...
Allow to overwrite a single language string via the theme folder
2016-03-01 08:26:28 +01:00
da18d04b38
Merge pull request #22733 from owncloud/size-propagation-new-file
...
fix size propagation for new files
2016-03-01 08:20:34 +01:00
caf6c43187
Merge pull request #22736 from owncloud/propagation-ignore-encryption
...
ignore encryption keys for propagation
2016-03-01 08:19:42 +01:00
003a686c1b
ignore encryption keys for propagation
2016-02-29 17:47:09 +01:00
8c700cc99d
fix size propagation for new files
2016-02-29 17:31:01 +01:00
11215f4e27
Return -3 for unlimited quota
...
Returns -3 for unlimited quota in Webdav response.
Also adjusted personal page to show unlimited quota when set.
2016-02-29 14:36:20 +01:00
2a0cda74d4
Use IQueryBuilder::PARAM_* instead of \PDO::PARAM_*
2016-02-29 09:44:40 +01:00
6526c122af
Merge pull request #22683 from owncloud/fix_22682
...
Relax rootfolder check
2016-02-29 08:53:58 +01:00
b116e80c56
Relax rootfolder check
...
* Updated unit tests
* Added intergration test
2016-02-26 16:05:32 +01:00
78570a5f72
Allow to overwrite a single language string via the theme folder
2016-02-26 13:56:02 +01:00
bfcdf40a64
Expiration date can only be enforced if default is enabled
...
If the default expiration date is not enebaled it can not be enforced.
* Added unit tests
2016-02-26 11:38:06 +01:00
62d7885c3b
Merge pull request #22660 from owncloud/fix_22656
...
Do not allow sharing of the users root folder
2016-02-26 10:49:12 +01:00
0795cc373d
Merge pull request #22646 from owncloud/fix_22642
...
Set default expiration date if none given on share creation
2016-02-26 10:48:21 +01:00
cbde4bb92f
Merge pull request #22650 from owncloud/fix_hook
...
Fix verifyExpirationDate passwordSet argument
2016-02-26 09:32:41 +01:00
59028cced0
Add autodiscovery support to server-to-server sharing
...
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.
2016-02-26 09:26:55 +01:00
cb41b1a863
Merge pull request #22584 from owncloud/fix-app-load-order-fixes-22508
...
Before installing new shipped apps we need to load authentication apps
2016-02-25 21:43:32 +01:00
8213d5df4f
Do not allow sharing of the root folder
...
Sharing of the users root folder should not be allowed as it is very
weird UX. Also many of our clients have no proper way of displaying
this.
Added unit test
Also added intergration tests to make sure we won't allow it in the
future.
2016-02-25 20:40:30 +01:00
776d91f3bc
Merge pull request #21854 from owncloud/fix-share-hook-group-add
...
Fix addUserToGroup hook of the share code
2016-02-25 16:56:19 +01:00
9412f69104
Fix verifyExpirationDate passwordSet argument
...
Password set should be false if the password is null.
Also updated the unit tests to tests this now.
2016-02-25 15:39:02 +01:00
914ac09aae
Merge pull request #22636 from owncloud/fix-ssl-on-external-storages
...
Fix HTTPS support on external storages
2016-02-25 14:36:00 +01:00
efc966698f
Merge pull request #22579 from owncloud/fix_broken_unencrypted_size
...
Heal unencrypted file sizes at download time (second approach)
2016-02-25 14:34:48 +01:00
6d4f80d680
Set default expiration date if none given on share creation
...
When we create a share for the first time we should set the default
expiration date. If none is given.
Fixes #22642
2016-02-25 14:21:46 +01:00
bf4a038535
Add proxy support to external storage
...
Otherwise debugging issues is a PITA
2016-02-24 19:48:47 +01:00
2ec1c738d0
Merge pull request #22573 from owncloud/issue-22568-allow-string-object-ids
...
Make sure we can store strings as per the interface
2016-02-24 12:15:23 +01:00
4124d909b6
Merge pull request #22565 from owncloud/avoid-scanning-root-storage
...
Avoids scanning the root storage
2016-02-24 12:14:39 +01:00
bfde96a623
Fix PHPDoc of OC_App::loadApps()
2016-02-23 15:57:12 +01:00
834b51b83b
recalculate unencrypted size if we assume that the size stored in the db is not correct
2016-02-23 15:09:46 +01:00
9a0950f10b
Merge pull request #22569 from owncloud/issue-22566-too-much-mapping-entries
...
Allow defining a limit and offset for getObjectIdsForTags
2016-02-23 15:02:08 +01:00
ad6238c808
Install new shipped apps after upgrading all existing apps
2016-02-23 10:31:11 +01:00
fb8b34bdd0
Allow defining a limit and offset for getObjectIdsForTags
2016-02-23 09:04:15 +01:00
8754ea6c8a
Make sure we don't quote column names twice
2016-02-23 08:50:52 +01:00
7bf658ab18
Before installing new shipped apps we need to load authentication apps - fixes #22508
2016-02-23 08:41:12 +01:00
4537eaac41
Add ILIKE support to querybuilder
2016-02-22 19:46:37 +01:00
8c77fdef3e
Avoids scanning the root storage
...
This check will skip the background scan for the root storage
because there is nothing in the root storage that isn't already
in another (mostly user-) storage.
Fixes #22501
2016-02-22 16:43:47 +01:00
24c7f38a00
Make sure we can store strings as per the interface
2016-02-22 15:43:20 +01:00
a70421ff2f
Merge pull request #22552 from owncloud/fix-avconv-preview-parameters
...
Move `-an` after the input arg because it is an output option
2016-02-22 14:14:35 +01:00
fe08b5e9d9
We should check for exceptions when trying to get the avatar
...
Fixes #22550
* Updated phpdoc of avatatmanager
* Add unit test
2016-02-22 10:14:14 +01:00
2865ccfdc4
Move `-an` after the input arg because it is an output option
2016-02-22 09:40:46 +01:00
f8677628d4
Merge pull request #22503 from owncloud/issue_22500
...
When (re-)sharing an incomming federated share set the corrent owner
2016-02-19 16:07:43 +01:00
fb38625741
Merge pull request #22518 from owncloud/checkdeletebeforecopyinsteadofrename
...
Check delete permission before attemping copy+delete
2016-02-19 16:06:55 +01:00
Thomas Müller
Lukas Reschke
C. Montero Luque
Robin Appelman
Vincent Petry
Joas Schilling
Roeland Jago Douma
Bjoern Schiessle
Morris Jobke