Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 8.0.6 beta1v8.0.6beta1 | C Montero-Luque | 2015-07-22 | 2 | -3/+3 |
| | |||||
* | Merge pull request #17764 from owncloud/backport-17723-stable8 | Morris Jobke | 2015-07-21 | 2 | -125/+133 |
|\ | | | | | Backport of #17723 to stable8 | ||||
| * | Backport of #17723 to stable8 | Arthur Schiwon | 2015-07-20 | 2 | -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üller | 2015-07-20 | 5 | -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 links | Vincent Petry | 2015-07-16 | 5 | -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 Jobke | 2015-07-16 | 4 | -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-source | Joas Schilling | 2015-06-25 | 1 | -0/+2 |
| | | | |||||
| * | | Correctly select file cache values also when checking group shares | Joas Schilling | 2015-06-25 | 1 | -7/+7 |
| | | | |||||
| * | | Add a test to share a subfolder of a folder shared with the owner by group | Joas Schilling | 2015-06-25 | 1 | -0/+33 |
| | | | |||||
| * | | Added unit test for reshare by share owner | Vincent Petry | 2015-06-25 | 1 | -0/+26 |
| | | | | | | | | | | | | | | | Conflicts: core/js/tests/specs/shareSpec.js | ||||
| * | | Do not restrict permissions for the original owner | Joas Schilling | 2015-06-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | Conflicts: core/js/share.js | ||||
* | | | Merge pull request #16019 from owncloud/backport-15486 | Joas Schilling | 2015-07-16 | 2 | -4/+134 |
|\ \ \ | | | | | | | | | [stable8] Keep fileid when restoring version, using stream copy | ||||
| * | | | Fix version rollback to keep fileid | Vincent Petry | 2015-06-17 | 2 | -4/+134 |
| | | | | |||||
* | | | | Merge pull request #17340 from owncloud/stable8-backport-16911 | Robin McCorkell | 2015-07-15 | 1 | -2/+4 |
|\ \ \ \ | | | | | | | | | | | [stable8] Determine the size we need before asking for a thumbnail | ||||
| * | | | | floats are not welcome when setting the size of a preview | Olivier Paroz | 2015-07-02 | 1 | -4/+4 |
| | | | | | |||||
| * | | | | Determine the size we need before asking for a thumbnail | Olivier Paroz | 2015-07-02 | 1 | -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-fixcalls | Vincent Petry | 2015-07-13 | 1 | -2/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix DAV propfind call | ||||
| * | | | | | Fix DAV propfind call | Vincent Petry | 2015-07-13 | 1 | -2/+2 |
| | | | | | | |||||
* | | | | | | Merge pull request #17608 from owncloud/stable8-backport-17426 | Thomas Müller | 2015-07-13 | 1 | -1/+0 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | [stable8] [config sample] Update info about appstore | ||||
| * | | | | | | [config sample] Update info about appstore | Morris Jobke | 2015-07-13 | 1 | -1/+0 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #17415 from owncloud/fix-ldap-port-field-size | Robin McCorkell | 2015-07-13 | 1 | -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 width | Arthur Schiwon | 2015-07-06 | 1 | -3/+5 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #16369 from owncloud/stable8-share-moveversionsproperly | Morris Jobke | 2015-07-09 | 2 | -31/+169 |
|\ \ \ \ \ | | | | | | | | | | | | | [stable8] Fix version rename with files and folders | ||||
| * | | | | | Fix version rename with files and folders | Vincent Petry | 2015-06-16 | 2 | -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-notpermitted | Morris Jobke | 2015-07-09 | 1 | -0/+11 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | [stable8] Properly handle NotPermittedException in SabreDAV | ||||
| * | | | | | | Remove unneeded part file | Morris Jobke | 2015-07-06 | 1 | -0/+7 |
| | | | | | | | |||||
| * | | | | | | Properly handle NotPermittedException in SabreDAV | Morris Jobke | 2015-07-02 | 1 | -0/+4 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge pull request #17519 from owncloud/stable8-backport-config-sample | Morris Jobke | 2015-07-09 | 1 | -87/+89 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | [stable8] backport config sample | ||||
| * | | | | | | [config sample] improve RST markup and wording | Morris Jobke | 2015-07-09 | 1 | -8/+7 |
| | | | | | | | |||||
| * | | | | | | refine sample config text | Morris Jobke | 2015-07-09 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | [config sample] merge Miscellaneous & All other options | Morris Jobke | 2015-07-09 | 1 | -79/+82 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #17405 from owncloud/stable8-backport-17095 | Morris Jobke | 2015-07-09 | 3 | -9/+21 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | [stable8] Proper error handling | ||||
| * | | | | | | [updater] mark failure in red | Morris Jobke | 2015-07-06 | 1 | -1/+2 |
| | | | | | | | |||||
| * | | | | | | [updater] propagate error case properly | Morris Jobke | 2015-07-06 | 2 | -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 exception | Morris Jobke | 2015-07-06 | 1 | -1/+1 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge pull request #17172 from owncloud/view-emit-path-stable8 | Morris Jobke | 2015-07-08 | 2 | -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 runHooks | Robin Appelman | 2015-06-29 | 1 | -1/+2 |
| | | | | | | | |||||
| * | | | | | | emit hooks from a view as long as the path is inside the default root | Robin Appelman | 2015-06-29 | 2 | -1/+31 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #17271 from owncloud/stable8-share-etag-update-target | Morris Jobke | 2015-07-08 | 2 | -10/+38 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Stable8 share etag update target | ||||
| * | | | | | | | Unit test for etag update on custom share folder | Vincent Petry | 2015-07-01 | 1 | -8/+36 |
| | | | | | | | | |||||
| * | | | | | | | take share target into account when updating recipient etags | Robin Appelman | 2015-07-01 | 1 | -2/+2 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #17367 from owncloud/fix_16740_8.0 | Morris Jobke | 2015-07-08 | 2 | -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 Schiessle | 2015-07-03 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | using this class. Minimal approach to fix #16740 | ||||
| * | | | | | | | | owner is stored as 'uid_owner', not as 'owner' in the oc_share table | Bjoern Schiessle | 2015-07-03 | 1 | -2/+2 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #17419 from owncloud/stable8-backport-17159 | Morris Jobke | 2015-07-08 | 2 | -2/+2 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | [stable8] remove duplicate ID in HTML template for public shares | ||||
| * | | | | | | | | remove duplicate ID in HTML template for public shares | Morris Jobke | 2015-07-06 | 2 | -2/+2 |
|/ / / / / / / / | |||||
* / / / / / / / | 8.0.5v8.0.5 | C Montero-Luque | 2015-07-03 | 1 | -2/+2 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #17318 from owncloud/stable8-clean-ocsid | Morris Jobke | 2015-07-02 | 7 | -6/+8 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | [stable8] Delete OCS ID from DB if none is specified | ||||
| * | | | | | | | Bump versions | Lukas Reschke | 2015-07-02 | 6 | -6/+6 |
| | | | | | | | | |||||
| * | | | | | | | Delete OCS ID from DB if none is specified | Lukas Reschke | 2015-07-02 | 1 | -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 |