summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #11622 from nextcloud/feature/11617Roeland Jago Douma2018-10-092-0/+21
|\ | | | | Add function to generate urls for OCS routes
| * Add function to generate urls for OCS routesRoeland Jago Douma2018-10-092-0/+21
| | | | | | | | | | | | | | | | | | | | fixes #11617 The OCS routes are only absolute for now as they are often exposed to the outside anyway and are on a different endpoint than index.php in anyway. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Use numeric placeholders if there are multiple, so that RTL languages can ↵Joas Schilling2018-10-095-38/+38
|/ | | | | | operate better Signed-off-by: Joas Schilling <coding@schilljs.com>
* Merge pull request #11677 from nextcloud/feature/appdata_previewsMorris Jobke2018-10-092-12/+10
|\ | | | | Allow the creationg of previews of files stored in appdata
| * Allow the creationg of previews of files stored in appdataRoeland Jago Douma2018-10-082-12/+10
| | | | | | | | | | | | | | To allow us to create previews of files stored in appdata we need to construct the view differently. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #11686 from ↵Morris Jobke2018-10-091-0/+1
|\ \ | | | | | | | | | | | | nextcloud/deprecation/noid/ocp_util_recursiveArraySearch Deprecate unused OCP\Util::recursiveArraySearch
| * | Deprecate unused OCP\Util::recursiveArraySearchMorris Jobke2018-10-081-0/+1
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Deprecate unused, private OC_Helper::linkToPublicMorris Jobke2018-10-082-18/+6
|/ / | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #10839 from nextcloud/bugfix/10212/use_class_implementationMorris Jobke2018-10-084-36/+96
|\ \ | | | | | | adjust Calendar resource / room interfaces to use class implementation
| * | RoomManager/ResourceManager: Inject IServerContainer instead of using OC ServerGeorg Ehrke2018-10-082-2/+28
| | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * | adjust Calendar resource / room interfaces to use class implementationGeorg Ehrke2018-10-084-36/+70
| | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | Merge pull request #11671 from nextcloud/refactor/rename-admin-security-sectionMorris Jobke2018-10-084-5/+5
|\ \ \ | |_|/ |/| | Rename admin security section
| * | Rename admin security settings templateChristoph Wurst2018-10-081-1/+1
| | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | Rename admin security sectionChristoph Wurst2018-10-084-4/+4
| |/ | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | Merge pull request #10898 from ↵Morris Jobke2018-10-081-2/+2
|\ \ | |/ |/| | | | | nextcloud/feature/10684/default-logo-color-theme-colors Switches the default logo color depending on the primary color
| * Moves the logo files to logoMichael Weimann2018-10-021-2/+2
| | | | | | | | Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
* | Remove deprecated publishActivity functionRoeland Jago Douma2018-10-052-41/+0
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #11613 from nextcloud/add-missing-throw-statementMorris Jobke2018-10-041-1/+2
|\ \ | | | | | | add missing throw statement to doc block
| * | add missing throw statement to doc blockBjoern Schiessle2018-10-041-1/+2
| | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | Merge pull request #11604 from nextcloud/remove-unused-codeRoeland Jago Douma2018-10-042-80/+24
|\ \ \ | | | | | | | | Remove unused code in legacy classes
| * | | Remove unused code in legacy classesMorris Jobke2018-10-032-80/+24
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #11576 from ↵Morris Jobke2018-10-032-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/feature/endpoint_for_clients_to_fetch_apppassword Allow clients to request an apppassword if they still use the real password
| * | | | Add an endppoint for clients to request an app passwordRoeland Jago Douma2018-10-032-0/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that we allow enforcing 2 factor auth it make sense if we also allow and endpoint where the clients can in the background fetch an apppassword if they were configured before the login flow was present. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* / / / [tx-robot] updated from transifexNextcloud bot2018-10-032-2/+8
|/ / /
* | | Merge pull request #11568 from nextcloud/fix/11097/just_update_password_hashMorris Jobke2018-10-031-8/+12
|\ \ \ | | | | | | | | Just update password hash without validating
| * | | Just update password hash without validatingRoeland Jago Douma2018-10-031-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #11097 If your password hash changed (becuse your are on 7.2 and we moved to ARGON2). Then we shold not 'set a new password' but just update the hash. As else we invoke the password policy again which might lock out users. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #11409 from nextcloud/feature/consolidated-2fa-settingsRoeland Jago Douma2018-10-035-4/+142
|\ \ \ \ | |/ / / |/| | | Consolidate personal two-factor provider settings
| * | | Update autoloader class mapChristoph Wurst2018-10-022-0/+4
| | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | | Consolidate personal two-factor provider settingsChristoph Wurst2018-10-023-4/+138
| | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | Merge pull request #11446 from nextcloud/bugfix/10678/pretty-urls-dont-workMorris Jobke2018-10-021-3/+2
|\ \ \ \ | | | | | | | | | | Allow overwrite.cli.url without trailing slash
| * | | | Allow url without / for overwrite.cli.urlDaniel Kesselberg2018-09-281-3/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | | Merge pull request #10967 from nextcloud/zipresponseMorris Jobke2018-10-023-0/+89
|\ \ \ \ \ | | | | | | | | | | | | Add zip response
| * | | | | Add PHPDocMorris Jobke2018-10-021-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | fixup! Add fix responseRoeland Jago Douma2018-10-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | fixup! Add fix responseRoeland Jago Douma2018-10-021-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | fixup! Add fix responseRoeland Jago Douma2018-10-021-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | Add fix responseJakob Sack2018-10-023-5/+82
| | |_|_|/ | |/| | | | | | | | | | | | | implements #7589
* | | | | Validate email in occ commandDaniel Kesselberg2018-10-021-6/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | | Use setUserValue instead setEMailAddress because latter omits an changeUser ↵Daniel Kesselberg2018-10-021-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | events. Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | | Add --admin-email to cli installerDaniel Kesselberg2018-10-021-0/+9
| |_|/ / |/| | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | Merge pull request #11390 from nextcloud/feature/11043/apptoken_v3Morris Jobke2018-10-029-3/+106
|\ \ \ \ | | | | | | | | | | Apptoken v3: imrpove token handling on external password change
| * | | | Add testsRoeland Jago Douma2018-10-021-1/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Update all the publickey tokens if needed on web loginRoeland Jago Douma2018-10-026-1/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * On weblogin check if we have invalid public key tokens * If so update them all with the new token This ensures that your marked as invalid tokens work again if you once login on the web. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Mark token as invalid if the password doesn't matchRoeland Jago Douma2018-10-026-3/+50
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Add column to DB to store expired passwordsRoeland Jago Douma2018-10-022-0/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #11336 from nextcloud/bugfix/3342/database-name-prefix-sqliteMorris Jobke2018-10-022-8/+44
|\ \ \ \ \ | | | | | | | | | | | | Allow --database-name and --database-table-prefix for sqlite from occ
| * | | | | Use empty instead ?? because dbname is '' sometimesDaniel Kesselberg2018-09-231-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * | | | | Use const for dbname and dbtableprefix defaultsDaniel Kesselberg2018-09-232-8/+41
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
| * | | | | --database-name or --database-table-prefix are ignored for sqliteDaniel Kesselberg2018-09-231-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default implementation of initialize in AbstractDatabase writes database information to config.php. The method is overwritten in Sqlite but parent is never called. Database-Name and Database-Table-Prefix are never written to config.php. But from this point setup use values from config. Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | | | | | Make logfile's mode configurable.Roland Tapken2018-10-021-2/+5
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The file logger currently resets the mode of the logfile to 0640. When the webserver is running as a different user than the cron job (but both are in the same group) the files mode has to be 0660. The current implementation breaks logging for the user that is not the owner of the logfile. This patch introduces a new config option 'logfilemode' that expects an octal value (defaults to 0640). Unless the value is lower or equal than 0 the logfiles mode will be resetted to this value. Signed-off-by: Roland Tapken <roland@bitarbeiter.net>