aboutsummaryrefslogtreecommitdiffstats
path: root/settings/js/4.js
Commit message (Collapse)AuthorAgeFilesLines
* Fix vue settings checks and filenamesJohn Molakvoæ (skjnldsv)2019-01-251-2/+0
| | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* Bump dompurify from 1.0.8 to 1.0.9 in /settingsdependabot[bot]2019-01-221-1/+1
| | | | | | | | | Bumps [dompurify](https://github.com/cure53/DOMPurify) from 1.0.8 to 1.0.9. - [Release notes](https://github.com/cure53/DOMPurify/releases) - [Commits](https://github.com/cure53/DOMPurify/compare/1.0.8...1.0.9) Signed-off-by: dependabot[bot] <support@dependabot.com> Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* Bundle dompurify in settings as wellRoeland Jago Douma2019-01-101-1/+1
| | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Bundle the 'marked' libraryChristoph Wurst2019-01-101-1/+1
| | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* Merge branch 'master' of https://github.com/nextcloud/server into ↵John Molakvoæ (skjnldsv)2019-01-031-1/+1
|\ | | | | | | ie11-compatibility-settings
| * Compile assetsRoeland Jago Douma2019-01-031-1/+1
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | IE11 compatibility for users & apps managementJohn Molakvoæ (skjnldsv)2018-12-211-1/+1
|/ | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* Compile assetsJohn Molakvoæ (skjnldsv)2018-12-201-1/+1
| | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* Merge remote-tracking branch ↵Christoph Wurst2018-12-121-1/+1
| | | | | | 'origin/dependabot/npm_and_yarn/settings/vue-template-compiler-2.5.21' into dependabot/npm_and_yarn/settings/vue-2.5.21 Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* Compile assetsRoeland Jago Douma2018-12-101-1/+1
| | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Compile assetsRoeland Jago Douma2018-12-041-1/+1
| | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Update bundled settings appJulius Härtl2018-12-041-1/+1
| | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* fixup! Use nextcloud-password-confirmationJohn Molakvoæ (skjnldsv)2018-11-121-1/+1
| | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* Highlight 'Enable' button in sidebar, and 'Update' button generallyJan-Christoph Borchardt2018-10-191-1/+1
| | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* Make it possible to enforce mandatory 2FA for groupsChristoph Wurst2018-10-151-1/+1
| | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* Add admin interface to enforce 2FAChristoph Wurst2018-10-101-0/+2
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>