summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #16572 from nextcloud/fix/15613/bring-back-psql9-compatRoeland Jago Douma2019-08-142-3/+24
|\
| * instead of upsert, fallback to default query on PgSQL <= 9.4Arthur Schiwon2019-08-142-3/+24
* | Merge pull request #16725 from nextcloud/bugfix/noid/syslog-diblizzz2019-08-142-2/+3
|\ \ | |/ |/|
| * Make sure SystemConfig class can be injected and syslog_tag is fetched properlyJulius Härtl2019-08-132-2/+3
* | Get the proper UIDRoeland Jago Douma2019-08-135-1/+63
|/
* Merge pull request #16721 from nextcloud/fix/16644Roeland Jago Douma2019-08-111-4/+4
|\
| * Correctly handle emtpy string in proxyuserpwd configScott Shambarger2019-08-111-4/+4
* | Merge pull request #16179 from J0WI/mv-frameoptionsRoeland Jago Douma2019-08-111-5/+5
|\ \
| * | Remove duplicated spacesJ0WI2019-08-111-1/+1
| * | Sort headersJ0WI2019-08-111-4/+4
| * | Add X-Frame-Options header to .htaccessJ0WI2019-08-111-1/+1
* | | Merge pull request #16613 from nextcloud/enh/featurepolicyRoeland Jago Douma2019-08-1112-1/+557
|\ \ \ | |/ / |/| |
| * | Add feature policy headerRoeland Jago Douma2019-08-1011-0/+555
| * | Have the OCSBaseResponse call the parent constructorRoeland Jago Douma2019-08-081-1/+2
* | | [tx-robot] updated from transifexNextcloud bot2019-08-102-2/+2
* | | [tx-robot] updated from transifexNextcloud bot2019-08-094-2/+4
|/ /
* | Merge pull request #15187 from vitormattos/bugfix-create-database-userRoeland Jago Douma2019-08-081-0/+4
|\ \
| * \ Merge remote-tracking branch 'nextcloud/master' into bugfix-create-database-userVitor Mattos2019-04-307-3/+11
| |\ \
| * \ \ Merge remote-tracking branch 'nextcloud/master' into bugfix-create-database-userVitor Mattos2019-04-268-124/+102
| |\ \ \
| * | | | solve code reviewVitor Mattos2019-04-221-1/+1
| * | | | Check if database exists and grand permissionVitor Mattos2019-04-211-2/+4
| * | | | Bugfix: user is not allowedVitor Mattos2019-04-211-0/+2
* | | | | Merge pull request #16686 from nextcloud/fix/16684/return_int_getIfRoeland Jago Douma2019-08-081-1/+1
|\ \ \ \ \
| * | | | | Properly return an int in the getId function of the cacheRoeland Jago Douma2019-08-071-1/+1
* | | | | | [tx-robot] updated from transifexNextcloud bot2019-08-084-18/+22
|/ / / / /
* | | | | [tx-robot] updated from transifexNextcloud bot2019-08-072-12/+12
* | | | | [tx-robot] updated from transifexNextcloud bot2019-08-062-6/+4
| |_|_|/ |/| | |
* | | | Merge pull request #16498 from nextcloud/feature/noid/room_metadataMorris Jobke2019-08-056-4/+288
|\ \ \ \
| * | | | Add standard metadata key for room-featuresGeorg Ehrke2019-08-021-0/+17
| * | | | 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
| * | | | sync metadata of rooms / resources with cacheGeorg Ehrke2019-08-011-1/+1
| * | | | 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
* | | | | | [tx-robot] updated from transifexNextcloud bot2019-08-052-2/+2
* | | | | | [tx-robot] updated from transifexNextcloud bot2019-08-042-0/+2
|/ / / / /
* | | | | [tx-robot] updated from transifexNextcloud bot2019-08-024-2/+6
* | | | | Merge pull request #16592 from nextcloud/bugfix/noid/federated-reshareRoeland Jago Douma2019-08-011-2/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix permission check on incoming federated sharesJulius Härtl2019-07-311-2/+3
* | | | | [tx-robot] updated from transifexNextcloud bot2019-08-014-2/+50
* | | | | Add form-action CSP elementRoeland Jago Douma2019-07-313-0/+44
|/ / / /
* | | | 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
* | | | | [tx-robot] updated from transifexNextcloud bot2019-07-312-0/+38
|/ / / /
* | | | Merge pull request #16594 from nextcloud/tech-debt/noid/remove-unused-checkPa...Joas Schilling2019-07-301-29/+0
|\ \ \ \
| * | | | Remove unused OC\Share\Share::checkPasswordProtectedShareMorris Jobke2019-07-291-29/+0
* | | | | Merge pull request #16579 from nextcloud/enh/PostLoginEventRoeland Jago Douma2019-07-305-2/+82
|\ \ \ \ \
| * | | | | Add proper PostLoginEventRoeland Jago Douma2019-07-295-2/+82
| |/ / / /
* | | | | [tx-robot] updated from transifexNextcloud bot2019-07-302-0/+4