summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * Take from ↵Thomas Müller2016-08-171-0/+4
| | | | | | | | https://github.com/nextcloud/server/pull/608/commits/351cab6bce41b53f9efd4ba9aed4e7435f843691 - THX @schiessle
* | Merge pull request #25843 from owncloud/stable9_remove_reference_magicVincent Petry2016-08-181-4/+4
|\ \ | | | | | | [stable9] remove reference magic
| * | remove reference magicJörn Friedrich Dreyer2016-08-181-4/+4
| | |
* | | Merge pull request #25836 from owncloud/stable9_nobodyifnocontentVincent Petry2016-08-181-5/+11
|\ \ \ | |/ / |/| | [stable9] 204 and 304 must not have a body, see https://tools.ietf.org/html/rfc7230#section-3.3
| * | 204 and 304 must not have a body, see ↵Jörn Friedrich Dreyer2016-08-171-5/+11
| | | | | | | | | | | | https://tools.ietf.org/html/rfc7230#section-3.3
* | | Merge pull request #25842 from ↵Vincent Petry2016-08-172-42/+74
|\ \ \ | | | | | | | | | | | | | | | | owncloud/stable9-fix-unmerged-shares-repair-betterregexp [stable9] Improve regexp to detect duplicate folders when repairing unmerged sares
| * | | 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 ↵Vincent Petry2016-08-171-56/+20
|\ \ | |/ |/| | | | | owncloud/stable9-6230563489165248c20d4ca2e0be74c8bbff1dd1 [stable9] Simplify testPermissionMovedGroupShare (#25573)
| * [stable9] Simplify testPermissionMovedGroupShare (#25573)Vincent Petry2016-08-161-56/+20
| | | | | | | | | | Reduces significantly the testing time but still cover the permission change
* | Merge pull request #25777 from ↵Vincent Petry2016-08-171-5/+8
|\ \ | |/ |/| | | | | owncloud/stable9-eaecf0cfa9094eb5224e568b7bdde1bd49cfad73 [stable9] Merge pull request #25652 from owncloud/fix-getQuota-on-null
| * [stable9] Merge pull request #25652 from owncloud/fix-getQuota-on-nullVincent Petry2016-08-161-5/+8
|/ | | | Ensure the user exists before calling a method on it
* Merge pull request #25808 from owncloud/stable9-smb-traceVincent Petry2016-08-161-62/+199
|\ | | | | [stable9] add conditional smb trace logging for debug purposes
| * 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
|\ \ | | | | | | [stable9] Group shares with same source and target
| * | Fix unmerged shares repair with mixed group and direct sharesVincent Petry2016-08-132-4/+57
| | | | | | | | | | | | | | | | | | | | | Whenever a group share is created after a direct share, the stime order needs to be properly considered in the repair routine, considering that the direct user share is appended to the $subShares array and breaking its order.
| * | Improve file_target finding logic when repairing unmerged sharesVincent Petry2016-08-132-10/+96
| | | | | | | | | | | | | | | | | | | | | Pick the most recent subshare that has no parenthesis from duplication which should match whichever name the user picked last. If all subshares have duplicate parenthesis names, use the least recent group share's target instead.
| * | Don't bother repairing unmerged shares when coming from OC 8.2Vincent Petry2016-08-131-1/+1
| | | | | | | | | | | | | | | This would slow down the upgrade needlessly as there is no repair to be done.
| * | 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
| | | | | | | | | | | | | | | | | | The repair step was a bit overeager to skip repairing so it missed the case where a group share exists without subshares but with an additional direct user share.
| * | Adjust RepairUnmergedShares version checkVincent Petry2016-08-132-2/+2
| | |
| * | Fix grouping of received shares in MountProviderVincent Petry2016-08-133-9/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | Added flag to enforce grouping of received shares even when the method is called for a user different than the current one. This can happen at sharing time whenever the recipient's FS is being setup from the sharer's call. This fixes duplicated received folders for new shares.
| * | 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 ↵Vincent Petry2016-08-162-52/+252
|\ \ \ | |_|/ |/| | | | | | | | owncloud/stable9-provisioning-api-subadmin-addtogroup [stable9] Fix subadmin permission check for addToGroup/removeFromGroup
| * | Fix subadmin permission check for addToGroup/removeFromGroupVincent Petry2016-08-122-52/+252
| | | | | | | | | | | | | | | Fixes issue where subadmins could never add users to a group. Added missing unit tests
* | | Merge pull request #25766 from ↵Vincent Petry2016-08-151-1/+4
|\ \ \ | |_|/ |/| | | | | | | | owncloud/fix-server-side-share-expiration-setting-stable9 [stable9] In cases where the server dictates the link share expiration the date…
| * | In cases where the server dictates the link share expiration the date is not ↵Thomas Müller2016-08-121-1/+4
| | | | | | | | | | | | updated on consequitive changes and enable/disable actions
* | | Fix paths returned by \OC\Files\Storage\Shared hooks (#25519)Vincent Petry2016-08-131-2/+2
|/ / | | | | Fixes #23620
* / [stable9] lastInsertId requires the prefix (#25786)Jörn Friedrich Dreyer2016-08-121-1/+1
|/ | | backport of https://github.com/owncloud/core/pull/25764
* Fix file permissions for SMB (read-only folders will be writeable) (#25734)Juan Pablo Villafañez2016-08-121-0/+13
| | | Read-only folders won't be deletable
* [stable9] backport of #23728 (#25491)Michael Stingl2016-08-121-1/+13
| | | Sanitize more data in config report
* [stable9] getJailedPath expects $path to have a trailing / (#25703) (#25738)Thomas Müller2016-08-122-2/+14
| | | | | * getJailedPath expects $path to have a trailing / - fixes #25464 * Adding test case for getPathById including a jailed cache where root is just empty
* [Stable9] fix unit test on new jenkins setup and adjust Jenkinsfile (#25772) ↵Thomas Müller2016-08-114-49/+125
| | | | | | | | | | | | | | | | | | | | | | | (#25775) * Next step jenkinsfile (#25622) * Adding timestamper and evaluation of test results even in case of failure * Adding build timeout * use fixed value 120 minutes as timeout for each test executing for now * Terminate the build as soon as test execution fails * Adjust external testing as well * Finalize use of executeAndReport * Fix discoverymanager tests (#25769) * Allow testing of the DiscoveryManager * Array sort order is of no relevance
* 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
| | | | | | * [stable9] Added integration test * Use phantomjs-prebuilt
* Respect theme for external folder icon (#25487)Chris Hastie2016-08-051-1/+1
| | | | | | See issue #25461. When using a theme with alternative filetype icons `OCA.External.StatusManager.Utils.getIconRoute` should respect that, rather than hard coding the default icon. Note this change does not affect windows_network_drive and sharepoint icons, which appear not to be easily themeable.
* [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
| | | | | | | * Adding quota plugin to new dav endpoint * Added integrated test failing in old endpoint * Added 0B quota test
* Stable9 backport integration tests (#25631)Sergio Bertolín2016-07-2825-437/+1491
| | | | | | | | | | | | | | | | | | * Bring all tests from master * Removed not applying tests of webdav * Removed tests about disabling/enabling users * Fixed/removed some sharing tests for 9.0 * fixed capabilities tests * Fixed security headers confusion * Indentation * Removed merging shares tests
* 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
| | | | | | | | | | | | Whenever an LDAP user also has an email address defined in LDAP, the LDAP code will try and update the email address of the locally known user. This happens at login time or every time the user's LDAP attributes are processed. There is code listening to the email setting hook which updates the system address book, which also will trigger FS setup due to avatars and other things. This fix only sets the email address when really necessary.
* [stable9] Especially with coverage enabled execution times are pretty high ↵Thomas Müller2016-07-251-0/+3
| | | | (#25517) (#25596)
* [stable9] Test jenkins pipeline (#25401) (#25502)Thomas Müller2016-07-242-1/+71
|
* [stable9] Use explode() instead of split() - fixes #25483 (#25488) (#25500)Thomas Müller2016-07-201-1/+1
|
* ownCloud Server 9.0.4v9.0.4Daniel Molkentin2016-07-181-2/+2
|
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-22 03:56:06 +0000