summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 8.0.6 beta1v8.0.6beta1C Montero-Luque2015-07-222-3/+3
* Merge pull request #17764 from owncloud/backport-17723-stable8Morris Jobke2015-07-212-125/+133
|\
| * Backport of #17723 to stable8Arthur Schiwon2015-07-202-125/+133
|/
* Merge pull request #17688 from owncloud/stable8-publiclinksystemwidemountwith...Thomas Müller2015-07-205-12/+12
|\
| * Pass owner to isSystemWideMountPoint to make it work for public linksVincent Petry2015-07-165-12/+12
* | Merge pull request #17158 from owncloud/backport-15772-no-permission-restrict...Morris Jobke2015-07-164-8/+69
|\ \
| * | Ignore "parent" shares when the sharee is the owner of the reshare-sourceJoas Schilling2015-06-251-0/+2
| * | Correctly select file cache values also when checking group sharesJoas Schilling2015-06-251-7/+7
| * | Add a test to share a subfolder of a folder shared with the owner by groupJoas Schilling2015-06-251-0/+33
| * | Added unit test for reshare by share ownerVincent Petry2015-06-251-0/+26
| * | Do not restrict permissions for the original ownerJoas Schilling2015-06-251-1/+1
* | | Merge pull request #16019 from owncloud/backport-15486Joas Schilling2015-07-162-4/+134
|\ \ \
| * | | Fix version rollback to keep fileidVincent Petry2015-06-172-4/+134
* | | | Merge pull request #17340 from owncloud/stable8-backport-16911Robin McCorkell2015-07-151-2/+4
|\ \ \ \
| * | | | floats are not welcome when setting the size of a previewOlivier Paroz2015-07-021-4/+4
| * | | | Determine the size we need before asking for a thumbnailOlivier Paroz2015-07-021-0/+2
* | | | | Merge pull request #17566 from owncloud/stable8-dav-fixcallsVincent Petry2015-07-131-2/+2
|\ \ \ \ \
| * | | | | Fix DAV propfind callVincent Petry2015-07-131-2/+2
* | | | | | Merge pull request #17608 from owncloud/stable8-backport-17426Thomas Müller2015-07-131-1/+0
|\ \ \ \ \ \
| * | | | | | [config sample] Update info about appstoreMorris Jobke2015-07-131-1/+0
| |/ / / / /
* | | | | | Merge pull request #17415 from owncloud/fix-ldap-port-field-sizeRobin McCorkell2015-07-131-3/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | LDAP: make sure port input box is not getting too small on low widthArthur Schiwon2015-07-061-3/+5
| | |_|_|/ | |/| | |
* | | | | Merge pull request #16369 from owncloud/stable8-share-moveversionsproperlyMorris Jobke2015-07-092-31/+169
|\ \ \ \ \
| * | | | | Fix version rename with files and foldersVincent Petry2015-06-162-31/+169
* | | | | | Merge pull request #17326 from owncloud/stable8-catch-notpermittedMorris Jobke2015-07-091-0/+11
|\ \ \ \ \ \
| * | | | | | Remove unneeded part fileMorris Jobke2015-07-061-0/+7
| * | | | | | Properly handle NotPermittedException in SabreDAVMorris Jobke2015-07-021-0/+4
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #17519 from owncloud/stable8-backport-config-sampleMorris Jobke2015-07-091-87/+89
|\ \ \ \ \ \
| * | | | | | [config sample] improve RST markup and wordingMorris Jobke2015-07-091-8/+7
| * | | | | | refine sample config textMorris Jobke2015-07-091-1/+1
| * | | | | | [config sample] merge Miscellaneous & All other optionsMorris Jobke2015-07-091-79/+82
* | | | | | | Merge pull request #17405 from owncloud/stable8-backport-17095Morris Jobke2015-07-093-9/+21
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | [updater] mark failure in redMorris Jobke2015-07-061-1/+2
| * | | | | | [updater] propagate error case properlyMorris Jobke2015-07-062-7/+18
| * | | | | | Added error message on initMountpoints exceptionMorris Jobke2015-07-061-1/+1
| | |_|/ / / | |/| | | |
* | | | | | 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
| | |_|/ / / / | |/| | | | |