summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Correctly handle emtpy string in proxyuserpwd configScott Shambarger2019-08-112-6/+16
* Merge pull request #16498 from nextcloud/feature/noid/room_metadataMorris Jobke2019-08-0518-1004/+1161
|\
| * Add standard metadata key for room-featuresGeorg Ehrke2019-08-021-0/+17
| * Allow to do a principal property search based on metadata keysGeorg Ehrke2019-08-012-1/+93
| * Provide standard metadata keys for contact person of a resourceGeorg Ehrke2019-08-011-0/+15
| * Provide standard metadata keys for location of roomGeorg Ehrke2019-08-011-0/+21
| * Test resource and room principal backend to check that they provide metadataGeorg Ehrke2019-08-013-766/+191
| * Test sync of resource and room metadataGeorg Ehrke2019-08-011-19/+171
| * sync metadata of rooms / resources with cacheGeorg Ehrke2019-08-012-209/+295
| * provide room / resource properties as principal propertiesGeorg Ehrke2019-08-013-10/+57
| * add oc_calendar_resources_md and oc_calendar_rooms_md tablesGeorg Ehrke2019-08-014-1/+72
| * Add \OCP\Calendar\IMetadataProvider interface and provider for common metadat...Georg Ehrke2019-08-016-4/+235
* | Merge pull request #16639 from nextcloud/feature/noid/new-typesRoeland Jago Douma2019-08-051-0/+2
|\ \
| * | comparaison types: +regex +wildcardMaxence Lange2019-08-021-0/+2
* | | Merge pull request #16643 from nextcloud/enh/moreDIUsageMorris Jobke2019-08-051-26/+1
|\ \ \
| * | | Lets use DI where we canRoeland Jago Douma2019-08-021-26/+1
| |/ /
* | | Merge pull request #16649 from nextcloud/dependabot/npm_and_yarn/nextcloud-vu...Roeland Jago Douma2019-08-056-28/+28
|\ \ \
| * | | Bump nextcloud-vue-collections from 0.5.4 to 0.5.6dependabot-preview[bot]2019-08-056-28/+28
* | | | [tx-robot] updated from transifexNextcloud bot2019-08-058-4/+14
|/ / /
* | | Merge pull request #16651 from nextcloud/dependabot/npm_and_yarn/webpack-4.39.1Roeland Jago Douma2019-08-0448-156/+223
|\ \ \
| * | | Bump webpack from 4.38.0 to 4.39.1dependabot-preview[bot]2019-08-0448-156/+223
* | | | [tx-robot] updated from transifexNextcloud bot2019-08-0410-24/+40
|/ / /
* / / [tx-robot] updated from transifexNextcloud bot2019-08-0312-6/+52
|/ /
* | Merge pull request #16525 from nextcloud/bugfix/external-user-substitutionblizzz2019-08-027-32/+128
|\ \
| * | fix check for nullArthur Schiwon2019-08-021-1/+1
| * | Adjust testsJulius Härtl2019-08-021-1/+20
| * | fixes terminology and allows to request an IUser instanceArthur Schiwon2019-08-022-7/+23
| * | adjusts LDAP's home handler to use the correct user objectArthur Schiwon2019-08-021-2/+3
| * | do not send null value when string is expectedArthur Schiwon2019-08-021-2/+2
| * | Provide proper user context from initMountPointsJulius Härtl2019-08-023-4/+16
| * | files_external: Make sure the correct user context is used in substitution of...Julius Härtl2019-08-024-27/+75
* | | [tx-robot] updated from transifexNextcloud bot2019-08-0266-40/+308
* | | Merge pull request #16624 from nextcloud/bugfix/noid/versions-fetch-owner-onlyRoeland Jago Douma2019-08-011-1/+1
|\ \ \
| * | | Make sure we only fetch the file by id for the actual ownerJulius Härtl2019-08-011-1/+1
* | | | Merge pull request #16622 from nextcloud/design/scrollbarJohn Molakvoæ2019-08-011-2/+5
|\ \ \ \
| * | | | Standardize scrollbar color and width across Webkit and FirefoxJan-Christoph Borchardt2019-07-311-2/+5
* | | | | Merge pull request #16586 from nextcloud/feature/16585_adminAuditShareCircles...Roeland Jago Douma2019-08-011-2/+77
|\ \ \ \ \
| * | | | | log circles and remote shares in admin_auditSascha Wiswedel2019-08-011-2/+77
|/ / / / /
* | | | | Merge pull request #16592 from nextcloud/bugfix/noid/federated-reshareRoeland Jago Douma2019-08-012-2/+36
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fix permission check on incoming federated sharesJulius Härtl2019-07-312-2/+36
| | |_|/ | |/| |
* | | | [tx-robot] updated from transifexNextcloud bot2019-08-01154-402/+498
* | | | Merge pull request #16618 from nextcloud/enh/csp/form-actionRoeland Jago Douma2019-07-315-60/+108
|\ \ \ \ | |/ / / |/| | |
| * | | Update CSP test cases to handle the new form-actionRoeland Jago Douma2019-07-312-60/+64
| * | | Add form-action CSP elementRoeland Jago Douma2019-07-313-0/+44
|/ / /
* | | Merge pull request #16619 from nextcloud/bugfix/16446/theming-url-validateRoeland Jago Douma2019-07-313-43/+49
|\ \ \
| * | | Validate urls in theming settings and properly handle error messagesJulius Härtl2019-07-313-43/+49
| | |/ | |/|
* | | Merge pull request #16544 from nextcloud/bugfix/16540Roeland Jago Douma2019-07-3112-92/+226
|\ \ \
| * | | Move actual password reset to vueJulius Härtl2019-07-3112-92/+226
* | | | Merge pull request #16616 from nextcloud/dep/setEvalScriptRoeland Jago Douma2019-07-311-0/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | setting unsafe-eval is deprecatedRoeland Jago Douma2019-07-301-0/+2
| | |/ | |/|