aboutsummaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-06-116-0/+6
* Remove unneeded CSSMarius Blüm2017-06-101-4/+0
* [tx-robot] updated from transifexNextcloud bot2017-06-106-4/+14
* Merge pull request #5118 from nextcloud/use-language-of-recipient-not-adminLukas Reschke2017-06-091-1/+32
|\
| * Use the language of the recipient not the actorJoas Schilling2017-05-261-1/+32
* | [tx-robot] updated from transifexNextcloud bot2017-06-0992-1032/+218
* | Merge pull request #5287 from nextcloud/personal-page-gs-modeJoas Schilling2017-06-082-16/+39
|\ \
| * | unify look of disabled display name / email address and the other input fieldsBjoern Schiessle2017-06-072-10/+11
| * | show input fields if they are not empty but disable them in global scale modeBjoern Schiessle2017-06-071-7/+29
* | | [tx-robot] updated from transifexNextcloud bot2017-06-0880-140/+352
* | | Allow to change avatar when groups are disablesMorris Jobke2017-06-072-3/+8
|/ /
* | Merge pull request #5267 from nextcloud/personal-sessions-renamweJoas Schilling2017-06-074-22/+22
|\ \
| * | reword sessions to security in personal settingsRobin Appelman2017-06-064-22/+22
* | | [tx-robot] updated from transifexNextcloud bot2017-06-07132-380/+1032
* | | Merge pull request #5259 from nextcloud/disable-groups-on-personal-pageMorris Jobke2017-06-062-0/+3
|\ \ \
| * | | allow admin to disable groups on personal pageBjoern Schiessle2017-06-062-0/+3
| |/ /
* | | Merge pull request #5223 from nextcloud/do-not-allow-to-set-invisible-fieldsMorris Jobke2017-06-061-19/+31
|\ \ \
| * | | Also cover the settings endpointJoas Schilling2017-06-021-19/+31
* | | | Bring back the description for app passwordsJoas Schilling2017-06-061-0/+4
| |/ / |/| |
* | | Merge pull request #5166 from nextcloud/feature/merge-sessions-app-passwords-...Morris Jobke2017-06-054-85/+33
|\ \ \
| * | | Combine sessions and app passwords view into one single viewChristoph Wurst2017-05-304-85/+33
* | | | [tx-robot] updated from transifexNextcloud bot2017-06-0410-10/+30
* | | | [tx-robot] updated from transifexNextcloud bot2017-06-034-2/+4
* | | | Merge pull request #5084 from nextcloud/useful-gs-settingsBjörn Schießle2017-06-021-2/+8
|\ \ \ \
| * | | | add new config switched for the global scale architectureBjoern Schiessle2017-05-291-2/+8
* | | | | [tx-robot] updated from transifexNextcloud bot2017-06-0210-46/+192
| |_|/ / |/| | |
* | | | [tx-robot] updated from transifexNextcloud bot2017-06-016-22/+316
* | | | [tx-robot] updated from transifexNextcloud bot2017-05-316-178/+182
| |/ / |/| |
* | | [tx-robot] updated from transifexNextcloud bot2017-05-308-8/+32
|/ /
* | [tx-robot] updated from transifexNextcloud bot2017-05-294-6/+6
* | Merge pull request #5126 from nextcloud/setting-the-same-email-shouldnt-trigg...Lukas Reschke2017-05-281-0/+6
|\ \
| * | Don't trigger activity when the email didn't changeJoas Schilling2017-05-261-0/+6
| |/
* | [tx-robot] updated from transifexNextcloud bot2017-05-282-0/+2
* | [tx-robot] updated from transifexNextcloud bot2017-05-276-14/+16
* | Merge pull request #5095 from patschi/patch-1Björn Schießle2017-05-261-1/+1
|\ \ | |/ |/|
| * Fix #5059 by adding sanity checks before using varPatrik Kernstock2017-05-241-1/+1
* | [tx-robot] updated from transifexNextcloud bot2017-05-2610-4/+50
* | [tx-robot] updated from transifexNextcloud bot2017-05-258-12/+342
|/
* [tx-robot] updated from transifexNextcloud bot2017-05-242-2/+2
* [tx-robot] updated from transifexNextcloud bot2017-05-238-14/+30
* [tx-robot] updated from transifexNextcloud bot2017-05-224-0/+6
* [tx-robot] updated from transifexNextcloud bot2017-05-216-4/+6
* [tx-robot] updated from transifexNextcloud bot2017-05-2020-6/+92
* Fix group restriction regressionMorris Jobke2017-05-192-9/+9
* Merge pull request #4950 from nextcloud/master-workaround-4948Lukas Reschke2017-05-191-1/+1
|\
| * Lowercase the scriptname againLukas Reschke2017-05-191-1/+1
* | [tx-robot] updated from transifexNextcloud bot2017-05-1918-2/+76
|/
* Merge pull request #4894 from nextcloud/generic-security-activitiesLukas Reschke2017-05-194-0/+214
|\
| * Change 2FA activities to more generic security activitiesChristoph Wurst2017-05-184-0/+214
* | delete auth token when client gets deletedBjoern Schiessle2017-05-181-1/+1
|/