summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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 #14529 from nextcloud/regression/13491/fix-missing-dependencyMorris Jobke2019-03-051-0/+3
|\
| * Fix missing $config dependency in RetryJobMorris Jobke2019-03-051-0/+3
* | Merge pull request #14528 from nextcloud/bugfix/noid/fix-database-configurationMorris Jobke2019-03-051-25/+26
|\ \ | |/ |/|
| * Fix whitespacesJoas Schilling2019-03-051-22/+23
| * Fix database configurationJoas Schilling2019-03-051-3/+3
* | Merge pull request #14519 from nextcloud/feature/config-undefinedMorris Jobke2019-03-051-1/+1
|\ \
| * | Fix Undefined property: OCA\LookupServerConnector\UpdateLookupServer::$configDaniel Kesselberg2019-03-041-1/+1
* | | Merge pull request #14470 from felixn/masterMorris Jobke2019-03-051-6/+9
|\ \ \
| * | | set availableSpace to 0 if userFolder not foundFelix Nieuwenhuizen2019-03-021-6/+7
| * | | use node API for free space calculation in versions app (same method as trash...Felix Nieuwenhuizen2019-03-021-3/+5
* | | | Merge pull request #14501 from nextcloud/version/noid/16.0.0-alpha-1v16.0.0alpha1Morris Jobke2019-03-041-2/+2
|\ \ \ \
| * | | | 16.0.0 Alpha 1Morris Jobke2019-03-041-2/+2
* | | | | Merge pull request #14480 from cowai/reconnect-db-notifyRoeland Jago Douma2019-03-041-11/+56
|\ \ \ \ \
| * | | | | Correct log attributeAri Selseng2019-03-041-1/+1
| * | | | | Added logging to Notify command.Ari Selseng2019-03-041-2/+9
| * | | | | Reconnect to DB after timeout for Notify command. Fixes #14479Ari Selseng2019-03-031-10/+48
| | |/ / / | |/| | |
* | | | | Merge pull request #14514 from nextcloud/fix/no_debug_outputRoeland Jago Douma2019-03-041-3/+6
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Do not just write foobarRoeland Jago Douma2019-03-041-3/+6
* | | | | Merge pull request #13871 from PLUTEX/masterMorris Jobke2019-03-041-1/+3
|\ \ \ \ \
| * | | | | dav: Fix handling of chunked WebDAV uploadJan-Philipp Litza2019-01-281-1/+3
* | | | | | Merge pull request #14499 from nextcloud/fix/svg-api/dark-modeMorris Jobke2019-03-041-1/+9
|\ \ \ \ \ \
| * | | | | | Do not cut full color on accessibility svg color invertJohn Molakvoæ (skjnldsv)2019-03-041-1/+9
* | | | | | | Merge pull request #14510 from nextcloud/smb-3.1.1Morris Jobke2019-03-046-44/+18
|\ \ \ \ \ \ \
| * | | | | | | update icewind/smb to 3.1.1Robin Appelman2019-03-046-44/+18
|/ / / / / / /
* | | | | | | Merge pull request #13401 from nextcloud/improve-lookup-server-behaviourRoeland Jago Douma2019-03-042-5/+44
|\ \ \ \ \ \ \
| * | | | | | | increase timespan between each retryBjoern Schiessle2019-02-201-3/+5
| * | | | | | | improve lookup server behaviourBjoern Schiessle2019-01-072-2/+39
* | | | | | | | Merge pull request #14430 from nextcloud/bugfix/13990/remove-upload-settingMorris Jobke2019-03-0419-649/+7
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Remove the upload and memory settingJoas Schilling2019-03-0419-649/+7
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #12978 from tobiasKaminsky/noteOnDavMorris Jobke2019-03-042-0/+39
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Update apps/dav/lib/Connector/Sabre/Node.phpChristoph Wurst2019-03-041-1/+1
| * | | | | | Add note to dav endpointtobiasKaminsky2019-02-272-0/+39
* | | | | | | Merge pull request #14493 from nextcloud/tech-debt/noid/remove-php5-configMorris Jobke2019-03-044-29/+5
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Remove unused php5 config from .htaccessMorris Jobke2019-03-044-29/+5
* | | | | | | Merge pull request #14494 from nextcloud/tests/noid/make-header.feature-more-...Morris Jobke2019-03-041-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Make header.feature more robust by running it on apacheMorris Jobke2019-03-041-0/+1
| |/ / / / / /
* | | | | | | Merge pull request #14484 from nextcloud/fix/users-and-groups/vue-multiselectMorris Jobke2019-03-048-423/+33
|\ \ \ \ \ \ \
| * | | | | | | Settings build updateJohn Molakvoæ (skjnldsv)2019-03-035-366/+26
| * | | | | | | Use nextcloud-vue multiselectJohn Molakvoæ (skjnldsv)2019-03-033-57/+7
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #14465 from nextcloud/dependabot/npm_and_yarn/vue-multisel...Roeland Jago Douma2019-03-044-6/+6
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Bump vue-multiselect from 2.1.3 to 2.1.4dependabot[bot]2019-03-044-6/+6
|/ / / / / /
* | | | | | Merge pull request #14467 from nextcloud/dependabot/npm_and_yarn/vue-and-vue-...John Molakvoæ2019-03-0418-58/+58
|\ \ \ \ \ \
| * | | | | | BuildJohn Molakvoæ (skjnldsv)2019-03-0416-35/+35