summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2018-10-056-6/+88
|
* Merge pull request #11607 from ↵Roeland Jago Douma2018-10-045-10/+10
|\ | | | | | | | | nextcloud/dependabot/npm_and_yarn/settings/vue-multiselect-2.1.3 Bump vue-multiselect from 2.1.0 to 2.1.3 in /settings
| * Bump build and fix makefileJohn Molakvoæ (skjnldsv)2018-10-043-6/+6
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * Bump vue-multiselect from 2.1.0 to 2.1.3 in /settingsdependabot[bot]2018-10-042-4/+4
| | | | | | | | | | | | | | Bumps [vue-multiselect](https://github.com/shentao/vue-multiselect) from 2.1.0 to 2.1.3. - [Release notes](https://github.com/shentao/vue-multiselect/releases) - [Commits](https://github.com/shentao/vue-multiselect/compare/v2.1.0...v2.1.3) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | Merge pull request #11581 from nextcloud/users-table-header-fixJohn Molakvoæ2018-10-041-4/+4
|\ \ | |/ |/| Fix sticky header on users list
| * Border fixJohn Molakvoæ (skjnldsv)2018-10-031-1/+1
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * Fix sticky header on users listJohn Molakvoæ (skjnldsv)2018-10-031-3/+3
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | [tx-robot] updated from transifexNextcloud bot2018-10-0412-12/+60
| |
* | [tx-robot] updated from transifexNextcloud bot2018-10-032-10/+20
| |
* | Set nonce for loading the zxcvbnMorris Jobke2018-10-031-1/+2
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #11578 from nextcloud/add-group-settings-fixRoeland Jago Douma2018-10-033-4/+2
|\ \ | | | | | | Fixed js error when adding new group
| * | Fixed js error when adding new groupJohn Molakvoæ (skjnldsv)2018-10-033-4/+2
| |/ | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | Merge pull request #11538 from nextcloud/heading-boldMarin Treselj2018-10-033-23/+30
|\ \ | | | | | | Set headings to Semibold for better information architecture
| * | Fix federation-menu Javascript to use h3Jan-Christoph Borchardt2018-10-021-3/+3
| | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | Font-weight exception, use light for personal settings h3Jan-Christoph Borchardt2018-10-021-0/+7
| | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | Change h2 to h3 on personal settings pageJan-Christoph Borchardt2018-10-022-21/+21
| | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | Fix 2FA settings icon alignmentJan-Christoph Borchardt2018-10-021-0/+1
| | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | Consolidate personal two-factor provider settingsChristoph Wurst2018-10-022-0/+55
| |/ |/| | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | 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>
* | Babel fix and dynamic import on settingsJohn Molakvoæ (skjnldsv)2018-10-0215-184/+198
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | 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 #11444 from nextcloud/feature/11413/handlebars_compile_stepChristoph Wurst2018-10-011-14/+14
|\ | | | | Simple handlebars CI step
| * Bump templates to handlebars 4.0.12Roeland Jago Douma2018-09-281-14/+14
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #11457 from ↵dependabot[bot]2018-10-012-49/+114
|\ \ | | | | | | | | | nextcloud/dependabot/npm_and_yarn/settings/@babel/core-7.1.2
| * | Bump @babel/core from 7.0.0 to 7.1.2 in /settingsdependabot[bot]2018-09-302-49/+114
| | | | | | | | | | | | | | | | | | | | | | | | Bumps [@babel/core](https://github.com/babel/babel) from 7.0.0 to 7.1.2. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md) - [Commits](https://github.com/babel/babel/compare/v7.0.0...v7.1.2) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | Bump webpack-cli from 3.1.1 to 3.1.2 in /settingsdependabot[bot]2018-10-012-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 3.1.1 to 3.1.2. - [Release notes](https://github.com/webpack/webpack-cli/releases) - [Changelog](https://github.com/webpack/webpack-cli/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack/webpack-cli/compare/v3.1.1...v3.1.2) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | [tx-robot] updated from transifexNextcloud bot2018-10-012-4/+4
|/ /
* | Bump @babel/preset-env from 7.0.0 to 7.1.0 in /settingsdependabot[bot]2018-09-302-280/+731
| | | | | | | | | | | | | | | | Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.0.0 to 7.1.0. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md) - [Commits](https://github.com/babel/babel/compare/v7.0.0...v7.1.0) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | Merge pull request #11458 from ↵Roeland Jago Douma2018-09-302-4/+4
|\ \ | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/settings/babel-loader-8.0.4 Bump babel-loader from 8.0.2 to 8.0.4 in /settings
| * | Bump babel-loader from 8.0.2 to 8.0.4 in /settingsdependabot[bot]2018-09-292-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Bumps [babel-loader](https://github.com/babel/babel-loader) from 8.0.2 to 8.0.4. - [Release notes](https://github.com/babel/babel-loader/releases) - [Changelog](https://github.com/babel/babel-loader/blob/master/CHANGELOG.md) - [Commits](https://github.com/babel/babel-loader/compare/v8.0.2...v8.0.4) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | | [tx-robot] updated from transifexNextcloud bot2018-09-304-6/+16
|/ /
* / [tx-robot] updated from transifexNextcloud bot2018-09-29124-234/+238
|/
* Add new group entry on users list + fixesJohn Molakvoæ (skjnldsv)2018-09-2812-298/+1517
| | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* [tx-robot] updated from transifexNextcloud bot2018-09-28114-440/+440
|
* Merge pull request #11417 from nextcloud/hover-quota-used-space-regressionJohn Molakvoæ2018-09-285-16/+41
|\ | | | | Add back the total used space per user
| * State default unknown quota to 0John Molakvoæ (skjnldsv)2018-09-284-7/+12
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * Fix string formattingJohn Molakvoæ (skjnldsv)2018-09-273-3/+3
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * Add back the total used space per userJohn Molakvoæ (skjnldsv)2018-09-275-12/+32
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | Merge pull request #11412 from nextcloud/csp/11032/authtoekn_compiled_handlebarsChristoph Wurst2018-09-284-32/+69
|\ \ | | | | | | Compile handlebars template for AuthTokenView
| * | Compile handlebars template for AuthTokenViewRoeland Jago Douma2018-09-274-32/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #11032 For https://github.com/orgs/nextcloud/projects/18 Compile the default authtoken handlebars view. This avoids runtime compilations (speed) and avoids unsafe eval calls thus allowing a stricter CSP. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #11416 from nextcloud/bugfix/11218/show-email-authtype-noneblizzz2018-09-271-1/+1
|\ \ \ | | | | | | | | Show auth type "None" in email settings
| * | | Show auth type "None" in email settingsMorris Jobke2018-09-271-1/+1
| |/ / | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #10833 from nextcloud/fix_8623Morris Jobke2018-09-271-2/+3
|\ \ \ | |_|/ |/| | Re-enable upload button after updating Avatar fixes #8623
| * | Re-enable upload button after updating Avatar fixes #8623Tobia De Koninck2018-08-241-2/+3
| | | | | | | | | | | | Signed-off-by: Tobia De Koninck <LEDfan@users.noreply.github.com>
* | | Fix "checkWellKnownUrl" not being runDaniel Calviño Sánchez2018-09-271-2/+2
| |/ |/| | | | | | | | | | | | | | | | | The check is run only if its last parameter is true; data() tries to convert the HTML attribute string to an actual JavaScript value, so "true" is returned as an actual boolean instead of an string; as a strict comparison against "true" was used the result was false and thus the checks were not run. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | [tx-robot] updated from transifexNextcloud bot2018-09-272-2/+120
| |
* | Rebase and bumpJohn Molakvoæ (skjnldsv)2018-09-262-494/+310
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | Merge branch 'master' into babel-npm-webpack-fixesJohn Molakvoæ (skjnldsv)2018-09-2638-260/+851
|\ \ | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | [tx-robot] updated from transifexNextcloud bot2018-09-262-6/+6
| | |