summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2017-06-23126-126/+126
* [tx-robot] updated from transifexNextcloud bot2017-06-214-0/+210
* Also allow group admins to toogle the storage locationJoas Schilling2017-06-201-10/+8
* Don't try to save the setting when its not an adminJoas Schilling2017-06-201-8/+24
* [tx-robot] updated from transifexNextcloud bot2017-06-204-18/+20
* [tx-robot] updated from transifexNextcloud bot2017-06-192-2/+2
* [tx-robot] updated from transifexNextcloud bot2017-06-178-18/+20
* [tx-robot] updated from transifexNextcloud bot2017-06-166-6/+14
* [tx-robot] updated from transifexNextcloud bot2017-06-154-0/+6
* Revert "allow admin to disable groups on personal page"Morris Jobke2017-06-132-3/+0
* Merge pull request #5120 from nextcloud/backport-5118-use-language-of-recipie...Morris Jobke2017-06-121-1/+32
|\
| * Use the language of the recipient not the actorJoas Schilling2017-05-261-1/+32
* | [tx-robot] updated from transifexNextcloud bot2017-06-132-6/+6
* | Merge pull request #5272 from nextcloud/stable12-5271Morris Jobke2017-06-121-5/+1
|\ \
| * | Also use IMailer interface to generate the email templateMorris Jobke2017-06-061-5/+1
* | | [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