summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* ownCloud Server 9.0.5 RC1v9.0.5RC1Daniel Molkentin2016-08-181-2/+2
* Merge pull request #25832 from owncloud/stable9-dont-decrypt-shared-filesVincent Petry2016-08-182-3/+11
|\
| * Fix unit testsThomas Müller2016-08-171-3/+7
| * Take from https://github.com/nextcloud/server/pull/608/commits/351cab6bce41b5...Thomas Müller2016-08-171-0/+4
* | Merge pull request #25843 from owncloud/stable9_remove_reference_magicVincent Petry2016-08-181-4/+4
|\ \
| * | remove reference magicJörn Friedrich Dreyer2016-08-181-4/+4
* | | Merge pull request #25836 from owncloud/stable9_nobodyifnocontentVincent Petry2016-08-181-5/+11
|\ \ \ | |/ / |/| |
| * | 204 and 304 must not have a body, see https://tools.ietf.org/html/rfc7230#sec...Jörn Friedrich Dreyer2016-08-171-5/+11
* | | Merge pull request #25842 from owncloud/stable9-fix-unmerged-shares-repair-be...Vincent Petry2016-08-172-42/+74
|\ \ \
| * | | Improve regexp to detect duplicate folders when repairing unmerged sharesVincent Petry2016-08-172-42/+74
| |/ /
* / / map oracle driver options to params (#25801)Jörn Friedrich Dreyer2016-08-171-0/+4
|/ /
* | Merge pull request #25608 from owncloud/stable9-6230563489165248c20d4ca2e0be7...Vincent Petry2016-08-171-56/+20
|\ \ | |/ |/|
| * [stable9] Simplify testPermissionMovedGroupShare (#25573)Vincent Petry2016-08-161-56/+20
* | Merge pull request #25777 from owncloud/stable9-eaecf0cfa9094eb5224e568b7bdde...Vincent Petry2016-08-171-5/+8
|\ \ | |/ |/|
| * [stable9] Merge pull request #25652 from owncloud/fix-getQuota-on-nullVincent Petry2016-08-161-5/+8
|/
* Merge pull request #25808 from owncloud/stable9-smb-traceVincent Petry2016-08-161-62/+199
|\
| * add conditional smb trace logging for debug purposesJörn Friedrich Dreyer2016-08-161-62/+199
* | Merge pull request #25543 from owncloud/stable9-group-sharesVincent Petry2016-08-1611-14/+1315
|\ \
| * | Fix unmerged shares repair with mixed group and direct sharesVincent Petry2016-08-132-4/+57
| * | Improve file_target finding logic when repairing unmerged sharesVincent Petry2016-08-132-10/+96
| * | Don't bother repairing unmerged shares when coming from OC 8.2Vincent Petry2016-08-131-1/+1
| * | Ignore file_target when grouping sharesVincent Petry2016-08-131-3/+5
| * | Add integration tests for double shares with rename in betweenVincent Petry2016-08-131-0/+30
| * | Fix RepairUnmergedShares to not skip valid repair casesVincent Petry2016-08-132-13/+58
| * | Adjust RepairUnmergedShares version checkVincent Petry2016-08-132-2/+2
| * | Fix grouping of received shares in MountProviderVincent Petry2016-08-133-9/+15
| * | Group incoming shares for resharing in JSVincent Petry2016-08-132-1/+70
| * | Add repair step for unmerged sharesVincent Petry2016-08-133-0/+742
| * | Added more tests for sharing's MountProviderVincent Petry2016-08-132-1/+156
| * | Add integration tests for merging received sharesVincent Petry2016-08-131-0/+113
* | | Merge pull request #25798 from owncloud/stable9-provisioning-api-subadmin-add...Vincent Petry2016-08-162-52/+252
|\ \ \ | |_|/ |/| |
| * | Fix subadmin permission check for addToGroup/removeFromGroupVincent Petry2016-08-122-52/+252
* | | Merge pull request #25766 from owncloud/fix-server-side-share-expiration-sett...Vincent Petry2016-08-151-1/+4
|\ \ \ | |_|/ |/| |
| * | In cases where the server dictates the link share expiration the date is not ...Thomas Müller2016-08-121-1/+4
* | | Fix paths returned by \OC\Files\Storage\Shared hooks (#25519)Vincent Petry2016-08-131-2/+2
|/ /
* / [stable9] lastInsertId requires the prefix (#25786)Jörn Friedrich Dreyer2016-08-121-1/+1
|/
* Fix file permissions for SMB (read-only folders will be writeable) (#25734)Juan Pablo Villafañez2016-08-121-0/+13
* [stable9] backport of #23728 (#25491)Michael Stingl2016-08-121-1/+13
* [stable9] getJailedPath expects $path to have a trailing / (#25703) (#25738)Thomas Müller2016-08-122-2/+14
* [Stable9] fix unit test on new jenkins setup and adjust Jenkinsfile (#25772) ...Thomas Müller2016-08-114-49/+125
* Skip version and tras expiry for users that never logged in (#25742)Jörn Friedrich Dreyer2016-08-102-2/+2
* log class name, ID only is hard to debug (#25744)Jörn Friedrich Dreyer2016-08-101-2/+2
* [stable9] Added integration test (#25677)Thomas Müller2016-08-092-1/+19
* Respect theme for external folder icon (#25487)Chris Hastie2016-08-051-1/+1
* [stable9] Added white download icons (#25673)Thomas Müller2016-08-013-0/+9
* [stable9] Adding quota plugin to new dav endpoint (#25615) (#25646)Thomas Müller2016-07-313-1/+40
* Stable9 backport integration tests (#25631)Sergio Bertolín2016-07-2825-437/+1491
* Fix undefined OfflineUser::composeAndStoreDisplayName() - fixes #23248 (#25598)Thomas Müller2016-07-261-2/+8
* Prevent setting email and triggering events at login time (#25531)Vincent Petry2016-07-261-1/+4
* [stable9] Especially with coverage enabled execution times are pretty high (#...Thomas Müller2016-07-251-0/+3