aboutsummaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Collapse)AuthorAgeFilesLines
* Update the scope of the lockdownmanagerRoeland Jago Douma2018-08-141-0/+3
| | | | | | We have the token anyway. So better the scope as well. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Merge pull request #10621 from ↵blizzz2018-08-131-3/+4
|\ | | | | | | | | nextcloud/feature/noid/add-tos-to-enterprise-bundle Add the ToS app to the enterprise bundle
| * Add the ToS app to the enterprise bundleJoas Schilling2018-08-091-3/+4
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Drop support for xcacheDaniel Kesselberg2018-08-122-145/+0
| | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | Merge pull request #10543 from nextcloud/ignore-deactivated-usersRoeland Jago Douma2018-08-101-1/+3
|\ \ | | | | | | Do not show deactivated users in sharees and contacts
| * | Ignore deactivated users in collaborators user search pluginThomas Citharel2018-08-061-1/+3
| | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
* | | Merge pull request #10636 from nextcloud/fix/2fa-enforced-backup-codesblizzz2018-08-101-4/+9
|\ \ \ | | | | | | | | Fix 2FA being enforced if only backup codes provider is active
| * | | Fix 2FA being enforced if only backup codes provider is activeChristoph Wurst2018-08-101-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/nextcloud/server/issues/10634. Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | Merge pull request #10618 from nextcloud/mimetype-insert-if-not-existsRoeland Jago Douma2018-08-101-14/+7
|\ \ \ \ | |/ / / |/| | | use insertIfNotExists to store new mimetypes.
| * | | use insertIfNotExists to store new mimetypes.Robin Appelman2018-08-091-14/+7
| | | | | | | | | | | | | | | | | | | | | | | | Also throw an error if we can't find the mimetype after insert Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | Do not use file as template parameterRoeland Jago Douma2018-08-091-1/+1
| |_|/ |/| | | | | | | | | | | | | | | | | | | | Using file will overwrite the $file parameter in the template base. Leading to trying to include a file that is the exception message. Which will of course fail. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Fix double-inserts of the same provider stateChristoph Wurst2018-08-091-6/+19
|/ / | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | Merge pull request #10588 from nextcloud/fix/single-2fa-provider-login-redirectRoeland Jago Douma2018-08-091-0/+11
|\ \ | | | | | | Fix login redirection if only one 2FA provider is active
| * | Rename providerset method to get primary providersChristoph Wurst2018-08-081-1/+1
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | Fix login redirection if only one 2FA provider is activeChristoph Wurst2018-08-081-0/+11
| | | | | | | | | | | | | | | | | | Fixes https://github.com/nextcloud/server/issues/10500. Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | Merge pull request #10255 from nextcloud/add-support-for-room-sharesBjörn Schießle2018-08-093-0/+47
|\ \ \ | | | | | | | | Add support for room shares
| * | | Add support for tokens in room sharesDaniel Calviño Sánchez2018-08-081-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tokens will be used to give access to a share to guests in public rooms. Although the token itself is created in the provider of room shares and no changes are needed for that, due to the code structure it is necessary to explicitly call the provider from the manager when getting a room share by token. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | Add support for room shares to the share managerDaniel Calviño Sánchez2018-08-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Room shares are implemented in an external app (Nextcloud Talk), so in order to keep the share manager as isolated as possible from room share specifics all the validity checks are done in the provider of room shares. However, due to the code structure it is necessary to explicitly check for room shares in "generalCreateChecks" to prevent an exception from being thrown. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | Add provider for room sharesDaniel Calviño Sánchez2018-08-081-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The RoomShareProvider is provided by the Talk app, so it is necessary to check whether the app is available or not, and also whether the class itself exists or not (just in case an older version of the app that did not have support yet for room shares is being used). Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | Add comment with IDs of internal share typesDaniel Calviño Sánchez2018-08-081-0/+2
| | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | Add type for room sharesDaniel Calviño Sánchez2018-08-081-0/+1
| |/ / | | | | | | | | | | | | | | | This type represents shares with a Nextcloud Talk conversation. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | Fix app code checker to ignore `build` directoryChristoph Wurst2018-08-091-1/+1
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | Merge pull request #10397 from nextcloud/encryption-s3-fixBjörn Schießle2018-08-081-2/+17
|\ \ \ | |/ / |/| | make file cache updates more robust
| * | make file cache updates more robustBjoern Schiessle2018-07-311-2/+17
| | | | | | | | | | | | | | | | | | only update the encrypted version after the write operation is finished and the stream is closed Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | Merge pull request #10553 from ↵Roeland Jago Douma2018-08-081-1/+2
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/bugfix/10518/disable-oracle-enforcement-for-now Disable Oracle enforcement for now until the following issues are sol…
| * | | Disable Oracle enforcement for now until the following issues are solved:Joas Schilling2018-08-061-1/+2
| | |/ | |/| | | | | | | | | | | | | | | | * Only apps should be checked which say they support oracle * Only check newly added items, to allow forward migration from an existing database structure Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #10586 from nextcloud/fix/noid/check_if_ua_is_setRoeland Jago Douma2018-08-081-0/+4
|\ \ \ | | | | | | | | Check if HTTP_USER_AGENT is set before using it
| * | | Check if HTTP_USER_AGENT is set before using itRoeland Jago Douma2018-08-081-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Sentry reported some errors regarding this. Apparently not everybody sets a user agent. If it is not set we assume this is not IE ;) Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Fix 2FA provider registry population on loginChristoph Wurst2018-08-081-1/+3
|/ / / | | | | | | | | | | | | | | | | | | | | | If the 2FA provider registry has not been populated yet, we have to make sure all available providers are loaded and queried on login. Otherwise previously active 2FA providers aren't detected as enabled. Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | Merge pull request #10569 from nextcloud/custom-avatar-userconfigRoeland Jago Douma2018-08-071-1/+1
|\ \ \ | | | | | | | | get avatar custom status from user config
| * | | get avatar custom status from user configRobin Appelman2018-08-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | this saves a cache operation because the user config is already cached Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | Icons cacher css url fixJohn Molakvoæ (skjnldsv)2018-08-071-1/+1
|/ / / | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* / / Do not log to error loglevel when converting the errorRoeland Jago Douma2018-08-061-1/+1
|/ / | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #10480 from nextcloud/bugfix/10420/settingsRoeland Jago Douma2018-08-022-4/+3
|\ \ | | | | | | Settings design polishing
| * | Move encryption settings to securityJulius Härtl2018-08-012-4/+3
| |/ | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | There is no update available if the app didnt have a version (aka was not ↵Joas Schilling2018-08-021-1/+1
| | | | | | | | | | | | installed) Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #10481 from ↵Roeland Jago Douma2018-08-011-1/+10
|\ \ | | | | | | | | | | | | nextcloud/feature/noid/make-info-available-if-the-avatar-was-uploaded Make the info available if the avatar was uploaded or generated
| * | Make the info available if the avatar was uploaded or generatedJoas Schilling2018-08-011-1/+10
| |/ | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* / Append cache bump parameter to scss files URLJulius Härtl2018-08-011-1/+5
|/ | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* Merge pull request #10444 from ↵blizzz2018-07-311-2/+7
|\ | | | | | | | | nextcloud/feature/noid/allow-to-filter-unread-count-by-verb Allow to filter the unread count by verb
| * Allow to filter the unread count by verbJoas Schilling2018-07-301-2/+7
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Fix duplicate inserts in the 2fa provider registry DAOChristoph Wurst2018-07-311-10/+18
| | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | Merge pull request #10451 from nextcloud/fix/9693/move_logcondition_upRoeland Jago Douma2018-07-301-1/+2
|\ \ | | | | | | Fetch logcondition earlier
| * | Fetch logcondition earlierRoeland Jago Douma2018-07-301-1/+2
| |/ | | | | | | | | | | Fixes #9693 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Fix primary key handling on postgresJoas Schilling2018-07-271-3/+4
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Ignore custom prefixes which are longerJoas Schilling2018-07-271-9/+9
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Ignore automatic generated sequencesJoas Schilling2018-07-271-1/+10
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Fix calculation of default nameJoas Schilling2018-07-271-3/+23
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Prevent too long identifier namesJoas Schilling2018-07-271-1/+41
|/ | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* Fix regex for icon urlsJulius Härtl2018-07-261-2/+2
| | | | | | | | Use the version from the url rather than hardcoding v=1. Also allow uppercase chars in the url, so that uppercase hex color values will also be included Signed-off-by: Julius Härtl <jus@bitgrid.net>