summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | fix typosCarla Schroder2015-08-171-6/+6
|/ / /
* | | Merge pull request #18181 from owncloud/backport-18159-stable8Morris Jobke2015-08-161-0/+4
|\ \ \ | |_|/ |/| | Backport 18159 stable8
| * | Update installer.phpmichag862015-08-101-0/+1
| | |
| * | Check if archive contains a directory named like appidmichag862015-08-101-0/+3
| | |
* | | Merge pull request #18258 from owncloud/stable8-backport-17680Morris Jobke2015-08-131-1/+4
|\ \ \ | | | | | | | | [stable8] handle rmdir on files for ftp storages
| * | | handle rmdir on files for ftp storagesRobin Appelman2015-08-131-1/+4
| | | |
* | | | Merge pull request #18278 from owncloud/stable8-17852Robin McCorkell2015-08-134-12/+28
|\ \ \ \ | |/ / / |/| | | [stable8] add test for factories
| * | | add test for factoriesBernhard Posselt2015-08-134-12/+28
|/ / / | | | | | | | | | | | | | | | | | | | | | use ref for factory test Ensure we construct SimpleContainer Use single instance of DIContainer in routing tests
* | | Merge pull request #17917 from owncloud/stable8-add-ssl-hintMorris Jobke2015-08-121-0/+1
|\ \ \ | |/ / |/| | [stable8] add note about SSL in admin settings
| * | [stable8] add note about SSL in admin settingsMorris Jobke2015-07-281-0/+1
| |/ | | | | | | | | * reborn #16867 * fixes #16778
* | 8.0.6v8.0.6Frank Karlitschek2015-08-071-2/+2
| |
* | 8.0.6 RC1v8.0.6RC1C Montero-Luque2015-08-031-2/+2
|/
* Merge pull request #17897 from owncloud/backport-scan-check-path-stable8Morris Jobke2015-07-272-0/+31
|\ | | | | [stable8] Backport scan check path stable8
| * Add unit testsLukas Reschke2015-07-271-0/+28
| |
| * check if the user is trying to scan a valid pathRobin Appelman2015-07-271-0/+3
|/
* Merge pull request #16456 from owncloud/stable8-backport-13740-and-15606blizzz2015-07-235-30/+158
|\ | | | | [stable8] backport 13740 and 15606
| * add primary group users to resultset before cachingArthur Schiwon2015-07-231-1/+2
| |
| * Fixes returns of group memberships and counting if all members have the ↵Arthur Schiwon2015-07-232-9/+77
| | | | | | | | specific groups as primary set.
| * and escape the search termArthur Schiwon2015-07-233-1/+5
| |
| * :lipstick:Arthur Schiwon2015-07-231-4/+4
| |
| * fix counting of users in primary groupArthur Schiwon2015-07-232-24/+69
| |
| * inlcude AD primary group in user filter, if a group is selected. fixes #12190Arthur Schiwon2015-07-231-2/+12
|/
* 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