summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Validate email in occ commandDaniel Kesselberg2018-10-022-6/+5
* Use setUserValue instead setEMailAddress because latter omits an changeUser e...Daniel Kesselberg2018-10-021-8/+10
* Add --admin-email to cli installerDaniel Kesselberg2018-10-022-0/+12
* Merge pull request #11390 from nextcloud/feature/11043/apptoken_v3Morris Jobke2018-10-0217-14/+377
|\
| * Add testsRoeland Jago Douma2018-10-026-7/+218
| * Update all the publickey tokens if needed on web loginRoeland Jago Douma2018-10-027-1/+53
| * Mark token as invalid if the password doesn't matchRoeland Jago Douma2018-10-027-7/+52
| * Add column to DB to store expired passwordsRoeland Jago Douma2018-10-024-1/+56
* | Merge pull request #11336 from nextcloud/bugfix/3342/database-name-prefix-sqliteMorris Jobke2018-10-022-8/+44
|\ \
| * | Use empty instead ?? because dbname is '' sometimesDaniel Kesselberg2018-09-231-2/+7
| * | Use const for dbname and dbtableprefix defaultsDaniel Kesselberg2018-09-232-8/+41
| * | --database-name or --database-table-prefix are ignored for sqliteDaniel Kesselberg2018-09-231-4/+2
* | | Merge pull request #11553 from nextcloud/header-overflowMorris Jobke2018-10-022-3/+8
|\ \ \
| * | | Fix header overflow, fix more apps menu, fix #11552Jan-Christoph Borchardt2018-10-022-3/+8
* | | | Merge pull request #11549 from nextcloud/feature/background_job_to_checkMorris Jobke2018-10-027-1/+323
|\ \ \ \
| * | | | Add job to check users for backup code remindersRoeland Jago Douma2018-10-027-1/+323
|/ / / /
* | | | Merge pull request #11484 from nextcloud/babel-fix-and-dynamic-import-settingsChristoph Wurst2018-10-0216-192/+229
|\ \ \ \
| * | | | Fix generateUrl for webpackJohn Molakvoæ (skjnldsv)2018-10-024-7/+12
| * | | | Bump check scriptJohn Molakvoæ (skjnldsv)2018-10-021-17/+35
| * | | | Babel fix and dynamic import on settingsJohn Molakvoæ (skjnldsv)2018-10-0215-184/+198
| | |_|/ | |/| |
* | | | Merge pull request #8282 from Cybso/config-logfilemodeMorris Jobke2018-10-023-8/+18
|\ \ \ \
| * | | | Fix testsMorris Jobke2018-10-021-6/+6
| * | | | Make logfile's mode configurable.Roland Tapken2018-10-022-2/+12
| |/ / /
* | | | Merge pull request #11111 from kevin147147/patch-4Morris Jobke2018-10-021-0/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Added kinetic scrolling for iOS to apps dropdown menu #10281kevin1471472018-09-071-1/+2
* | | | Merge pull request #11185 from nextcloud/bugfix/noid/redirect-guests-to-login...Roeland Jago Douma2018-10-022-57/+121
|\ \ \ \
| * | | | Redirect guests to login if they follow the link of a comment mention-notific...Joas Schilling2018-10-022-57/+121
* | | | | Merge pull request #10909 from nextcloud/feature/noid/trash-add-droppable-zoneMorris Jobke2018-10-023-0/+46
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Refactored Variablename to trashElementFelix Nüsse2018-10-021-7/+7
| * | | | Fixed highlightdelay on first dragFelix Nüsse2018-10-021-1/+3
| * | | | Added Dropzone-Highlighting to TrashFelix Nüsse2018-10-022-1/+20
| * | | | Added Trash-Dropzone to easily dispose of files and foldersFelix Nüsse2018-10-022-0/+25
* | | | | Merge pull request #10757 from coliff/patch-1Roeland Jago Douma2018-10-021-1/+1
|\ \ \ \ \
| * | | | | remove type="text/javascript" from index.htmlChristian Oliff2018-08-201-1/+1
* | | | | | Merge pull request #11526 from nextcloud/3rdparty/symfony/3.4.16Roeland Jago Douma2018-10-021-0/+0
|\ \ \ \ \ \
| * | | | | | [3rdparty] Bump symfony packages to 3.4.16Roeland Jago Douma2018-10-021-0/+0
* | | | | | | Merge pull request #11527 from nextcloud/fix/10926/share_indexesRoeland Jago Douma2018-10-023-0/+24
|\ \ \ \ \ \ \
| * | | | | | | Add uid_owner and uid_initiator share tabe indicesRoeland Jago Douma2018-10-013-0/+24
| |/ / / / / /
* | | | | | | Merge pull request #11536 from nextcloud/adjust-dialog-radiusMorris Jobke2018-10-021-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Adjust border-radius-large to 10pxJan-Christoph Borchardt2018-10-021-1/+1
* | | | | | | | Merge pull request #11535 from nextcloud/bugfix/11031/theming-unsafe-evalRoeland Jago Douma2018-10-022-1/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Manually instantiate jscolor to avoid csp errorsJulius Härtl2018-10-022-1/+5
* | | | | | | | | Merge pull request #11500 from nextcloud/enhancement/revamp-2fa-login-provide...John Molakvoæ2018-10-025-46/+109
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Restructure and redesign two-factor auth provider selectionChristoph Wurst2018-10-015-46/+109
* | | | | | | | | | Merge pull request #11433 from nextcloud/feature/all_lax_cookies2Christoph Wurst2018-10-024-4/+108
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Make authenticated cookies laxRoeland Jago Douma2018-09-284-4/+108
* | | | | | | | | | Merge pull request #11084 from nextcloud/feature/qbmapper-insert-or-updateRoeland Jago Douma2018-10-021-1/+19
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Document possibly thrown excption of QBMapper::insertOrUpdateChristoph Wurst2018-10-021-0/+1
| * | | | | | | | | | Add QBMapper::insertOrUpdate()Christoph Wurst2018-10-021-1/+18
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #11529 from nextcloud/breadcrumbs-fixMorris Jobke2018-10-021-0/+3
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |