summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | Merge pull request #17172 from owncloud/view-emit-path-stable8Morris Jobke2015-07-082-2/+33
|\ \ \ \ \ \
| * | | | | | fix check if hooks should be emited in runHooksRobin Appelman2015-06-291-1/+2
| * | | | | | emit hooks from a view as long as the path is inside the default rootRobin Appelman2015-06-292-1/+31
* | | | | | | Merge pull request #17271 from owncloud/stable8-share-etag-update-targetMorris Jobke2015-07-082-10/+38
|\ \ \ \ \ \ \
| * | | | | | | Unit test for etag update on custom share folderVincent Petry2015-07-011-8/+36
| * | | | | | | take share target into account when updating recipient etagsRobin Appelman2015-07-011-2/+2
* | | | | | | | Merge pull request #17367 from owncloud/fix_16740_8.0Morris Jobke2015-07-082-2/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | call post_addToGroup als for class OC_User because sharing and LDAP are using...Bjoern Schiessle2015-07-031-0/+2
| * | | | | | | | owner is stored as 'uid_owner', not as 'owner' in the oc_share tableBjoern Schiessle2015-07-031-2/+2
* | | | | | | | | Merge pull request #17419 from owncloud/stable8-backport-17159Morris Jobke2015-07-082-2/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | remove duplicate ID in HTML template for public sharesMorris Jobke2015-07-062-2/+2
|/ / / / / / / /
* / / / / / / / 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
|\ \ \ \ \ \ \
| * | | | | | | Bump versionsLukas Reschke2015-07-026-6/+6
| * | | | | | | Delete OCS ID from DB if none is specifiedLukas Reschke2015-07-021-0/+2
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #17312 from owncloud/stable8-remove-ocs-idsMorris Jobke2015-07-026-7/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | [stable8] Remove OCS IDsLukas Reschke2015-07-026-7/+0
|/ / / / / /
* | | | | | Merge pull request #17297 from owncloud/stable8-use-mb-functionsLukas Reschke2015-07-012-4/+11
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Use UTF-8 mode for preg_split and preg_replaceLukas Reschke2015-07-012-4/+11
|/ / / / /
* | | | | 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 stable8Joas Schilling2015-06-294-14/+22
|/ / / /
* | | | Merge pull request #17171 from owncloud/view-null-root-stable8Lukas Reschke2015-06-272-1/+28
|\ \ \ \
| * | | | 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
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | [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
|\ \ \ \ | |_|_|/ |/| | |
| * | | 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
* | | | Merge pull request #17155 from owncloud/fix-15590-stable8Thomas Müller2015-06-252-2/+26
|\ \ \ \ | |/ / / |/| | |
| * | | Backport of #15592 to stable8Thomas Müller2015-06-252-2/+26
|/ / /
* | | Merge pull request #17115 from owncloud/stable8-share-error-handlingMorris Jobke2015-06-241-1/+7
|\ \ \
| * | | [sharing] handle shares of users that aren't available anymoreMorris Jobke2015-06-231-1/+7
* | | | 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 stable8Arthur Schiwon2015-06-182-6/+10
* | | | Merge pull request #16731 from owncloud/stable8-trash-deleteasrecipientkeepve...Thomas Müller2015-06-232-9/+127
|\ \ \ \
| * | | | Register sharing hooks in trashbin testsVincent Petry2015-06-081-0/+2
| * | | | Keep versions when deleting as recipientVincent Petry2015-06-032-9/+125
* | | | | Merge pull request #16579 from owncloud/stable8-cors-no-cookie-authThomas Müller2015-06-224-13/+118
|\ \ \ \ \
| * | | | | disallow cookie auth for cors requestsBernhard Posselt2015-05-274-13/+118
* | | | | | 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 readBjoern Schiessle2015-06-171-2/+6
* | | | | | | Merge pull request #16734 from owncloud/stable8-dav-getremoteetagThomas Müller2015-06-222-3/+35
|\ \ \ \ \ \ \
| * | | | | | | Disable update check test when testing wrappersVincent Petry2015-06-031-0/+3
| * | | | | | | Added storage backend test for checkUpdateVincent Petry2015-06-031-0/+15
| * | | | | | | 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
|\ \ \ \ \ \ \