summaryrefslogtreecommitdiffstats
path: root/settings/js
Commit message (Collapse)AuthorAgeFilesLines
* Generate assetsRoeland Jago Douma2019-01-312-2/+2
| | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Bump vue-loader from 15.6.0 to 15.6.2 in /settingsdependabot[bot]2019-01-282-2/+2
| | | | | | | | | | Bumps [vue-loader](https://github.com/vuejs/vue-loader) from 15.6.0 to 15.6.2. - [Release notes](https://github.com/vuejs/vue-loader/releases) - [Changelog](https://github.com/vuejs/vue-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/vuejs/vue-loader/commits) Signed-off-by: dependabot[bot] <support@dependabot.com> Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* Fix vue settings checks and filenamesJohn Molakvoæ (skjnldsv)2019-01-2521-37/+77
| | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* Merge pull request #13679 from ↵Roeland Jago Douma2019-01-222-2/+2
|\ | | | | | | | | nextcloud/dependabot/npm_and_yarn/settings/dompurify-1.0.9 Bump dompurify from 1.0.8 to 1.0.9 in /settings
| * Bump dompurify from 1.0.8 to 1.0.9 in /settingsdependabot[bot]2019-01-222-2/+2
| | | | | | | | | | | | | | | | | | 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>
* | Bump vuex from 3.0.1 to 3.1.0 in /settingsdependabot[bot]2019-01-215-10/+10
|/ | | | | | | | | Bumps [vuex](https://github.com/vuejs/vuex) from 3.0.1 to 3.1.0. - [Release notes](https://github.com/vuejs/vuex/releases) - [Commits](https://github.com/vuejs/vuex/compare/v3.0.1...v3.1.0) Signed-off-by: dependabot[bot] <support@dependabot.com> Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* Recompile assetsRoeland Jago Douma2019-01-134-26/+26
| | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Bump js deps of settingsRoeland Jago Douma2019-01-124-14/+14
| | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Bundle dompurify in settings as wellRoeland Jago Douma2019-01-109-9/+9
| | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Bundle the 'marked' libraryChristoph Wurst2019-01-1013-6136/+9
| | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* Merge pull request #12899 from nextcloud/feature/run-setupcheck-on-overwieMorris Jobke2019-01-081-57/+63
|\ | | | | Run setupchecks when #security-warnings is present
| * Run setupchecks when #security-warnings is presentDaniel Kesselberg2019-01-051-57/+63
| | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | Merge pull request #13200 from nextcloud/ie11-compatibility-settingsChristoph Wurst2019-01-0712-39/+39
|\ \ | |/ |/| Cleanup of IE11 compatibility for users & apps management
| * Merge branch 'master' of https://github.com/nextcloud/server into ↵John Molakvoæ (skjnldsv)2019-01-036-34/+34
| |\ | | | | | | | | | ie11-compatibility-settings
| * | IE11 compatibility for users & apps managementJohn Molakvoæ (skjnldsv)2018-12-2112-39/+39
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | Merge pull request #13134 from nextcloud/bugfix/13088/404-instead-of-exceptionMorris Jobke2019-01-041-1/+1
|\ \ \ | |_|/ |/| | returns a 404 instead of exception if app is not installed - #13088
| * | Make setup check also pass with a 501 statusJulius Härtl2018-12-191-1/+1
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | Compile assetsRoeland Jago Douma2019-01-0310-38/+38
| |/ |/| | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Compile assetsJohn Molakvoæ (skjnldsv)2018-12-2010-38/+38
|/ | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* Merge remote-tracking branch ↵Christoph Wurst2018-12-127-9/+9
| | | | | | '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>
* Update vue-template-compiler too & bumpJohn Molakvoæ (skjnldsv)2018-12-116-8/+8
| | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* Compile assetsRoeland Jago Douma2018-12-108-8/+101
| | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Update vue-template-compiler tooJohn Molakvoæ (skjnldsv)2018-12-102-93/+0
| | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* Bump nextcloud-password-confirmation from 0.4.0 to 0.4.1 in /settingsdependabot[bot]2018-12-055-5/+5
| | | | | | | | | Bumps [nextcloud-password-confirmation](https://github.com/ChristophWurst/nextcloud-password-confirmation) from 0.4.0 to 0.4.1. - [Release notes](https://github.com/ChristophWurst/nextcloud-password-confirmation/releases) - [Commits](https://github.com/ChristophWurst/nextcloud-password-confirmation/compare/v0.4.0...v0.4.1) Signed-off-by: dependabot[bot] <support@dependabot.com> Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* Compile assetsRoeland Jago Douma2018-12-052-6/+6
| | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Compile assetsRoeland Jago Douma2018-12-0410-61/+61
| | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Update bundled settings appJulius Härtl2018-12-045-5/+5
| | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* Merge pull request #12734 from nextcloud/feature/noid/check-nginx-woff2Roeland Jago Douma2018-11-291-2/+3
|\ | | | | Add check for missing .woff2 rule in Nginx via setup check
| * Add check for missing .woff2 rule in Nginx via setup checkMorris Jobke2018-11-291-2/+3
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Add sendmailmode to guiDaniel Kesselberg2018-11-291-0/+2
|/ | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* Compile assetsRoeland Jago Douma2018-11-272-5/+5
| | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Compile assetsRoeland Jago Douma2018-11-262-4/+4
| | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Commpile assetsRoeland Jago Douma2018-11-266-7/+7
| | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Compile assetsRoeland Jago Douma2018-11-2210-24/+24
| | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Merge pull request #12592 from patrickbaber/masterRoeland Jago Douma2018-11-221-2/+2
|\ | | | | Fix Typo in Original English String and All Translations
| * fix typo in original english string and all translationsPatrick Baber2018-11-221-2/+2
| | | | | | | | Signed-off-by: Patrick Baber <patrick@p-squared.de>
* | Do not clear new user form on failureJohn Molakvoæ (skjnldsv)2018-11-228-29/+77
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | Merge pull request #12589 from nextcloud/fix/twofactor-admin-groups-explanationMorris Jobke2018-11-225-10/+10
|\ \ | |/ |/| Add explanatory text to admin twofactor settings
| * Add explanatory text to admin twofactor settingsChristoph Wurst2018-11-225-10/+10
| | | | | | | | | | | | | | Ref #12249 Ref https://github.com/nextcloud/documentation/pull/937 Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | Merge pull request #12485 from nextcloud/nextcloud-talk-sessions-formatMorris Jobke2018-11-221-4/+10
|\ \ | |/ |/| Format Nextcloud Talk clients sessions.
| * Fix wording of client sessionsJan-Christoph Borchardt2018-11-211-6/+6
| | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * Format Nextcloud Talk clients sessions.Ivan Sein2018-11-161-0/+6
| | | | | | | | Signed-off-by: Ivan Sein <ivan@nextcloud.com>
* | Fix navigation layout for items that are added on a re-renderJoas Schilling2018-11-161-10/+18
|/ | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* Fix interaction with groups that contain a slashJoas Schilling2018-11-155-5/+5
| | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* fixup! Use nextcloud-password-confirmationJohn Molakvoæ (skjnldsv)2018-11-1210-19/+19
| | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* Merge pull request #12335 from nextcloud/fix/12319/respect-fixed-usernamesblizzz2018-11-085-5/+5
|\ | | | | do not offer to change display name or password, if not possible.
| * do not offer to change display name or password, if not possible.Arthur Schiwon2018-11-075-5/+5
| | | | | | | | | | | | Fixes #12319 Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | Remove arrow function for ie compatibilityJohn Molakvoæ (skjnldsv)2018-11-071-1/+3
|/ | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* BuildJohn Molakvoæ (skjnldsv)2018-11-0610-1369/+2698
| | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* Merge pull request #12191 from nextcloud/sessions-fixesRoeland Jago Douma2018-11-053-18/+19
|\ | | | | Sessions fixes