summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Expand)AuthorAgeFilesLines
* Popover design fixes and settings updateJohn Molakvoæ (skjnldsv)2018-06-291-2/+2
* Merge pull request #5623 from nextcloud/locale-settingMorris Jobke2018-06-293-3/+75
|\
| * Design fixesJohn Molakvoæ (skjnldsv)2018-06-282-7/+6
| * fix camelCase for localesForLanguageGeorg Ehrke2018-06-271-1/+1
| * show locale example and apply new locale right awayGeorg Ehrke2018-06-273-1/+18
| * fix position of locale inputGeorg Ehrke2018-06-272-29/+29
| * Fix review & testsThomas Citharel2018-06-271-0/+2
| * Allow user to choose localeThomas Citharel2018-06-272-0/+54
* | [tx-robot] updated from transifexNextcloud bot2018-06-292-0/+10
* | [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
* [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
* Use a placeholder instead of magic string concatenationJoas Schilling2018-06-263-4/+5
* Merge pull request #9980 from nextcloud/dependabot/npm_and_yarn/settings/webp...Morris Jobke2018-06-264-29/+36
|\
| * Bump webpackRoeland Jago Douma2018-06-253-12/+17
| * Bump webpack from 4.12.0 to 4.12.1 in /settingsdependabot[bot]2018-06-252-30/+32
* | [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
|\
| * Css clampJohn Molakvoæ (skjnldsv)2018-06-254-4/+13
| * Real ellipsis and better line heightJohn Molakvoæ (skjnldsv)2018-06-254-4/+4
| * Fixed multi line in users listJohn Molakvoæ (skjnldsv)2018-06-254-3/+19
* | [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 nextcloud/bugfix/8402/do-not-log-if-user-was-de...Morris Jobke2018-06-221-1/+1
|\
| * Use info log level to inform about a deleted user and thus the verification i...Morris Jobke2018-06-221-1/+1
* | removed debugJohn Molakvoæ (skjnldsv)2018-06-223-4/+2
* | Added icons to users list and improved designJohn Molakvoæ (skjnldsv)2018-06-224-3/+21
* | [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
* revert unwanted changesJohn Molakvoæ (skjnldsv)2018-06-202-1/+5
* Fixed tests and improved app-navigation-captionJohn Molakvoæ (skjnldsv)2018-06-203-25/+7
* IE11 css vars compatibilityJohn Molakvoæ (skjnldsv)2018-06-203-3/+11
* More vars fixesJohn Molakvoæ (skjnldsv)2018-06-201-27/+26
* [tx-robot] updated from transifexNextcloud bot2018-06-20126-136/+148
* Apps searchJohn Molakvoæ (skjnldsv)2018-06-193-43/+20
* Fit user search to new standardJohn Molakvoæ (skjnldsv)2018-06-194-3815/+33
* Add user search supportJohn Molakvoæ (skjnldsv)2018-06-192-2/+3826
* Merge pull request #9919 from nextcloud/immutable-groupsJohn Molakvoæ2018-06-194-9/+42
|\
| * New user support, provisionning api and design fixesJohn Molakvoæ (skjnldsv)2018-06-194-9/+36
| * Don't pretend we can add/remove users to/from groups when we can'tRobin Appelman2018-06-193-3/+9
* | If cronErros is empty json_decode will return NULLRoeland Jago Douma2018-06-191-1/+11
|/
* Merge pull request #9914 from Jaczel/new-settings-grammatical-fixMorris Jobke2018-06-191-2/+2
|\
| * 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
|/
* Merge pull request #9903 from nextcloud/dependabot/npm_and_yarn/settings/webp...Roeland Jago Douma2018-06-192-4/+4
|\
| * Bump webpack-merge from 4.1.2 to 4.1.3 in /settingsdependabot[bot]2018-06-192-4/+4