summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-06-116-0/+6
* [tx-robot] updated from transifexNextcloud bot2017-06-106-4/+14
* Merge pull request #5123 from patschi/patch-2Morris Jobke2017-06-081-1/+1
|\
| * Backported Fix #5059 to stable12 by adding sanity checks before using varPatrik Kernstock2017-05-261-1/+1
* | [tx-robot] updated from transifexNextcloud bot2017-06-0992-1032/+218
* | Merge pull request #5285 from nextcloud/personal-sessions-renamwe-12Robin Appelman2017-06-084-22/+22
|\ \
| * | reword sessions to security in personal settingsRobin Appelman2017-06-074-22/+22
* | | [tx-robot] updated from transifexNextcloud bot2017-06-0880-140/+352
* | | 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-6/+28
* | | Allow to change avatar when groups are disablesMorris Jobke2017-06-072-3/+8
* | | Merge pull request #5186 from nextcloud/backport-5126-email-change-spamMorris Jobke2017-06-071-0/+6
|\ \ \ | |/ / |/| |
| * | Don't trigger activity when the email didn't changeJoas Schilling2017-05-311-0/+6
* | | [tx-robot] updated from transifexNextcloud bot2017-06-07132-380/+1032
* | | Merge pull request #5270 from nextcloud/stable12-5223Björn Schießle2017-06-061-19/+31
|\ \ \
| * | | Also cover the settings endpointJoas Schilling2017-06-061-19/+31
* | | | Merge pull request #5261 from nextcloud/disable-groups-on-personal-page-nc12Morris Jobke2017-06-062-0/+3
|\ \ \ \ | |/ / / |/| | |
| * | | allow admin to disable groups on personal pageBjoern Schiessle2017-06-062-0/+3
* | | | Bring back the description for app passwordsJoas Schilling2017-06-061-0/+4
* | | | Combine sessions and app passwords view into one single viewChristoph Wurst2017-06-064-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 #5224 from nextcloud/useful-gs-settings-stable12Björn Schießle2017-06-021-2/+8
|\ \ \
| * | | add new config switched for the global scale architectureBjoern Schiessle2017-06-021-2/+8
* | | | Merge pull request #5225 from nextcloud/no-client-info-without-firstrunwizardBjörn Schießle2017-06-022-3/+5
|\ \ \ \ | |/ / / |/| | |
| * | | Don't show client info, when the app is disabledJoas Schilling2017-06-022-3/+5
* | | | [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
* | [tx-robot] updated from transifexNextcloud bot2017-05-282-0/+2
* | [tx-robot] updated from transifexNextcloud bot2017-05-276-14/+16
|/
* [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 #4949 from nextcloud/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
|/
* [tx-robot] updated from transifexNextcloud bot2017-05-18112-446/+462
* Merge pull request #4923 from nextcloud/backgroundjobs-wordingLukas Reschke2017-05-171-5/+5
|\
| * Change cron wording to background jobsJan-Christoph Borchardt2017-05-161-5/+5