summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2019-12-018-36/+36
|
* [tx-robot] updated from transifexNextcloud bot2019-11-3064-6/+470
|
* Merge pull request #18149 from nextcloud/fix/18148/dont-create-bundle-too-earlyRoeland Jago Douma2019-11-291-11/+17
|\ | | | | delay creation of the cert bundle
| * delay creation of the cert bundleArthur Schiwon2019-11-281-11/+17
| | | | | | | | | | | | fixes #18148 Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | Merge pull request #18113 from nextcloud/bugfix/15967/webcal_cache_headersRoeland Jago Douma2019-11-294-1/+100
|\ \ | | | | | | Add refresh-interval to exported calendars
| * | Add refresh-interval to exported calendarsGeorg Ehrke2019-11-274-1/+100
| | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | Merge pull request #18142 from nextcloud/fix/provisioning_api/users-typingRoeland Jago Douma2019-11-291-2/+2
|\ \ \ | | | | | | | | Fix provisioning_api getUsers types
| * | | Fix provisioning_api getUsers typesJohn Molakvoæ (skjnldsv)2019-11-281-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | Merge pull request #18062 from nextcloud/drop/php71Roeland Jago Douma2019-11-292-4/+4
|\ \ \ \ | | | | | | | | | | Drop php 7.1 support
| * | | | Fix integrationRoeland Jago Douma2019-11-281-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Drop php 7.1 supportRoeland Jago Douma2019-11-281-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 18 will be relased when php7.1 is EOL already. So lets kill it! Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #18133 from nextcloud/bugfix/13896/missing_from_informationRoeland Jago Douma2019-11-292-6/+55
|\ \ \ \ \ | | | | | | | | | | | | Set common-name to user's displayname if none is set
| * | | | | Set common-name to user's displayname if none is setGeorg Ehrke2019-11-292-6/+55
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | | | | Merge pull request #18135 from nextcloud/fix/trim-login-nameRoeland Jago Douma2019-11-291-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Trim the login name
| * | | | | Trim the login nameChristoph Wurst2019-11-281-1/+1
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise we keep on using it with leading or trailing whitespaces for app tokens and other logic. The reason this doesn't throw an error immediately with local users is that (My)SQL compares strings regardless of their padding by default. So we look up 'uid ' and get the row for the user 'uid'. Other back-ends will lead to a hard error, though, and the user is unable to log out as all request fail. Ref https://stackoverflow.com/a/10495807/2239067 Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | [tx-robot] updated from transifexNextcloud bot2019-11-29156-594/+784
| | | | |
* | | | | Merge pull request #18134 from nextcloud/enh/noid/flow-extend-scopeRoeland Jago Douma2019-11-2813-32/+449
|\ \ \ \ \ | |/ / / / |/| | | | allow user flows when the acting user is legitimate, but not its owner
| * | | | adjust unit testArthur Schiwon2019-11-281-1/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | Set fileInfo in the rule matcherJulius Härtl2019-11-281-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | add convenience interfaces so entities can provide presentable detailsArthur Schiwon2019-11-289-3/+259
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the File entity starts with a display text (used by talk) Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | expose user of running flowsArthur Schiwon2019-11-281-0/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | allow user flows when the acting user is legitimate, but not its ownerArthur Schiwon2019-11-286-30/+184
| | |_|/ | |/| | | | | | | | | | | | | | | | | | for instance, when a sharee changes a file, the owner can act upon Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | Merge pull request #18154 from nextcloud/tests/fix-tags-acceptanceRoeland Jago Douma2019-11-281-3/+3
|\ \ \ \ | | | | | | | | | | Adjust tags acceptance tests to moved admin section
| * | | | Adjust tags acceptance tests to moved admin sectionJulius Härtl2019-11-281-3/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | Merge pull request #18150 from nextcloud/docs/noid/files-api-exceptionsRoeland Jago Douma2019-11-285-31/+73
|\ \ \ \ \ | | | | | | | | | | | | Properly annotate LockedException in files node api
| * | | | | Properly anotate LockedException in files node apiJulius Härtl2019-11-285-31/+73
| | |/ / / | |/| | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | Merge pull request #18153 from nextcloud/bugfix/revert-mimetypelistRoeland Jago Douma2019-11-281-1/+96
|\ \ \ \ \ | |_|/ / / |/| | | | Revert removed mimetypelist
| * | | | Revert removed mimetypelistJulius Härtl2019-11-281-1/+96
|/ / / / | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | Merge pull request #18152 from nextcloud/bugfix/noid/direct-editing-postgresblizzz2019-11-281-1/+1
|\ \ \ \ | |/ / / |/| | | Fix direct editing access check on Postgres
| * | | Check for boolean valueJulius Härtl2019-11-281-1/+1
|/ / / | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | Merge pull request #18147 from nextcloud/fix/integration/7.3/redisRoeland Jago Douma2019-11-281-33/+33
|\ \ \ | | | | | | | | Bump integration to php7.3 with redis
| * | | Bump integration to php7.3 with redisRoeland Jago Douma2019-11-281-33/+33
| |/ / | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #18143 from nextcloud/tests/direct-editing-phpunit8Roeland Jago Douma2019-11-281-1/+1
|\ \ \ | |/ / |/| | Adjust DirectEditing test to PHPUnit8
| * | Adjust DirectEditing test to PHPUnit8Julius Härtl2019-11-281-1/+1
|/ / | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | Merge pull request #17625 from nextcloud/enh/noid/direct-editingRoeland Jago Douma2019-11-2825-4/+1489
|\ \ | | | | | | Direct editing API to allow file editing using a one-time token
| * | Only expose link to info endpoint in capabiltiesJulius Härtl2019-11-276-42/+120
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Expose editor id for creatorsJulius Härtl2019-11-271-0/+1
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Add mimetype to creatorsJulius Härtl2019-11-273-5/+14
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Code style fixes and cleanupJulius Härtl2019-11-278-52/+75
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Move editor list to capabilitiesJulius Härtl2019-11-274-50/+49
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Direct editing token testsJulius Härtl2019-11-271-0/+152
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | Add background job for token cleanupJulius Härtl2019-11-272-0/+32
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | encapsulate templatestobiasKaminsky2019-11-271-1/+3
| | | | | | | | | | | | Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
| * | Direct editing API to allow file editing using a one-time token forJulius Härtl2019-11-2721-3/+1192
| | | | | | | | | | | | | | | | | | mobile apps Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | Merge pull request #17725 from nextcloud/enh/share_exp_internalRoeland Jago Douma2019-11-2815-39/+318
|\ \ \ | | | | | | | | Allow internal shares to have a default expiration date
| * | | Fix testsRoeland Jago Douma2019-11-272-3/+40
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Compile assetsnpmbuildbot[bot]2019-11-272-5/+5
| | | | | | | | | | | | | | | | Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
| * | | Add capabilitiesRoeland Jago Douma2019-11-271-0/+7
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Add settings front and split sharing entry configJohn Molakvoæ (skjnldsv)2019-11-276-25/+102
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | Expose internal expiration dates to JSRoeland Jago Douma2019-11-271-1/+11
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>