summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | 8.0.7v8.0.7C Montero-Luque2015-09-021-2/+2
|/ /
* | Merge pull request #18613 from owncloud/stable8-newer-certsMorris Jobke2015-08-283-38/+53
|\ \ | | | | | | [stable8] Use certificates that expire in 10 years
| * | Use certificates that expire in 10 yearsLukas Reschke2015-08-273-38/+53
| | | | | | | | | | | | :speak_no_evil: :speak_no_evil: :speak_no_evil:
* | | 8.0.7v8.0.7RC1C Montero-Luque2015-08-271-1/+1
| | |
* | | 8.0.7 RC1C Montero-Luque2015-08-271-2/+2
| | |
* | | Merge pull request #18560 from owncloud/ext-objectstore-stable8Morris Jobke2015-08-251-0/+12
|\ \ \ | | | | | | | | [stable8] Prevent objectstore being set from client side
| * | | Prevent objectstore being set from client sideRobin McCorkell2015-08-251-0/+12
| | | |
* | | | Merge pull request #18546 from owncloud/stable8-backport-18439Morris Jobke2015-08-251-1/+1
|\ \ \ \ | |/ / / |/| | | [stable8] [app management] fix dependency check on install
| * | | [app management] fix dependency check on installMorris Jobke2015-08-251-1/+1
|/ / /
* | | Merge pull request #18488 from owncloud/stable8-add-cors-headerMorris Jobke2015-08-241-0/+2
|\ \ \ | |/ / |/| | [stable8] Add CORS header to status.php to allow client-based check i…
| * | [stable8] Add CORS header to status.php to allow client-based check in the ↵Lukas Reschke2015-08-221-0/+2
|/ / | | | | | | future
* | Merge pull request #18286 from owncloud/stable8-backport-17785Morris Jobke2015-08-191-1/+2
|\ \ | | | | | | [stable8] fix mobile scrolling, lower sidebar sensitivity, fix #11193
| * | fix mobile scrolling, lower sidebar sensitivity, fix #11193Jan-Christoph Borchardt2015-08-131-1/+2
| | |
* | | Merge pull request #17958 from owncloud/stable8-backport-17489Morris Jobke2015-08-192-0/+37
|\ \ \ | | | | | | | | [stable8] Fix parsing of sharetime as string
| * | | tests for _parseTime with hex and empty stringsMorris Jobke2015-07-292-0/+6
| | | |
| * | | Fix parsing of sharetime as stringMorris Jobke2015-07-292-0/+31
| | |/ | |/| | | | | | | | | | | | | | | | In some cases the ajax/share.php will return the share time as string. If this is the case it would get parsed completely wrong and cause the share dropdown to not work anymore. This change will properly cast the string to an interger and also fallback if this is not possible.
* | | Merge pull request #18366 from owncloud/config-sample-typos-8Robin McCorkell2015-08-171-6/+6
|\ \ \ | | | | | | | | fix typos
| * | | 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