aboutsummaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #17833 from nextcloud/propagator-no-negative-sizesRoeland Jago Douma2019-12-043-2/+22
|\ | | | | dont set folder size to negative values during propagation
| * dont set folder size to negative values during propagationRobin Appelman2019-11-261-2/+5
| | | | | | | | | | | | | | | | | | | | normally this shouldn't be a problem, but cache/storage desync might cause this so this adds some failsafe to ensure we dont corrupt the cache further the minimum value is set to -1 instead of 0 in order to triger a background scan on the folder and figure out the size properly Signed-off-by: Robin Appelman <robin@icewind.nl>
| * add LEAST and GREATER to db function builderRobin Appelman2019-11-262-0/+17
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #18161 from nextcloud/fix/noid/absocsroute-subfolderRoeland Jago Douma2019-12-041-2/+3
|\ \ | | | | | | fix generation of an url to an absolute ocs route when NC in subfolder
| * | fix generation of an url to an absolute ocs route when NC in subfolderArthur Schiwon2019-11-291-2/+3
| | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | Merge pull request #17949 from nextcloud/debt/deprecated-constJoas Schilling2019-12-041-1/+2
|\ \ \ | | | | | | | | Connection::TRANSACTION_READ_COMMITTED is deprecated
| * | | Connection::TRANSACTION_READ_COMMITTED is deprecatedDaniel Kesselberg2019-11-141-1/+2
| | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | Set last-password-confirmation for setupRoeland Jago Douma2019-12-031-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Else you have to enter your password directly after setup if you do anything admin worthy. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #17443 from nextcloud/enh/expired_token_on_invalid_passRoeland Jago Douma2019-12-032-0/+40
|\ \ \ \ | | | | | | | | | | Throw an invalid token exception is token is marked outdated
| * | | | Throw an invalid token exception is token is marked outdatedRoeland Jago Douma2019-12-022-0/+40
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | This avoids hitting the backend with multiple requests for the same token. And will help avoid quick LDAP lockouts. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #18028 from nextcloud/enhancement/user-create-eventsRoeland Jago Douma2019-12-032-8/+17
|\ \ \ \ | | | | | | | | | | Add typed create user events
| * | | | Add typed create user eventsChristoph Wurst2019-12-032-8/+17
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at> Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #18151 from nextcloud/bugfix/noid/overwrite-host-proxyRoeland Jago Douma2019-12-031-0/+5
|\ \ \ \ \ | |_|/ / / |/| | | | Always return overwritehost if configured
| * | | | Always return overwritehost if configuredJulius Härtl2019-11-281-0/+5
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | 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 #18150 from nextcloud/docs/noid/files-api-exceptionsRoeland Jago Douma2019-11-283-18/+44
|\ \ \ \ | | | | | | | | | | Properly annotate LockedException in files node api
| * | | | Properly anotate LockedException in files node apiJulius Härtl2019-11-283-18/+44
| |/ / / | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* / / / Check for boolean valueJulius 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-283-0/+314
|\ \ \ | | | | | | | | Direct editing API to allow file editing using a one-time token
| * | | Code style fixes and cleanupJulius Härtl2019-11-271-4/+1
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | Move editor list to capabilitiesJulius Härtl2019-11-271-2/+7
| | | | | | | | | | | | | | | | 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-273-0/+310
| | | | | | | | | | | | | | | | | | | | | | | | mobile apps Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | Merge pull request #17725 from nextcloud/enh/share_exp_internalRoeland Jago Douma2019-11-283-6/+145
|\ \ \ \ | | | | | | | | | | Allow internal shares to have a default expiration date
| * | | | 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>
| * | | | 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-282-7/+23
|\ \ \ \ | | | | | | | | | | Add php7.4 support
| * | | | 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>
| * | | | Fix logger testRoeland Jago Douma2019-11-271-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Sensitive values handlingRoeland Jago Douma2019-11-271-2/+4
| |/ / / | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* / / / Use person icon for personal settingsJulius Härtl2019-11-271-1/+1
|/ / / | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | Merge pull request #18019 from nextcloud/enhancement/password-policy-eventsRoeland Jago Douma2019-11-272-10/+9
|\ \ \ | | | | | | | | Add typed events for password_policy
| * | | Add typed events for password_policyChristoph Wurst2019-11-272-10/+9
| | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | Merge pull request #17834 from nextcloud/enh/noid/generic-event-replacement-tk2blizzz2019-11-271-1/+1
|\ \ \ \ | |/ / / |/| | | Public API's GenericEvent replacement (take 2)
| * | | Files first to use own GenericEventArthur Schiwon2019-11-261-1/+1
| | |/ | |/| | | | | | | | | | | | | * those are added to 18 only anyway :) Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | Merge pull request #17939 from nextcloud/fix/token-insert-conflict-handlingRoeland Jago Douma2019-11-261-9/+24
|\ \ \ | | | | | | | | Handle token insert conflicts
| * | | Handle token insert conflictsChristoph Wurst2019-11-261-9/+24
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Env-based SAML uses the "Apache auth" mechanism to log users in. In this code path, we first delete all existin auth tokens from the database, before a new one is inserted. This is problematic for concurrent requests as they might reach the same code at the same time, hence both trying to insert a new row wit the same token (the session ID). This also bubbles up and disables user_saml. As the token might still be OK (both request will insert the same data), we can actually just check if the UIDs of the conflict row is the same as the one we want to insert right now. In that case let's just use the existing entry and carry on. Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* / / Fix autocomplete suggestions with numeric user idsJoas Schilling2019-11-262-3/+4
|/ / | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #18108 from nextcloud/refactor/strict-credential-storeRoeland Jago Douma2019-11-261-3/+4
|\ \ | | | | | | Add return type hint to credential store and make it strict
| * | Add return type hint to credential store and make it strictChristoph Wurst2019-11-251-3/+4
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | Merge pull request #17896 from nextcloud/fix/noid/consider-create-group-resultblizzz2019-11-252-82/+96
|\ \ \ | |/ / |/| | take group creation result into consideration
| * | reformat Setup.phpArthur Schiwon2019-11-251-55/+59
| | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | reformat code for @skjnldsv <3Arthur Schiwon2019-11-251-16/+22
| | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | fix documentation, get and createGroup may return nullArthur Schiwon2019-11-252-5/+8
| | | | | | | | | | | | | | | | | | * also have stricter checks in place Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | take group creation result into considerationArthur Schiwon2019-11-251-9/+10
| | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | Merge pull request #18079 from nextcloud/fixes/phpcsRoeland Jago Douma2019-11-25180-223/+220
|\ \ \ | |/ / |/| | Some php-cs fixes
| * | Some php-cs fixesRoeland Jago Douma2019-11-22180-223/+220
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Order the imports * No leading slash on imports * Empty line before namespace * One line per import * Empty after imports * Emmpty line at bottom of file Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Harden watcherRoeland Jago Douma2019-11-221-2/+2
|/ / | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>