summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Validate email in occ commandDaniel Kesselberg2018-10-022-6/+5
| | | | 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-022-0/+12
| | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* Merge pull request #11390 from nextcloud/feature/11043/apptoken_v3Morris Jobke2018-10-0217-14/+377
|\ | | | | Apptoken v3: imrpove token handling on external password change
| * Add testsRoeland Jago Douma2018-10-026-7/+218
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Update all the publickey tokens if needed on web loginRoeland Jago Douma2018-10-027-1/+53
| | | | | | | | | | | | | | | | | | | | * 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-027-7/+52
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Add column to DB to store expired passwordsRoeland Jago Douma2018-10-024-1/+56
| | | | | | | | 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>
* | | Merge pull request #11553 from nextcloud/header-overflowMorris Jobke2018-10-022-3/+8
|\ \ \ | | | | | | | | Fix header overflow, fix more apps menu, fix #11552
| * | | Fix header overflow, fix more apps menu, fix #11552Jan-Christoph Borchardt2018-10-022-3/+8
| | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | Merge pull request #11549 from nextcloud/feature/background_job_to_checkMorris Jobke2018-10-027-1/+323
|\ \ \ \ | | | | | | | | | | Add job to check users for backup code reminders
| * | | | Add job to check users for backup code remindersRoeland Jago Douma2018-10-027-1/+323
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that we can enforce 2FA we also should notify users that have enabled 2FA but do not yet have backup codes generated. This adds a repair step that inserts a background job to do this. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #11484 from nextcloud/babel-fix-and-dynamic-import-settingsChristoph Wurst2018-10-0216-192/+229
|\ \ \ \ | | | | | | | | | | Babel fix and dynamic import settings
| * | | | Fix generateUrl for webpackJohn Molakvoæ (skjnldsv)2018-10-024-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OC.generateUrl(OC.linkTo('contacts', 'js/')) will append index.php, we should not have that! Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | Bump check scriptJohn Molakvoæ (skjnldsv)2018-10-021-17/+35
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | Babel fix and dynamic import on settingsJohn Molakvoæ (skjnldsv)2018-10-0215-184/+198
| | |_|/ | |/| | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | Merge pull request #8282 from Cybso/config-logfilemodeMorris Jobke2018-10-023-8/+18
|\ \ \ \ | | | | | | | | | | Make logfile's mode configurable.
| * | | | Fix testsMorris Jobke2018-10-021-6/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | Make logfile's mode configurable.Roland Tapken2018-10-022-2/+12
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | Merge pull request #11111 from kevin147147/patch-4Morris Jobke2018-10-021-0/+1
|\ \ \ \ | |_|/ / |/| | | Added kinetic scrolling for iOS to apps dropdown menu
| * | | Added kinetic scrolling for iOS to apps dropdown menu #10281kevin1471472018-09-071-1/+2
| | | | | | | | | | | | this is tested with nc14
* | | | Merge pull request #11185 from ↵Roeland Jago Douma2018-10-022-57/+121
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/bugfix/noid/redirect-guests-to-login-on-mention-notification Redirect guests to login if they follow the link of a comment mention…
| * | | | Redirect guests to login if they follow the link of a comment ↵Joas Schilling2018-10-022-57/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mention-notification Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | | Merge pull request #10909 from nextcloud/feature/noid/trash-add-droppable-zoneMorris Jobke2018-10-023-0/+46
|\ \ \ \ \ | |_|_|/ / |/| | | | Added Trash-Dropzone to easily dispose of files and folders
| * | | | Refactored Variablename to trashElementFelix Nüsse2018-10-021-7/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Felix Nüsse <Felix.nuesse@t-online.de>
| * | | | Fixed highlightdelay on first dragFelix Nüsse2018-10-021-1/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Felix Nüsse <Felix.nuesse@t-online.de>
| * | | | Added Dropzone-Highlighting to TrashFelix Nüsse2018-10-022-1/+20
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Felix Nüsse <Felix.nuesse@t-online.de>
| * | | | Added Trash-Dropzone to easily dispose of files and foldersFelix Nüsse2018-10-022-0/+25
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Felix Nüsse <Felix.nuesse@t-online.de>
* | | | | Merge pull request #10757 from coliff/patch-1Roeland Jago Douma2018-10-021-1/+1
|\ \ \ \ \ | | | | | | | | | | | | remove type="text/javascript" from index.html
| * | | | | remove type="text/javascript" from index.htmlChristian Oliff2018-08-201-1/+1
| | | | | | | | | | | | | | | | | | type="text/javascript" is not needed and removing it makes file-size smaller/faster
* | | | | | Merge pull request #11526 from nextcloud/3rdparty/symfony/3.4.16Roeland Jago Douma2018-10-021-0/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | [3rdparty] Bump symfony packages to 3.4.16
| * | | | | | [3rdparty] Bump symfony packages to 3.4.16Roeland Jago Douma2018-10-021-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | Merge pull request #11527 from nextcloud/fix/10926/share_indexesRoeland Jago Douma2018-10-023-0/+24
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add uid_owner and uid_initiator share tabe indices
| * | | | | | | Add uid_owner and uid_initiator share tabe indicesRoeland Jago Douma2018-10-013-0/+24
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | Merge pull request #11536 from nextcloud/adjust-dialog-radiusMorris Jobke2018-10-021-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Adjust border-radius-large to fit with padding of modals
| * | | | | | | Adjust border-radius-large to 10pxJan-Christoph Borchardt2018-10-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | | | | Merge pull request #11535 from nextcloud/bugfix/11031/theming-unsafe-evalRoeland Jago Douma2018-10-022-1/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Manually instantiate jscolor to avoid csp errors
| * | | | | | | | Manually instantiate jscolor to avoid csp errorsJulius Härtl2018-10-022-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | | | | | Merge pull request #11500 from ↵John Molakvoæ2018-10-025-46/+109
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/enhancement/revamp-2fa-login-provider-selection Improve 2FA provider selection screen
| * | | | | | | | | Restructure and redesign two-factor auth provider selectionChristoph Wurst2018-10-015-46/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | | | | | Merge pull request #11433 from nextcloud/feature/all_lax_cookies2Christoph Wurst2018-10-024-4/+108
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | Make authenticated cookies lax
| * | | | | | | | | Make authenticated cookies laxRoeland Jago Douma2018-09-284-4/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This protects our cookies a bit more. It makes sure that when a 3rdparty websites embededs a public alendar for example. That all the users see this in anonymous mode there. It adds a small helper function. In the future we can think about protecting other cookies like this as well. But for now this is sufficient to not have the user logged in at all when doing 3rdparty requests. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | | | | Merge pull request #11084 from nextcloud/feature/qbmapper-insert-or-updateRoeland Jago Douma2018-10-021-1/+19
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Add QBMapper::insertOrUpdate()
| * | | | | | | | | | Document possibly thrown excption of QBMapper::insertOrUpdateChristoph Wurst2018-10-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
| * | | | | | | | | | Add QBMapper::insertOrUpdate()Christoph Wurst2018-10-021-1/+18
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows elegant upserts where the entity ID is provided (e.g. by an external system) and when that data is fed into our database multiple times. Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | | | | | Merge pull request #11529 from nextcloud/breadcrumbs-fixMorris Jobke2018-10-021-0/+3
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | Fix breadcrumbs