aboutsummaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2018-06-2810-0/+36
|
* [tx-robot] updated from transifexNextcloud bot2018-06-27164-11998/+12022
|
* Bump webpack from 4.12.1 to 4.12.2 in /settingsdependabot[bot]2018-06-272-16/+11
| | | | | | | Bumps [webpack](https://github.com/webpack/webpack) from 4.12.1 to 4.12.2. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v4.12.1...v4.12.2) Signed-off-by: dependabot[bot] <support@dependabot.com>
* [tx-robot] updated from transifexNextcloud bot2018-06-2724-24/+22
|
* Resend activation email for new users as adminJohn Molakvoæ (skjnldsv)2018-06-267-21/+82
| | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* Use a placeholder instead of magic string concatenationJoas Schilling2018-06-263-4/+5
| | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* Merge pull request #9980 from ↵Morris Jobke2018-06-264-29/+36
|\ | | | | | | | | nextcloud/dependabot/npm_and_yarn/settings/webpack-4.12.1 Bump webpack from 4.12.0 to 4.12.1 in /settings
| * Bump webpackRoeland Jago Douma2018-06-253-12/+17
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Bump webpack from 4.12.0 to 4.12.1 in /settingsdependabot[bot]2018-06-252-30/+32
| | | | | | | | | | | | | | Bumps [webpack](https://github.com/webpack/webpack) from 4.12.0 to 4.12.1. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v4.12.0...v4.12.1) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | [tx-robot] updated from transifexNextcloud bot2018-06-262-0/+50
|/
* Merge pull request #9970 from nextcloud/users-line-height-fixMorris Jobke2018-06-253-1/+26
|\ | | | | Fixed multi line in users list
| * Css clampJohn Molakvoæ (skjnldsv)2018-06-254-4/+13
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * Real ellipsis and better line heightJohn Molakvoæ (skjnldsv)2018-06-254-4/+4
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * Fixed multi line in users listJohn Molakvoæ (skjnldsv)2018-06-254-3/+19
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | [tx-robot] updated from transifexNextcloud bot2018-06-254-0/+10
|/
* [tx-robot] updated from transifexNextcloud bot2018-06-244-8/+20
|
* [tx-robot] updated from transifexNextcloud bot2018-06-23160-160/+160
|
* Merge pull request #9965 from ↵Morris Jobke2018-06-221-1/+1
|\ | | | | | | | | nextcloud/bugfix/8402/do-not-log-if-user-was-deleted-already Use info log level to inform about a deleted user and thus the verification is not needed anymore
| * Use info log level to inform about a deleted user and thus the verification ↵Morris Jobke2018-06-221-1/+1
| | | | | | | | | | | | is not needed anymore Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | removed debugJohn Molakvoæ (skjnldsv)2018-06-223-4/+2
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | Added icons to users list and improved designJohn Molakvoæ (skjnldsv)2018-06-224-3/+21
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | [tx-robot] updated from transifexNextcloud bot2018-06-228-0/+18
|/
* [tx-robot] updated from transifexNextcloud bot2018-06-2112-16/+30
|
* Rebase settings buildJohn Molakvoæ (skjnldsv)2018-06-201-13/+1
| | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* revert unwanted changesJohn Molakvoæ (skjnldsv)2018-06-202-1/+5
| | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* Fixed tests and improved app-navigation-captionJohn Molakvoæ (skjnldsv)2018-06-203-25/+7
| | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* IE11 css vars compatibilityJohn Molakvoæ (skjnldsv)2018-06-203-3/+11
| | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* More vars fixesJohn Molakvoæ (skjnldsv)2018-06-201-27/+26
| | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* [tx-robot] updated from transifexNextcloud bot2018-06-20126-136/+148
|
* Apps searchJohn Molakvoæ (skjnldsv)2018-06-193-43/+20
| | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* Fit user search to new standardJohn Molakvoæ (skjnldsv)2018-06-194-3815/+33
| | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* Add user search supportJohn Molakvoæ (skjnldsv)2018-06-192-2/+3826
| | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* Merge pull request #9919 from nextcloud/immutable-groupsJohn Molakvoæ2018-06-194-9/+42
|\ | | | | Don't pretend we can add/remove users to/from groups when we can't
| * New user support, provisionning api and design fixesJohn Molakvoæ (skjnldsv)2018-06-194-9/+36
| | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * Don't pretend we can add/remove users to/from groups when we can'tRobin Appelman2018-06-193-3/+9
| | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | If cronErros is empty json_decode will return NULLRoeland Jago Douma2018-06-191-1/+11
|/ | | | | | Fixes #9867 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Merge pull request #9914 from Jaczel/new-settings-grammatical-fixMorris Jobke2018-06-191-2/+2
|\ | | | | Fixed English grammatical error on Settings page - template
| * Fixed English grammatical error on Settings page.Jaczel2018-06-191-2/+2
| |
* | Bump webpack-cli from 3.0.3 to 3.0.8 in /settingsdependabot[bot]2018-06-192-7/+7
|/ | | | | | | | Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 3.0.3 to 3.0.8. - [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.0.3...v3.0.8) Signed-off-by: dependabot[bot] <support@dependabot.com>
* Merge pull request #9903 from ↵Roeland Jago Douma2018-06-192-4/+4
|\ | | | | | | | | nextcloud/dependabot/npm_and_yarn/settings/webpack-merge-4.1.3 Bump webpack-merge from 4.1.2 to 4.1.3 in /settings
| * Bump webpack-merge from 4.1.2 to 4.1.3 in /settingsdependabot[bot]2018-06-192-4/+4
| | | | | | | | | | | | | | | | Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 4.1.2 to 4.1.3. - [Release notes](https://github.com/survivejs/webpack-merge/releases) - [Changelog](https://github.com/survivejs/webpack-merge/blob/master/CHANGELOG.md) - [Commits](https://github.com/survivejs/webpack-merge/compare/v4.1.2...v4.1.3) Signed-off-by: dependabot[bot] <support@dependabot.com>
* | Merge pull request #9485 from nextcloud/feature/9441/multiple_token_providersblizzz2018-06-191-11/+2
|\ \ | |/ |/| Add new public key token provider (tokens survive password change)
| * Just pass uid to the Token stuffRoeland Jago Douma2018-06-181-11/+2
| | | | | | | | | | | | We don't have user objects in the code everywhere Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #9905 from ↵Julius Härtl2018-06-194-6/+6
|\ \ | | | | | | | | | | | | nextcloud/dependabot/npm_and_yarn/settings/v-tooltip-2.0.0-rc.33 Bump v-tooltip from 2.0.0-rc.32 to 2.0.0-rc.33 in /settings
| * | Bump compilationJohn Molakvoæ (skjnldsv)2018-06-192-2/+2
| | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
| * | Bump v-tooltip from 2.0.0-rc.32 to 2.0.0-rc.33 in /settingsdependabot[bot]2018-06-182-4/+4
| |/ | | | | | | | | | | | | Bumps [v-tooltip](https://github.com/Akryum/vue-tooltip) from 2.0.0-rc.32 to 2.0.0-rc.33. - [Release notes](https://github.com/Akryum/vue-tooltip/releases) - [Commits](https://github.com/Akryum/vue-tooltip/commits) Signed-off-by: dependabot[bot] <support@dependabot.com>
* / [tx-robot] updated from transifexNextcloud bot2018-06-196-2/+34
|/
* [tx-robot] updated from transifexNextcloud bot2018-06-186-4/+132
|
* [tx-robot] updated from transifexNextcloud bot2018-06-174-26/+40
|
* [tx-robot] updated from transifexNextcloud bot2018-06-162-4/+4
|