summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2018-10-056-6/+88
* Merge pull request #11607 from nextcloud/dependabot/npm_and_yarn/settings/vue...Roeland Jago Douma2018-10-045-10/+10
|\
| * Bump build and fix makefileJohn Molakvoæ (skjnldsv)2018-10-043-6/+6
| * Bump vue-multiselect from 2.1.0 to 2.1.3 in /settingsdependabot[bot]2018-10-042-4/+4
* | Merge pull request #11581 from nextcloud/users-table-header-fixJohn Molakvoæ2018-10-041-4/+4
|\ \ | |/ |/|
| * Border fixJohn Molakvoæ (skjnldsv)2018-10-031-1/+1
| * Fix sticky header on users listJohn Molakvoæ (skjnldsv)2018-10-031-3/+3
* | [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
* | Merge pull request #11578 from nextcloud/add-group-settings-fixRoeland Jago Douma2018-10-033-4/+2
|\ \
| * | Fixed js error when adding new groupJohn Molakvoæ (skjnldsv)2018-10-033-4/+2
| |/
* | Merge pull request #11538 from nextcloud/heading-boldMarin Treselj2018-10-033-23/+30
|\ \
| * | Fix federation-menu Javascript to use h3Jan-Christoph Borchardt2018-10-021-3/+3
| * | Font-weight exception, use light for personal settings h3Jan-Christoph Borchardt2018-10-021-0/+7
| * | Change h2 to h3 on personal settings pageJan-Christoph Borchardt2018-10-022-21/+21
* | | Fix 2FA settings icon alignmentJan-Christoph Borchardt2018-10-021-0/+1
* | | Consolidate personal two-factor provider settingsChristoph Wurst2018-10-022-0/+55
| |/ |/|
* | Fix generateUrl for webpackJohn Molakvoæ (skjnldsv)2018-10-024-7/+12
* | Babel fix and dynamic import on settingsJohn Molakvoæ (skjnldsv)2018-10-0215-184/+198
* | Widen new user 'confirm' button, fix #10917Jan-Christoph Borchardt2018-10-011-0/+3
* | Line up header text with column content for when there's inputsJan-Christoph Borchardt2018-10-011-1/+12
|/
* Merge pull request #11444 from nextcloud/feature/11413/handlebars_compile_stepChristoph Wurst2018-10-011-14/+14
|\
| * Bump templates to handlebars 4.0.12Roeland Jago Douma2018-09-281-14/+14
* | Merge pull request #11457 from nextcloud/dependabot/npm_and_yarn/settings/@ba...dependabot[bot]2018-10-012-49/+114
|\ \
| * | Bump @babel/core from 7.0.0 to 7.1.2 in /settingsdependabot[bot]2018-09-302-49/+114
* | | Bump webpack-cli from 3.1.1 to 3.1.2 in /settingsdependabot[bot]2018-10-012-4/+4
* | | [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
* | Merge pull request #11458 from nextcloud/dependabot/npm_and_yarn/settings/bab...Roeland Jago Douma2018-09-302-4/+4
|\ \
| * | Bump babel-loader from 8.0.2 to 8.0.4 in /settingsdependabot[bot]2018-09-292-4/+4
* | | [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
* [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
|\
| * State default unknown quota to 0John Molakvoæ (skjnldsv)2018-09-284-7/+12
| * Fix string formattingJohn Molakvoæ (skjnldsv)2018-09-273-3/+3
| * Add back the total used space per userJohn Molakvoæ (skjnldsv)2018-09-275-12/+32
* | Merge pull request #11412 from nextcloud/csp/11032/authtoekn_compiled_handlebarsChristoph Wurst2018-09-284-32/+69
|\ \
| * | Compile handlebars template for AuthTokenViewRoeland Jago Douma2018-09-274-32/+69
* | | Merge pull request #11416 from nextcloud/bugfix/11218/show-email-authtype-noneblizzz2018-09-271-1/+1
|\ \ \
| * | | Show auth type "None" in email settingsMorris Jobke2018-09-271-1/+1
| |/ /
* | | Merge pull request #10833 from nextcloud/fix_8623Morris Jobke2018-09-271-2/+3
|\ \ \ | |_|/ |/| |
| * | Re-enable upload button after updating Avatar fixes #8623Tobia De Koninck2018-08-241-2/+3
* | | Fix "checkWellKnownUrl" not being runDaniel Calviño Sánchez2018-09-271-2/+2
| |/ |/|
* | [tx-robot] updated from transifexNextcloud bot2018-09-272-2/+120
* | Rebase and bumpJohn Molakvoæ (skjnldsv)2018-09-262-494/+310
* | Merge branch 'master' into babel-npm-webpack-fixesJohn Molakvoæ (skjnldsv)2018-09-2638-260/+851
|\ \
| * | [tx-robot] updated from transifexNextcloud bot2018-09-262-6/+6