aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2019-03-14612-6256/+7154
|
* Merge pull request #14677 from nextcloud/backport/14670/stable15Morris Jobke2019-03-141-3/+3
|\ | | | | [stable15] Use SCSS variables since CSS vars are not loaded on public pages
| * 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>
* Merge pull request #14661 from nextcloud/backport/14656/stable15Roeland Jago Douma2019-03-131-1/+4
|\ | | | | [stable15] prevent recursion when moving a file to the trashbin
| * 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 #14658 from nextcloud/backport/14644/stable15Morris Jobke2019-03-131-0/+6
|\ | | | | [stable15] Remove sensitive SMB arguments from exception log
| * Remove sensitive SMB arguments from exception logMorris Jobke2019-03-131-0/+6
|/ | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* Merge pull request #14597 from nextcloud/backport/14425/stable15Morris Jobke2019-03-085-8/+70
|\ | | | | [stable15] Do not calculate folder size for parent that also needs proper scan, fixes #3524
| * Avoid calculating folder size for parent that needs scan.Ari Selseng2019-03-085-8/+70
| | | | | | | | Signed-off-by: Ari Selseng <ari@selseng.net>
* | Merge pull request #14591 from nextcloud/backport/14464/stable15Morris Jobke2019-03-087-80/+230
|\ \ | | | | | | [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>
| * | add missing config bits to integration testsArthur Schiwon2019-03-072-0/+7
| | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | with LDAP server set offline, config cannot be controlled via ocs anymoreArthur Schiwon2019-03-071-0/+8
| | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | fix nested group retrieval also for 2 other casesArthur Schiwon2019-03-076-85/+205
| | | | | | | | | | | | | | | | | | 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>
* | Merge pull request #14596 from nextcloud/backport/14587/stable15Morris Jobke2019-03-082-2/+0
|\ \ | | | | | | [stable15] Remove Google+ from Social Sharing Bundle
| * | Remove Google+ from Social Sharing Bundle (2)Marius Blüm2019-03-081-1/+0
| | | | | | | | | Signed-off-by: Marius Blüm <marius@lineone.io>
| * | Remove "socialsharing_googleplus" from Social Sharing BundleMarius Blüm2019-03-081-1/+0
| |/ | | | | Signed-off-by: Marius Blüm <marius@lineone.io>
* | Merge pull request #14534 from ↵Morris Jobke2019-03-086-0/+408
|\ \ | | | | | | | | | | | | nextcloud/backport/14502/add-activities-for-group-membership-changes [stable15] Add activities for group membership changes
| * | Fix unit testsJoas Schilling2019-03-073-8/+7
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Update autoloaderJoas Schilling2019-03-052-0/+4
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Add activities for group membership changesJoas Schilling2019-03-054-0/+405
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #14599 from nextcloud/backport/14585/stable15Morris Jobke2019-03-081-1/+1
|\ \ \ | | | | | | | | [stable15] Mention Open Cloud Mesh in Federated User Settings
| * | | Mention Open Cloud Mesh in Federated User SettingsMarius Blüm2019-03-081-1/+1
| | |/ | |/| | | | Signed-off-by: Marius Blüm <marius@lineone.io>
* | | Merge pull request #14601 from nextcloud/backport/14590/stable15Morris Jobke2019-03-081-1/+1
|\ \ \ | |/ / |/| | [stable15] Update index.php
| * | Update index.phppaul2019-03-081-1/+1
|/ / | | | | Linking to NC 15 documentation instead of NC 13
* | Merge pull request #14580 from nextcloud/backport/14579/stable15Roeland Jago Douma2019-03-074-16/+28
|\ \ | | | | | | [stable15] Have streams of files_external in sync
| * | Have streams of files_external in syncRoeland Jago Douma2019-03-074-16/+28
|/ / | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #14570 from nextcloud/backport/14424/stable15Roeland Jago Douma2019-03-061-1/+10
|\ \ | | | | | | [stable15] Use a tmp file for swift writes
| * | Use a tmp file for swift writesRoeland Jago Douma2019-03-061-1/+10
|/ / | | | | | | | | | | Else this leads to a seekable stream error with chunked uploads Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #14416 from nextcloud/backport/14343/stable15Morris Jobke2019-03-068-18/+370
|\ \ | | | | | | [stable15] Parse multiple navigation items
| * | two item => two itemsDaniel Kesselberg2019-02-273-1/+1
| | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * | Generate id for navigation itemDaniel Kesselberg2019-02-271-2/+2
| | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * | Parse multiple navigation itemsDaniel Kesselberg2019-02-278-17/+369
| | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | Merge pull request #14559 from nextcloud/backport/14553/stable15Morris Jobke2019-03-067-2/+223
|\ \ \ | | | | | | | | [stable15] Clear backupcode reminder when no 2fa
| * | | 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>
* | | Merge pull request #14546 from nextcloud/backport/14373/stable15Roeland Jago Douma2019-03-052-0/+24
|\ \ \ | | | | | | | | [stable15] Add test for updated CA bundle
| * | | DRONE_BRANCH is the target branch. DRONE_COMMIT_REFSPEC should work.Daniel Kesselberg2019-03-051-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * | | Add test for updated CA bundleMorris Jobke2019-03-052-0/+24
|/ / / | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #14542 from nextcloud/backport/14451/stable15Morris Jobke2019-03-052-0/+7
|\ \ \ | | | | | | | | [stable15] Check if password can be changed for the users backend in OCS api
| * | | 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 #14531 from nextcloud/backport/14528/stable15Morris Jobke2019-03-051-25/+26
|\ \ \ | |_|/ |/| | [stable15] Fix database configuration
| * | Fix whitespacesJoas Schilling2019-03-051-22/+23
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Fix database configurationJoas Schilling2019-03-051-3/+3
|/ / | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | 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...
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-14 23:07:01 +0000