summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2019-03-26334-35250/+502
|
* Merge pull request #14840 from nextcloud/backport/14838/stable15Roeland Jago Douma2019-03-261-1/+1
|\ | | | | [stable15] Fix placeholder in disable message
| * Fix placeholder in disable messageJoas Schilling2019-03-251-1/+1
|/ | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* Merge pull request #14795 from nextcloud/backport/14058/stable15Morris Jobke2019-03-221-1/+2
|\ | | | | [stable15] Avoid replacement by user object
| * Store user object later in the codeVlastimil Pecinka2019-03-211-1/+2
|/ | | | Signed-off-by: Vlastimil Pecinka <pecinka@email.cz>
* Merge pull request #14781 from nextcloud/backport/14778/stable15Morris Jobke2019-03-214-4/+15
|\ | | | | [stable15] Fix user creation using LDAP Plugin
| * LDAP plugin: force createUser to return new user's DNVinicius Cubas Brand2019-03-211-1/+2
| | | | | | | | | | | | | | LDAP plugins must change the createUser method to return the DN, as we need this to update the cache. Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>
| * Cache cleaning when subadmin adds user to groupVinicius Cubas Brand2019-03-211-0/+2
| | | | | | | | | | | | | | | | | | | | | | This commit fix an error happening when the subadmin tries to create an user, adding him/her to the group s/he is subadmin of, using a LDAP User/Group plugin. This just forces the cache to be reset after an user is added to a group. Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>
| * fix user creation using LDAP PluginVinicius Cubas Brand2019-03-213-4/+12
|/ | | | Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>
* [tx-robot] updated from transifexNextcloud bot2019-03-211434-20488/+2574
|
* Merge pull request #14762 from nextcloud/backport/14674/stable15Morris Jobke2019-03-201-4/+3
|\ | | | | [stable15] [app:files] Use current directory for hashing.
| * [app:files] Use current directory for hashing.Evilham2019-03-201-4/+3
| | | | | | | | | | | | | | | | | | | | This fixes collisions that were causing uploads to break in a very terrible way. Kudos to @kesselb for finding the problematic place and to @hottwister for the proposed solution. Fixes #10527.
* | Merge pull request #14759 from nextcloud/backport/14691/stable15Morris Jobke2019-03-201-11/+6
|\ \ | | | | | | [stable15] always allow moving mountpoints inside the same mountpoint
| * | always allow moving mountpoints inside the same mountpointRobin Appelman2019-03-201-11/+6
| |/ | | | | | | | | | | even if that mountpoint isn't normally a valid target for moving mounts into Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #14709 from ↵Morris Jobke2019-03-201-2/+2
|\ \ | |/ |/| | | | | HuemerGroup/groupname_like_username-allow_share_with_both groupname like username - allow share with both
| * Update lib/private/Share20/Manager.php Morris Jobke2019-03-201-1/+1
| | | | | | | | | | tabulator change Co-Authored-By: aignerat <46312655+aignerat@users.noreply.github.com>
| * Update lib/private/Share20/Manager.php Morris Jobke2019-03-201-1/+1
| | | | | | | | | | fixed tabulator Co-Authored-By: aignerat <46312655+aignerat@users.noreply.github.com>
| * groupname like username - allow share with bothChristian Aigner2019-03-151-2/+2
| | | | | | | | Signed-off-by: Christian Aigner <christian.aigner@huemer-it.com>
* | Merge pull request #14749 from nextcloud/backport/14744/stable15Roeland Jago Douma2019-03-201-5/+5
|\ \ | | | | | | [stable15] Always register the Notifier
| * | Always register the NotifierJoas Schilling2019-03-191-5/+5
| | | | | | | | | | | | | | | | | | ... so background jobs without a user can prepare push notifications Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #14751 from nextcloud/backport/14747/stable15Christoph Wurst2019-03-201-1/+7
|\ \ \ | | | | | | | | [stable15] Fix getting the access list on external storage
| * | | Fix getting the access list on external storageRoeland Jago Douma2019-03-191-1/+7
| |/ / | | | | | | | | | | | | | | | | | | If a file is on external storage there is no owner. WHich means we can't check. So just return an empty array then. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* / / [tx-robot] updated from transifexNextcloud bot2019-03-2036-64/+78
|/ /
* | [tx-robot] updated from transifexNextcloud bot2019-03-19172-382/+478
| |
* | Merge pull request #14716 from Faldon/update_document_versionMorris Jobke2019-03-181-3/+3
|\ \ | | | | | | Updated documentation go.php to 15 and adjusted copyright year.
| * | Updated documentation go.php to 15 and adjusted copyright year.Thomas Pulzer2019-03-151-3/+3
| | | | | | | | | | | | Signed-off-by: Thomas Pulzer <t.pulzer@thesecretgamer.de>
* | | Merge pull request #14696 from nextcloud/backport/13401/stable15Roeland Jago Douma2019-03-182-5/+47
|\ \ \ | | | | | | | | [stable15] improve lookup server behaviour
| * | | Fix missing $config dependency in RetryJobMorris Jobke2019-03-181-0/+3
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | Fix Undefined property: OCA\LookupServerConnector\UpdateLookupServer::$configDaniel Kesselberg2019-03-181-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * | | increase timespan between each retryBjoern Schiessle2019-03-171-3/+5
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | improve lookup server behaviourBjoern Schiessle2019-03-172-2/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't try to connect to the lookup server if the lookup server was disabled by the admin or an empty lookup server URL was given Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | [tx-robot] updated from transifexNextcloud bot2019-03-1824-82/+184
|/ / /
* | | [tx-robot] updated from transifexNextcloud bot2019-03-1728-80/+280
| | |
* | | [tx-robot] updated from transifexNextcloud bot2019-03-1646-144/+230
|/ /
* | Merge pull request #14699 from nextcloud/backport/14693/stable15Morris Jobke2019-03-151-0/+4
|\ \ | | | | | | [stable15] dont try to restore a trashbin item to a readonly target
| * | dont try to restore a trashbin item to a readonly targetRobin Appelman2019-03-141-0/+4
| | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #14700 from nextcloud/backport/14690/stable15Morris Jobke2019-03-151-1/+3
|\ \ \ | | | | | | | | [stable15] throw a proper error if rename fails in dav
| * | | throw a proper error if rename fails in davRobin Appelman2019-03-141-1/+3
| |/ / | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #14697 from nextcloud/backport/14687/stable15Morris Jobke2019-03-151-0/+10
|\ \ \ | |_|/ |/| | [stable15] add an integration test that ensures deletion of LDAP users
| * | add an integration test that ensures deletion of LDAP usersArthur Schiwon2019-03-141-0/+10
| |/ | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | [tx-robot] updated from transifexNextcloud bot2019-03-15126-366/+368
| |
* | Merge pull request #14694 from nextcloud/backport/14684/stable15Roeland Jago Douma2019-03-151-1/+5
|\ \ | | | | | | [stable15] handle long etags from dav external storage
| * | handle long etags from dav external storageRobin Appelman2019-03-141-1/+5
| |/ | | | | | | | | | | we can only store etags up to 40 characters long in the database, so when we get an etag that's longer we simply hash it to bring down the length Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #14672 from nextcloud/backport/14640/disable-failing-testsMorris Jobke2019-03-159-321/+332
|\ \ | |/ |/| [stable15] Disable fragile tests
| * Add time between SMB test runs and properly log full changesetMorris Jobke2019-03-141-1/+3
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * Disable failing files app test - act 4Morris Jobke2019-03-141-6/+6
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * Disable failing files app test - act 3Morris Jobke2019-03-141-20/+20
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * Disable failing app management testMorris Jobke2019-03-141-16/+16
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * Disable failing comments app test - act 2Morris Jobke2019-03-141-6/+6
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * Disable failing files app test - act 2Morris Jobke2019-03-141-10/+10
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>