summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2019-03-3050-152/+70
|
* Merge pull request #14891 from nextcloud/stable15-14886Roeland Jago Douma2019-03-291-1/+6
|\ | | | | [stable15] Fix opening folders from different file lists
| * Fix opening folders from different file listsJulius Härtl2019-03-281-1/+6
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | [tx-robot] updated from transifexNextcloud bot2019-03-2928-4/+56
|/
* [tx-robot] updated from transifexNextcloud bot2019-03-2852-62/+74
|
* [tx-robot] updated from transifexNextcloud bot2019-03-2728-16/+94
|
* Merge pull request #14855 from nextcloud/backport/14583/remove-g+-federationMorris Jobke2019-03-263-8/+0
|\ | | | | [stable15] Remove Google+ federation usersettings
| * Remove G+ CSS rule (Feedback from Joas)Marius Blüm2019-03-261-3/+0
| | | | | | | | Signed-off-by: Marius Blüm <marius@lineone.io>
| * Remove G+ code from Federated Files Sharing-usersettingsMarius Blüm2019-03-261-4/+0
| | | | | | Signed-off-by: Marius Blüm <marius@lineone.io>
| * Remove G+ icon from Federated Files Sharing-usersettingsMarius Blüm2019-03-261-1/+0
| | | | | | | | Signed-off-by: Marius Blüm <marius@lineone.io>
* | [tx-robot] updated from transifexNextcloud bot2019-03-26108-200/+386
|/
* 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-211064-4092/+1266
|
* [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 #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>
* | [tx-robot] updated from transifexNextcloud bot2019-03-2032-32/+32
|/
* [tx-robot] updated from transifexNextcloud bot2019-03-19156-236/+246
|
* 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-188-0/+38
|/
* [tx-robot] updated from transifexNextcloud bot2019-03-174-2/+40
|
* [tx-robot] updated from transifexNextcloud bot2019-03-1620-14/+32
|
* 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>
* | [tx-robot] updated from transifexNextcloud bot2019-03-152-0/+2
| |
* | Merge pull request #14672 from nextcloud/backport/14640/disable-failing-testsMorris Jobke2019-03-152-4/+15
|\ \ | |/ |/| [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>
| * Wait up to 10 seconds for incoming changes from SMB notifierMorris Jobke2019-03-131-1/+8
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * Do not run fragile TrashbinTestMorris Jobke2019-03-131-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fails with: There was 1 failure: 1) TrashbinTest::testExpireOldFiles Failed asserting that null is identical to 'file2.txt'. /drone/src/github.com/nextcloud/server/apps/files_trashbin/tests/TrashbinTest.php:186 OR 1) TrashbinTest::testExpireOldFiles Failed asserting that null is identical to 'file2.txt'. /drone/src/github.com/nextcloud/server/apps/files_trashbin/tests/TrashbinTest.php:193 Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | [tx-robot] updated from transifexNextcloud bot2019-03-14354-1680/+2188
| |
* | Use SCSS variables since CSS vars are not loaded on public pagesJulius Härtl2019-03-141-3/+3
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | prevent recursion when moving a file to the trashbinRobin Appelman2019-03-131-1/+4
|/ | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* Merge pull request #14591 from nextcloud/backport/14464/stable15Morris Jobke2019-03-083-79/+121
|\ | | | | [stable15] resolve user and groups in nested groups first before filtering the results
| * remove unused use statementArthur Schiwon2019-03-071-1/+0
| | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * fix nested group retrieval also for 2 other casesArthur Schiwon2019-03-073-84/+111
| | | | | | | | | | | | and also consolidate logic in one method Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * Fixed unit test: groupsMatchFilter will not be called multiple times anymore.Roland Tapken2019-03-071-1/+1
| | | | | | | | Signed-off-by: Roland Tapken <roland@bitarbeiter.net>
| * Reduce queries to LDAP by caching nested groupsRoland Tapken2019-03-071-6/+18
| | | | | | | | | | | | | | Nested groups are now cached in a CappedMemoryCache object to reduce queries to the LDAP backend. Signed-off-by: Roland Tapken <roland@bitarbeiter.net>
| * user_ldap: really resolve nested groupsRoland Tapken2019-03-071-14/+19
| | | | | | | | | | | | | | | | | | | | | | The previous patch fixed the problem only for one level of indirection because groupsMatchFilter() had been applied on each recursive call (and thus there would be no second level if the first level fails the check). This new implementation replaces the recursive call with a stack that iterates all nested groups before filtering with groupsMatchFilter(). Signed-off-by: Roland Tapken <roland@bitarbeiter.net>
| * user_ldap: Filter groups after nexted groupsRoland Tapken2019-03-071-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently groupsMatchFilter is called before nested groups are resolved. This basicly breaks this feature since it is not possible to inherit membership in a group from another group. Minimal example: Group filter: (&(objectClass=group),(cn=nextcloud)) Nested groups: enabled cn=nextcloud,ou=Nextcloud,ou=groups,dn=company,dn=local objectClass: group cn=IT,ou=groups,dn=company,dn=local objectClass: group memberOf: cn=nextcloud,ou=Nextcloud,ou=groups,dn=company,dn=local cn=John Doe,ou=users,dn=company,dn=local objectClass: person memberOf: cn=IT,ou=groups,dn=company,dn=local Since 'cn=IT,ou=groups,dn=company,dn=local' doesn't match the group filter, John wouldn't be a member of group 'nextcloud'. This patch fixes this by filtering the groups after all nested groups have been collected. If nested groups is disabled the result will be the same as without this patch. Signed-off-by: Roland Tapken <roland@bitarbeiter.net>
* | Mention Open Cloud Mesh in Federated User SettingsMarius Blüm2019-03-081-1/+1
|/ | | Signed-off-by: Marius Blüm <marius@lineone.io>
* Have streams of files_external in syncRoeland Jago Douma2019-03-074-16/+28
| | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Do not send notification if no active 2faRoeland Jago Douma2019-03-062-2/+39
| | | | | | | If the job is still present we should also not fire it off if there is not a single active 2FA provider. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>