summaryrefslogtreecommitdiffstats
path: root/settings
Commit message (Collapse)AuthorAgeFilesLines
* Allow to force a language and set it via the ocs apiJoas Schilling2017-06-215-155/+82
| | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* [tx-robot] updated from transifexNextcloud bot2017-06-214-0/+210
|
* Also allow group admins to toogle the storage locationJoas Schilling2017-06-201-10/+8
| | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* [tx-robot] updated from transifexNextcloud bot2017-06-204-18/+20
|
* Don't try to save the setting when its not an adminJoas Schilling2017-06-191-8/+24
| | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* [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
| | | | | | This reverts commit 28e1a9da6cd3bce3cc843727d54094db4969dd7b. See #5259
* [tx-robot] updated from transifexNextcloud bot2017-06-132-6/+6
|
* Merge pull request #5271 from nextcloud/use-mailer-to-create-email-templateMorris Jobke2017-06-121-5/+1
|\ | | | | Also use IMailer interface to generate the email template
| * Also use IMailer interface to generate the email templateMorris Jobke2017-06-061-5/+1
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | [docs] remove useless TODO markm4dz2017-06-121-1/+0
| |
* | [fix] Highlight 'everyone' group by defaultm4dz2017-06-121-0/+3
| |
* | [tx-robot] updated from transifexNextcloud bot2017-06-116-0/+6
| |
* | Remove unneeded CSSMarius Blüm2017-06-101-4/+0
| | | | | | | | | | | | * was removed with #5166 so there is no more apppasswords-section Signed-off-by: Marius Blüm <marius@lineone.io>
* | [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 actor
| * | Use the language of the recipient not the actorJoas Schilling2017-05-261-1/+32
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | [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
|\ \ \ | | | | | | | | show input fields if they are not empty but disable them in global scale mode
| * | | unify look of disabled display name / email address and the other input fieldsBjoern Schiessle2017-06-072-10/+11
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
| * | | show input fields if they are not empty but disable them in global scale modeBjoern Schiessle2017-06-071-7/+29
| | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | [tx-robot] updated from transifexNextcloud bot2017-06-0880-140/+352
| | | |
* | | | Allow to change avatar when groups are disablesMorris Jobke2017-06-072-3/+8
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * password form overlaps upload button and doesn't allow to click it * regression from #5259 Signed-off-by: Morris Jobke <hey@morrisjobke.de> make sure that we always clear all floating rules after the user settings parts Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | Merge pull request #5267 from nextcloud/personal-sessions-renamweJoas Schilling2017-06-074-22/+22
|\ \ \ | | | | | | | | reword sessions to security in personal settings
| * | | reword sessions to security in personal settingsRobin Appelman2017-06-064-22/+22
| | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | [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 page
| * | | allow admin to disable groups on personal pageBjoern Schiessle2017-06-062-0/+3
| |/ / | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | Merge pull request #5223 from nextcloud/do-not-allow-to-set-invisible-fieldsMorris Jobke2017-06-061-19/+31
|\ \ \ | | | | | | | | Don't allow the user to set fields they can't see
| * | | Also cover the settings endpointJoas Schilling2017-06-021-19/+31
| | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | | Bring back the description for app passwordsJoas Schilling2017-06-061-0/+4
| |/ / |/| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #5166 from ↵Morris Jobke2017-06-054-85/+33
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/feature/merge-sessions-app-passwords-list Combine sessions and app passwords view into one single view
| * | | Combine sessions and app passwords view into one single viewChristoph Wurst2017-05-304-85/+33
| | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | [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 architecture
| * | | | add new config switched for the global scale architectureBjoern Schiessle2017-05-291-2/+8
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
* | | | | [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 ↵Lukas Reschke2017-05-281-0/+6
|\ \ | | | | | | | | | | | | nextcloud/setting-the-same-email-shouldnt-trigger-activity Don't trigger activity when the email didn't change
| * | Don't trigger activity when the email didn't changeJoas Schilling2017-05-261-0/+6
| |/ | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | [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 var