summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [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>
| * | Actualy return dataRoeland Jago Douma2019-11-271-8/+1
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | My first stupid attempt at expanding the admin interfaceRoeland Jago Douma2019-11-272-1/+20
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Allow internal shares to have a default expiration dateRoeland Jago Douma2019-11-272-5/+141
| |/ | | | | | | | | | | | | | | * Needs admin UI * Needs more checks * Basics seem to work Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #18064 from nextcloud/feature/php74Roeland Jago Douma2019-11-28714-3012/+3078
|\ \ | | | | | | Add php7.4 support
| * | Fix external storagestestsRoeland Jago Douma2019-11-272-12/+18
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Bump memcached imageRoeland Jago Douma2019-11-271-1/+1
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | REVERT LATER: disable phan for nowRoeland Jago Douma2019-11-271-7/+7
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | remove test caseRoeland Jago Douma2019-11-271-1/+0
| | | | | | | | | | | | | | | | | | Because we test very naively we matched also on def in default... Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | TO REVERT LATER: disable decimaltest from LegacyDBTestRoeland Jago Douma2019-11-271-3/+3
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | TO REVERT LATER: disable some DbHandlerTestRoeland Jago Douma2019-11-271-2/+2
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | TO REVERT LATER: disable some tests in UserTestRoeland Jago Douma2019-11-271-5/+5
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | TO REVERT LATER: disable tests in LargeFileHelperGetFileSizeTestRoeland Jago Douma2019-11-271-1/+1
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | TO REVERT LATER: fix UserHooksTestRoeland Jago Douma2019-11-271-2/+2
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Mode to modern phpunitRoeland Jago Douma2019-11-27442-2324/+2387
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Improve etag handlingRoeland Jago Douma2019-11-271-6/+20
| | | | | | | | | | | | | | | | | | Check if values exist before using them Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>