summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 👌 IMPROVE: remove user_external example from config.sample.phpJonas Sulzer2019-03-131-12/+0
* Merge pull request #14603 from nextcloud/fix/noid/add-setup-check-for-s3-temp...Morris Jobke2019-03-084-14/+182
|\
| * Show a setup warning in case S3 object storage is used as primary storageMorris Jobke2019-03-084-14/+182
* | Merge pull request #14352 from nextcloud/dependabot/npm_and_yarn/bootstrap-4.3.1Roeland Jago Douma2019-03-089-52/+196
|\ \
| * | Bump bundlesJulius Härtl2019-03-072-44/+102
| * | Add wrapper for removed tooltip functionsJulius Härtl2019-03-072-0/+38
| * | Fix domparser on phantomjsJulius Härtl2019-03-072-0/+47
| * | Use tooltip dist fileJulius Härtl2019-03-071-1/+1
| * | Fix tooltip styling for bootstrap 4.3Julius Härtl2019-03-071-3/+4
| * | Fix tooltip includeJulius Härtl2019-03-071-1/+1
| * | [Security] Bump bootstrap from 3.4.1 to 4.3.1dependabot[bot]2019-03-072-4/+4
* | | Merge pull request #14548 from nextcloud/bugfix/noid/avoid-duplicate-containe...Morris Jobke2019-03-084-24/+26
|\ \ \
| * | | "Fix" the unit testsJoas Schilling2019-03-062-20/+3
| * | | Make the file strictJoas Schilling2019-03-051-4/+5
| * | | Avoid duplicate App container creationJoas Schilling2019-03-052-1/+19
* | | | Merge pull request #14590 from Worteks/masterMorris Jobke2019-03-081-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Update index.phppaul2019-03-071-1/+1
* | | | Merge pull request #14585 from nextcloud/ocm-mention-federationMorris Jobke2019-03-081-1/+1
|\ \ \ \
| * | | | Mention Open Cloud Mesh in Federated User SettingsMarius Blüm2019-03-071-1/+1
| |/ / /
* | | | Merge pull request #14589 from nextcloud/feature/noid/add-preview-information...Morris Jobke2019-03-081-0/+12
|\ \ \ \
| * | | | Add preview data as optional data for filesJoas Schilling2019-03-071-0/+12
| |/ / /
* | | | Merge pull request #14425 from cowai/fix-multiple-incomplete-foldersMorris Jobke2019-03-085-8/+70
|\ \ \ \
| * | | | Avoid calculating folder size for parent that needs scan.Ari Selseng2019-03-065-8/+70
* | | | | Merge pull request #14587 from nextcloud/remove-googleplus-social-sharing-bundleMorris Jobke2019-03-082-2/+0
|\ \ \ \ \
| * | | | | Remove Google+ from Social Sharing Bundle (2)Marius Blüm2019-03-071-1/+0
| * | | | | Remove "socialsharing_googleplus" from Social Sharing BundleMarius Blüm2019-03-071-1/+0
| | |/ / / | |/| | |
* | | | | Merge pull request #14583 from nextcloud/remove-g+-federationMorris Jobke2019-03-083-8/+0
|\ \ \ \ \
| * | | | | Remove G+ CSS rule (Feedback from Joas)Marius Blüm2019-03-071-3/+0
| * | | | | Remove G+ code from Federated Files Sharing-usersettingsMarius Blüm2019-03-071-4/+0
| * | | | | Remove G+ icon from Federated Files Sharing-usersettingsMarius Blüm2019-03-071-1/+0
| |/ / / /
* | | | | Merge pull request #14464 from nextcloud/fix/noid/ldap-nested-group-filterblizzz2019-03-077-80/+230
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | remove unused use statementArthur Schiwon2019-03-061-1/+0
| * | | | add missing config bits to integration testsArthur Schiwon2019-03-062-0/+7
| * | | | with LDAP server set offline, config cannot be controlled via ocs anymoreArthur Schiwon2019-03-051-0/+8
| * | | | fix nested group retrieval also for 2 other casesArthur Schiwon2019-03-056-85/+205
| * | | | Fixed unit test: groupsMatchFilter will not be called multiple times anymore.Roland Tapken2019-03-051-1/+1
| * | | | Reduce queries to LDAP by caching nested groupsRoland Tapken2019-03-051-6/+18
| * | | | user_ldap: really resolve nested groupsRoland Tapken2019-03-051-14/+19
| * | | | user_ldap: Filter groups after nexted groupsRoland Tapken2019-03-051-2/+1
* | | | | Merge pull request #14579 from nextcloud/fix/bump_streams_files_externalRoeland Jago Douma2019-03-074-16/+28
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Have streams of files_external in syncRoeland Jago Douma2019-03-074-16/+28
* | | | | Merge pull request #14568 from nextcloud/techdebt/noid/cleanup-code-leftoversRoeland Jago Douma2019-03-066-19/+2
|\ \ \ \ \
| * | | | | Cleanup some PHPDoc leftovers and unused variablesMorris Jobke2019-03-066-19/+2
* | | | | | Merge pull request #14569 from nextcloud/fix/noid/fix-transifexMorris Jobke2019-03-061-2/+2
|\ \ \ \ \ \
| * | | | | | Fix transifex sync for files_sharingMorris Jobke2019-03-061-2/+2
* | | | | | | Merge pull request #14424 from nextcloud/fix/13554/swift_to_tmpRoeland Jago Douma2019-03-061-1/+10
|\ \ \ \ \ \ \
| * | | | | | | Use a tmp file for swift writesRoeland Jago Douma2019-03-041-1/+10
* | | | | | | | Merge pull request #14563 from nextcloud/fix/jquery-versionMorris Jobke2019-03-064-51/+51
|\ \ \ \ \ \ \ \
| * | | | | | | | Pin the jquery version to 2.1.4Christoph Wurst2019-03-064-51/+51
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #14561 from Nutomic/wrong-username-messageMorris Jobke2019-03-061-1/+1
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |