aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #14603 from ↵Morris Jobke2019-03-084-14/+182
|\ | | | | | | | | nextcloud/fix/noid/add-setup-check-for-s3-temp-path Show a setup warning in case S3 object storage is used as primary storage
| * Show a setup warning in case S3 object storage is used as primary storageMorris Jobke2019-03-084-14/+182
| | | | | | | | | | | | * checks for at least 50 GB of free space Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #14352 from nextcloud/dependabot/npm_and_yarn/bootstrap-4.3.1Roeland Jago Douma2019-03-089-52/+196
|\ \ | | | | | | [Security] Bump bootstrap from 3.4.1 to 4.3.1
| * | Bump bundlesJulius Härtl2019-03-072-44/+102
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Add wrapper for removed tooltip functionsJulius Härtl2019-03-072-0/+38
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Fix domparser on phantomjsJulius Härtl2019-03-072-0/+47
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Use tooltip dist fileJulius Härtl2019-03-071-1/+1
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Fix tooltip styling for bootstrap 4.3Julius Härtl2019-03-071-3/+4
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Fix tooltip includeJulius Härtl2019-03-071-1/+1
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | [Security] Bump bootstrap from 3.4.1 to 4.3.1dependabot[bot]2019-03-072-4/+4
| | | | | | | | | | | | | | | | | | | | | Bumps [bootstrap](https://github.com/twbs/bootstrap) from 3.4.1 to 4.3.1. **This update includes security fixes.** - [Release notes](https://github.com/twbs/bootstrap/releases) - [Commits](https://github.com/twbs/bootstrap/compare/v3.4.1...v4.3.1) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | Merge pull request #14548 from ↵Morris Jobke2019-03-084-24/+26
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/bugfix/noid/avoid-duplicate-container-creation Avoid duplicate App container creation
| * | | "Fix" the unit testsJoas Schilling2019-03-062-20/+3
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Make the file strictJoas Schilling2019-03-051-4/+5
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | Avoid duplicate App container creationJoas Schilling2019-03-052-1/+19
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #14590 from Worteks/masterMorris Jobke2019-03-081-1/+1
|\ \ \ \ | |_|_|/ |/| | | Update index.php
| * | | Update index.phppaul2019-03-071-1/+1
| | | | | | | | | | | | Linking to NC 15 documentation instead of NC 13
* | | | Merge pull request #14585 from nextcloud/ocm-mention-federationMorris Jobke2019-03-081-1/+1
|\ \ \ \ | | | | | | | | | | Mention Open Cloud Mesh in Federated User Settings
| * | | | Mention Open Cloud Mesh in Federated User SettingsMarius Blüm2019-03-071-1/+1
| |/ / / | | | | | | | | Signed-off-by: Marius Blüm <marius@lineone.io>
* | | | Merge pull request #14589 from ↵Morris Jobke2019-03-081-0/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/feature/noid/add-preview-information-as-optional-data Add preview data as optional data for files
| * | | | Add preview data as optional data for filesJoas Schilling2019-03-071-0/+12
| |/ / / | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Merge pull request #14425 from cowai/fix-multiple-incomplete-foldersMorris Jobke2019-03-085-8/+70
|\ \ \ \ | | | | | | | | | | 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-065-8/+70
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Ari Selseng <ari@selseng.net>
* | | | | Merge pull request #14587 from nextcloud/remove-googleplus-social-sharing-bundleMorris Jobke2019-03-082-2/+0
|\ \ \ \ \ | | | | | | | | | | | | Remove Google+ from Social Sharing Bundle
| * | | | | Remove Google+ from Social Sharing Bundle (2)Marius Blüm2019-03-071-1/+0
| | | | | | | | | | | | | | | | | | Signed-off-by: Marius Blüm <marius@lineone.io>
| * | | | | Remove "socialsharing_googleplus" from Social Sharing BundleMarius Blüm2019-03-071-1/+0
| | |/ / / | |/| | | | | | | | Signed-off-by: Marius Blüm <marius@lineone.io>
* | | | | Merge pull request #14583 from nextcloud/remove-g+-federationMorris Jobke2019-03-083-8/+0
|\ \ \ \ \ | | | | | | | | | | | | Remove Google+ federation usersettings
| * | | | | Remove G+ CSS rule (Feedback from Joas)Marius Blüm2019-03-071-3/+0
| | | | | | | | | | | | | | | | | | Signed-off-by: Marius Blüm <marius@lineone.io>
| * | | | | Remove G+ code from Federated Files Sharing-usersettingsMarius Blüm2019-03-071-4/+0
| | | | | | | | | | | | | | | | | | Signed-off-by: Marius Blüm <marius@lineone.io>
| * | | | | Remove G+ icon from Federated Files Sharing-usersettingsMarius Blüm2019-03-071-1/+0
| |/ / / / | | | | | | | | | | Signed-off-by: Marius Blüm <marius@lineone.io>
* | | | | Merge pull request #14464 from nextcloud/fix/noid/ldap-nested-group-filterblizzz2019-03-077-80/+230
|\ \ \ \ \ | |/ / / / |/| | | | resolve user and groups in nested groups first before filtering the results
| * | | | remove unused use statementArthur Schiwon2019-03-061-1/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | add missing config bits to integration testsArthur Schiwon2019-03-062-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-051-0/+8
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | fix nested group retrieval also for 2 other casesArthur Schiwon2019-03-056-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-051-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roland Tapken <roland@bitarbeiter.net>
| * | | | Reduce queries to LDAP by caching nested groupsRoland Tapken2019-03-051-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-051-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-051-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 #14579 from nextcloud/fix/bump_streams_files_externalRoeland Jago Douma2019-03-074-16/+28
|\ \ \ \ \ | |_|_|_|/ |/| | | | 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 #14568 from nextcloud/techdebt/noid/cleanup-code-leftoversRoeland Jago Douma2019-03-066-19/+2
|\ \ \ \ \ | | | | | | | | | | | | Cleanup some PHPDoc leftovers and unused variables
| * | | | | Cleanup some PHPDoc leftovers and unused variablesMorris Jobke2019-03-066-19/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Merge pull request #14569 from nextcloud/fix/noid/fix-transifexMorris Jobke2019-03-061-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix transifex sync for files_sharing
| * | | | | | Fix transifex sync for files_sharingMorris Jobke2019-03-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | | Merge pull request #14424 from nextcloud/fix/13554/swift_to_tmpRoeland Jago Douma2019-03-061-1/+10
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Use a tmp file for swift writes
| * | | | | | | Use a tmp file for swift writesRoeland Jago Douma2019-03-041-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 #14563 from nextcloud/fix/jquery-versionMorris Jobke2019-03-064-51/+51
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Pin the jquery version to 2.1.4
| * | | | | | | | Pin the jquery version to 2.1.4Christoph Wurst2019-03-064-51/+51
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | | | Merge pull request #14561 from Nutomic/wrong-username-messageMorris Jobke2019-03-061-1/+1
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | Change login error message to "wrong username or password"
| * | | | | | | Change login error message to "wrong username or password" (fixes #14460)Felix Ableitner2019-03-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Felix Ableitner <me@nutomic.com>
generated by cgit v1.2.3 (git 2.39.1) at 2025-07-22 12:36:30 +0000