summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 #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
| * | | | | | Fix breadcrumbsJohn Molakvoæ (skjnldsv)2018-10-021-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | | | Merge pull request #11508 from nextcloud/files-list-width-sharingRoeland Jago Douma2018-10-022-3/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Reduce the min-width of the files table so it works on sharing pages on mobile
| * | | | | | Reduce the min-width of the files table so it works on sharing pages on mobileJan-Christoph Borchardt2018-10-012-3/+2
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* / | | | | [tx-robot] updated from transifexNextcloud bot2018-10-02242-290/+340
|/ / / / /
* | | | | Merge pull request #11523 from nextcloud/usermgmt-designRoeland Jago Douma2018-10-011-1/+15
|\ \ \ \ \ | | | | | | | | | | | | User management: Fix header text alignment and new user "confirm" button
| * | | | | Widen new user 'confirm' button, fix #10917Jan-Christoph Borchardt2018-10-011-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | | | Line up header text with column content for when there's inputsJan-Christoph Borchardt2018-10-011-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | | Merge pull request #11522 from nextcloud/filepicker-designMorris Jobke2018-10-019-19/+38
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Filepicker design improvements
| * | | | | Improve overall container style, radius and shadowJan-Christoph Borchardt2018-10-014-12/+21
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | | | Fix long folder names in picker, prevent horizontal scrollJan-Christoph Borchardt2018-10-013-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | | | Fix breadcrumbs in file pickerJan-Christoph Borchardt2018-10-011-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | | | Fix buttons wrapping on long folder namesJan-Christoph Borchardt2018-10-011-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | | | Refine wording from 'Target folder' to 'Choose target folder'Jan-Christoph Borchardt2018-10-012-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | | Merge pull request #11521 from nextcloud/enhancement/2fa-provider-iconsRoeland Jago Douma2018-10-013-0/+57
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Let 2FA providers provide their custom icons (dark/light)
| * | | | | Let 2FA providers provide their custom icons (dark/light)Christoph Wurst2018-10-013-0/+57
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | Merge pull request #11515 from nextcloud/bugfix/noid/add-mimetype-listMorris Jobke2018-10-011-0/+6
|\ \ \ \ \ | |/ / / / |/| | | | Add missing compiled mimetype list
| * | | | Add missing compiled mimetype list - see #10135Morris Jobke2018-10-011-0/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | Merge pull request #11357 from nextcloud/multiselect-design-fixMorris Jobke2018-10-011-0/+1
|\ \ \ \ \ | | | | | | | | | | | | Multiselect line-height fix
| * | | | | Multiselect line-height fixJohn Molakvoæ (skjnldsv)2018-10-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | | Merge pull request #11462 from ↵Morris Jobke2018-10-0118-2/+892
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/feature/11380/2fa_backup_code_generation Add notification to generate 2FA backup codes
| * | | | | | Clear notification to generate backup code once codes are generatedRoeland Jago Douma2018-10-016-0/+151
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | | Generate backups code notification if not enable but 2fa isRoeland Jago Douma2018-10-0110-1/+658
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generate a notification to generate backup codes if you enable an other 2FA provider but backup codes are not yet generated. * Add event listner * Insert background job * Background job tests and emits notification every 2 weeks * If the backup codes are generated the next run will remove the job Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | | Emit event on enablign or disabling of 2FA providerRoeland Jago Douma2018-10-015-1/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | Merge pull request #11435 from nextcloud/assemblystream-node-to-smallMorris Jobke2018-10-011-0/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | throw an error if a node is smaller than expected in assemblystream
| * | | | | | | throw an error if a node is smaller than expected in assemblystreamRobin Appelman2018-09-281-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | | | | Merge pull request #11496 from nextcloud/csp/filemultiselectmenuRoeland Jago Douma2018-10-0110-59/+59
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Move filemultiselectmenu to compiled handlebars
| * | | | | | | | Move the filemultiselectmenu over to compiled handlebarsRoeland Jago Douma2018-10-013-17/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | | | | Move to 1 template file for filesRoeland Jago Douma2018-10-017-33/+5
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | | | Merge pull request #11487 from nextcloud/avatar-hover-backgroundJohn Molakvoæ2018-10-011-4/+12
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | Fix img seelct and variable for avatar hover
| * | | | | | | Fix gear display and cursorJohn Molakvoæ (skjnldsv)2018-10-011-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | | | | | | Fix img seelct and variable for avatar hoverJohn Molakvoæ (skjnldsv)2018-10-011-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>