summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 8.0.5v8.0.5C Montero-Luque2015-07-031-2/+2
|
* Merge pull request #17318 from owncloud/stable8-clean-ocsidMorris Jobke2015-07-027-6/+8
|\ | | | | [stable8] Delete OCS ID from DB if none is specified
| * Bump versionsLukas Reschke2015-07-026-6/+6
| |
| * Delete OCS ID from DB if none is specifiedLukas Reschke2015-07-021-0/+2
| | | | | | | | | | | | If no OCS ID is specified in appinfo.xml and an app update is triggered and a OCS ID is stored in the DB we should clean the value. Ref https://github.com/owncloud/activity/issues/320#issuecomment-117937748
* | Merge pull request #17312 from owncloud/stable8-remove-ocs-idsMorris Jobke2015-07-026-7/+0
|\ \ | |/ |/| [stable8] Remove OCS IDs
| * [stable8] Remove OCS IDsLukas Reschke2015-07-026-7/+0
|/ | | | | | While making the AppStore ready for 8.1 I also deleted some dummy entries which means that these IDs do not resolve anymore. We should remove them to prevent errors such as https://github.com/owncloud/core/issues/17307 Ref https://github.com/owncloud/activity/issues/320#issuecomment-117691867
* Merge pull request #17297 from owncloud/stable8-use-mb-functionsLukas Reschke2015-07-012-4/+11
|\ | | | | [stable8] Use UTF-8 mode for preg_split and preg_replace
| * Use UTF-8 mode for preg_split and preg_replaceLukas Reschke2015-07-012-4/+11
|/ | | | | | Otherwise a single application with a description containing a non compliant character can break the whole ownCloud appstore. This is for example https://apps.owncloud.com/content/show.php?content=149553 Fixes https://github.com/owncloud/core/issues/17101#issuecomment-117365224
* 8.0.5RC1v8.0.5RC1C Montero-Luque2015-06-301-2/+2
|
* Merge pull request #17233 from owncloud/oc-version-to-app-store-stable8Morris Jobke2015-06-294-14/+22
|\ | | | | Add oc version to app store requests in stable8
| * Add oc version to app store requests in stable8Joas Schilling2015-06-294-14/+22
|/
* Merge pull request #17171 from owncloud/view-null-root-stable8Lukas Reschke2015-06-272-1/+28
|\ | | | | [stable8] dont allow using null as view root
| * add unit tests for null handling in viewRobin Appelman2015-06-251-0/+17
| |
| * dont allow using null as view rootRobin Appelman2015-06-251-1/+11
| |
* | Merge pull request #17177 from owncloud/stable8-backport-17026Lukas Reschke2015-06-261-1/+1
|\ \ | |/ |/| [stable8] [config.sample.php] set correct default value for skeletondirectory
| * [config.sample.php] set correct default value for skeletondirectoryMorris Jobke2015-06-251-1/+1
|/
* Merge pull request #17157 from rullzer/stable8-backport-17136Thomas Müller2015-06-252-2/+24
|\ | | | | [stable8] Allow removing of link password in OCS again
| * Added unit test to verify link password removealRoeland Jago Douma2015-06-251-1/+23
| |
| * set NULL correctly in password updateRoeland Jago Douma2015-06-251-1/+1
| | | | | | | | | | Old code used 'NULL' but docterine wants null. Now it is possible again to remove the password from a link share.
* | Merge pull request #17155 from owncloud/fix-15590-stable8Thomas Müller2015-06-252-2/+26
|\ \ | |/ |/| Backport of #15592 to stable8
| * Backport of #15592 to stable8Thomas Müller2015-06-252-2/+26
|/ | | | | | Avoid php message "Invalid argument supplied for foreach()" - refs #15590 Remove unneeded comments
* Merge pull request #17115 from owncloud/stable8-share-error-handlingMorris Jobke2015-06-241-1/+7
|\ | | | | [stable8] [sharing] handle shares of users that aren't available anymore
| * [sharing] handle shares of users that aren't available anymoreMorris Jobke2015-06-231-1/+7
| | | | | | | | | | * properly handle the case where an abandoned share is left and simply skip it
* | Changed version to 8.0.5v8.0.5betaC Montero-Luque2015-06-231-1/+1
| |
* | 8.0.5 betaC Montero-Luque2015-06-231-2/+2
|/
* Merge pull request #17033 from owncloud/backport-16890-stable8Morris Jobke2015-06-232-6/+10
|\ | | | | Backport of #16890 to stable8
| * Backport of #16890 to stable8Arthur Schiwon2015-06-182-6/+10
| | | | | | | | | | | | the user is gone, userExists will not bring him back. But the user's folder needs to be deleted anyway delete user test to take getHome into account to ensure it is also deleted subsequently
* | Merge pull request #16731 from ↵Thomas Müller2015-06-232-9/+127
|\ \ | | | | | | | | | | | | owncloud/stable8-trash-deleteasrecipientkeepversions [stable8] Keep versions when deleting as recipient
| * | Register sharing hooks in trashbin testsVincent Petry2015-06-081-0/+2
| | | | | | | | | | | | | | | Register sharing hooks to make sure that the share mount points are mounted properly, as required by the share-related trashbin tests.
| * | Keep versions when deleting as recipientVincent Petry2015-06-032-9/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | The original owner could not be resolved because the original file was already deleted, so no versions were retained. This fix passes the owner and path to retainVersions() since it was already resolved before the file deletion. This reactivates the versions logic and creates a copy of the versions in each trashbin.
* | | Merge pull request #16579 from owncloud/stable8-cors-no-cookie-authThomas Müller2015-06-224-13/+118
|\ \ \ | | | | | | | | Disallow cookie auth for cors requests stable8
| * | | disallow cookie auth for cors requestsBernhard Posselt2015-05-274-13/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | testing ... fixes fix test add php doc fix small mistake add another phpdoc remove not working cors annotations from files app
* | | | Merge pull request #17001 from owncloud/fix_15664Thomas Müller2015-06-221-2/+6
|\ \ \ \ | | | | | | | | | | only try to determine unencrypted size if a encrypted file is read
| * | | | only try to determine unencrypted size if a encrypted file is readBjoern Schiessle2015-06-171-2/+6
| | | | |
* | | | | Merge pull request #16734 from owncloud/stable8-dav-getremoteetagThomas Müller2015-06-222-3/+35
|\ \ \ \ \ | | | | | | | | | | | | [stable8] Get etag from remote OC server
| * | | | | Disable update check test when testing wrappersVincent Petry2015-06-031-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The checkUpdate test is intended for testing real storages, not wrappers.
| * | | | | Added storage backend test for checkUpdateVincent Petry2015-06-031-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This helps testing whether checkUpdate properly returns false when no change exists
| * | | | | Get etag from remote OC serverVincent Petry2015-06-031-3/+17
| | |_|/ / | |/| | |
* | | | | Merge pull request #17074 from owncloud/appframework-type-cast-stable8Morris Jobke2015-06-222-1/+15
|\ \ \ \ \ | | | | | | | | | | | | [stable8] Allow multiple whitespace in type hints in AppFramework
| * | | | | AppFramework annotation whitespace unit testRobin McCorkell2015-06-221-0/+14
| | | | | |
| * | | | | Allow multiple whitespace in type hints in AppFrameworkRobin McCorkell2015-06-221-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Type hints such as `@param bool $doSomething` will now correctly get parsed, allowing for alignment of docblock parameters if the app developer so wishes.
* | | | | Merge pull request #16747 from owncloud/stable8-backport-16403Thomas Müller2015-06-191-0/+4
|\ \ \ \ \ | | | | | | | | | | | | [stable8] Only load commands of enabled apps
| * | | | | Only load commands of enabled appsMorris Jobke2015-06-041-0/+4
| | |/ / / | |/| | |
* | | | | Merge pull request #17022 from owncloud/stable8-verify-pathThomas Müller2015-06-191-0/+4
|\ \ \ \ \ | | | | | | | | | | | | [stable8] Verify if path exists
| * | | | | Verify if path existsLukas Reschke2015-06-181-0/+4
| | |_|_|/ | |/| | | | | | | | | | | | | We need to check if the path exists and throw an error instead of handling this situation ungraciously.
* | | | | Merge pull request #16996 from owncloud/stable8-backport-16985-and-16995Lukas Reschke2015-06-192-5/+5
|\ \ \ \ \ | |/ / / / |/| | | | [stable8] backport PHPDoc fixes
| * | | | Fix return value for OCP PHPDocMorris Jobke2015-06-172-2/+2
| | | | |
| * | | | Fix OCP PHPDocMorris Jobke2015-06-171-3/+3
| | | | | | | | | | | | | | | | | | | | * was always a string instead of \OCP\IUser
* | | | | Merge pull request #16627 from owncloud/stable8-multiselectsaveraceconditionblizzz2015-06-171-3/+18
|\ \ \ \ \ | | | | | | | | | | | | [stable8] Fix LDAP wizard saveMultiSelect race condition
| * | | | | save multiselect box on close, not on click. Makes it less frequent and less ↵Arthur Schiwon2015-06-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | prone to race conditions