summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* Clear backupcodes reminder if no 2FA is enabledRoeland Jago Douma2019-03-065-0/+184
| | | | | | | | | | Fixes #14125 Listen to 2FA disable event. If a provider is disabled for a user. We check if there are no more providers. If there are no more providers we Remove the backupcode reminder notification (if still present). Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Check if password can be changed for the users backend in OCS apiJulius Härtl2019-03-052-0/+7
| | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* Merge pull request #14517 from nextcloud/backport/13871/stable15Morris Jobke2019-03-051-1/+3
|\ | | | | [stable15] dav: Fix handling of chunked WebDAV upload
| * dav: Fix handling of chunked WebDAV uploadJan-Philipp Litza2019-03-041-1/+3
| | | | | | | | | | | | When $data is null (which can happen when $request->getBodyAsStream() returns null), the Exceptions says "copied bytes: 0, expected filesize: 0", which sounds more like success...
* | Merge pull request #14516 from nextcloud/backport/14499/stable15Morris Jobke2019-03-051-1/+9
|\ \ | | | | | | [stable15] Do not cut full color on accessibility svg color invert
| * | Do not cut full color on accessibility svg color invertJohn Molakvoæ (skjnldsv)2019-03-041-1/+9
| |/ | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | Do not just write foobarRoeland Jago Douma2019-03-041-3/+6
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #14512 from nextcloud/smb-3.0.2-15Morris Jobke2019-03-044-14/+18
|\ \ | |/ |/| update icewind/smb to 3.0.2
| * update icewind/smb to 3.0.2Robin Appelman2019-03-044-14/+18
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #14472 from felixn/stable15Roeland Jago Douma2019-03-041-0/+1
|\ \ | | | | | | Fix for issue #13319: load oc-backbone-webdav before loading versions app
| * | Fix for issue #13319: load oc-backbone-webdav before loading versions appFelix Nieuwenhuizen2019-03-021-0/+1
| | | | | | | | | | | | Signed-off-by: Felix Nieuwenhuizen <felix@tdlrali.com>
* | | Fix a bug with smb notify having leading slash when it should notAri Selseng2019-03-011-1/+1
| | | | | | | | | | | | Signed-off-by: Ari Selseng <ari@selseng.net>
* | | [tx-robot] updated from transifexNextcloud bot2019-03-0136-174/+246
| | |
* | | Merge pull request #14414 from nextcloud/backport/13844/stable15Roeland Jago Douma2019-02-281-5/+4
|\ \ \ | | | | | | | | [stable15] Bugfix for issue 10862: Trash-bin ignores trashbin_retention_obligation
| * | | Fix for issue 10862: calculation of free space ignores external storage ↵Felix Nieuwenhuizen2019-02-271-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | (doesn't count towards quota) Signed-off-by: Felix Nieuwenhuizen <felix@tdlrali.com>
* | | | Merge pull request #14376 from nextcloud/backport/13514/stable15Morris Jobke2019-02-282-7/+11
|\ \ \ \ | | | | | | | | | | [stable15] Fix grid toggle button on public page
| * | | | Fix grid toggle button on public pageJohn Molakvoæ (skjnldsv)2019-02-252-7/+11
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | [tx-robot] updated from transifexNextcloud bot2019-02-2810-104/+124
| |/ / / |/| | |
* | | | [tx-robot] updated from transifexNextcloud bot2019-02-27140-1490/+1492
| | | |
* | | | [tx-robot] updated from transifexNextcloud bot2019-02-2616-0/+16
|/ / /
* | | [tx-robot] updated from transifexNextcloud bot2019-02-2530-30/+26
| | |
* | | [tx-robot] updated from transifexNextcloud bot2019-02-246-10/+26
| | |
* | | [tx-robot] updated from transifexNextcloud bot2019-02-2310-30/+86
| | |
* | | Merge pull request #14340 from nextcloud/backport/14332/stable15Roeland Jago Douma2019-02-221-1/+1
|\ \ \ | | | | | | | | [stable15] Fix unsafe array access
| * | | Check if array element is present before accessDaniel Kesselberg2019-02-221-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | Merge pull request #14331 from nextcloud/backport/14329/stable15John Molakvoæ2019-02-221-0/+2
|\ \ \ \ | |/ / / |/| | | [stable15] Apply theme to 2FA button
| * | | Apply theme to button elements as wellJulius Härtl2019-02-211-0/+2
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | [tx-robot] updated from transifexNextcloud bot2019-02-2214-46/+62
|/ / /