summaryrefslogtreecommitdiffstats
Commit message (Collapse)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 stable8
| * Backport of #17723 to stable8Arthur Schiwon2015-07-202-125/+133
|/ | | | | | fix runtime caching in ldap's user manager, fixes #17631 fix indentation. no code changes, whitespace only.
* Merge pull request #17688 from ↵Thomas Müller2015-07-205-12/+12
|\ | | | | | | | | owncloud/stable8-publiclinksystemwidemountwithapplicable [stable8] Pass owner to isSystemWideMountPoint to make it work for public links
| * Pass owner to isSystemWideMountPoint to make it work for public linksVincent Petry2015-07-165-12/+12
| | | | | | | | | | | | | | Public links did not have the correct owner so could not properly detect system wide mount points. This is a manual backport of b25c06f5769fbcd90a780cbce90998a38c112043 from 8.1
* | Merge pull request #17158 from ↵Morris Jobke2015-07-164-8/+69
|\ \ | | | | | | | | | | | | owncloud/backport-15772-no-permission-restriction-for-owner [stable8] Backport 15772 no permission restriction for owner
| * | 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
| | | | | | | | | | | | | | | Conflicts: core/js/tests/specs/shareSpec.js
| * | Do not restrict permissions for the original ownerJoas Schilling2015-06-251-1/+1
| | | | | | | | | | | | | | | Conflicts: core/js/share.js
* | | Merge pull request #16019 from owncloud/backport-15486Joas Schilling2015-07-162-4/+134
|\ \ \ | | | | | | | | [stable8] Keep fileid when restoring version, using stream copy
| * | | 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
|\ \ \ \ | | | | | | | | | | [stable8] Determine the size we need before asking for a thumbnail
| * | | | 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
| | | | | | | | | | | | | | | | | | | | We need to set the size of the preview using the devicePixelRatio and use that as arguments when using the preview endpoint or that endpoint will use the default 36x36 and thumbnails will be blurry on high DPI devices
* | | | | Merge pull request #17566 from owncloud/stable8-dav-fixcallsVincent Petry2015-07-131-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Fix DAV propfind call
| * | | | | Fix DAV propfind callVincent Petry2015-07-131-2/+2
| | | | | |
* | | | | | Merge pull request #17608 from owncloud/stable8-backport-17426Thomas Müller2015-07-131-1/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | [stable8] [config sample] Update info about appstore
| * | | | | | [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
|\ \ \ \ \ \ | |/ / / / / |/| | | | | [stable8] LDAP: make sure port input box is not getting too small on low width
| * | | | | 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
|\ \ \ \ \ | | | | | | | | | | | | [stable8] Fix version rename with files and folders
| * | | | | Fix version rename with files and foldersVincent Petry2015-06-162-31/+169
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - fix moving folder into another folder - fix moving file or folder into shared folder as recipient
* | | | | | Merge pull request #17326 from owncloud/stable8-catch-notpermittedMorris Jobke2015-07-091-0/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | [stable8] Properly handle NotPermittedException in SabreDAV
| * | | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | [stable8] backport config sample
| * | | | | | [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
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | [stable8] Proper error handling
| * | | | | | [updater] mark failure in redMorris Jobke2015-07-061-1/+2
| | | | | | |
| * | | | | | [updater] propagate error case properlyMorris Jobke2015-07-062-7/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add $success to the updateEnd hook * add new return code for a update failure * add exception class to failure hook message
| * | | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | [stable8] emit hooks from a view as long as the path is inside the default root
| * | | | | | 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Stable8 share etag update target
| * | | | | | | 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
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | [stable8] owner is stored as 'uid_owner', not as 'owner' in the oc_share table
| * | | | | | | | call post_addToGroup als for class OC_User because sharing and LDAP are ↵Bjoern Schiessle2015-07-031-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | using this class. Minimal approach to fix #16740
| * | | | | | | | 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
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | [stable8] remove duplicate ID in HTML template for public shares
| * | | | | | | | 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [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