Morris Jobke
8760abae63
Revert "allow admin to disable groups on personal page"
...
This reverts commit 28e1a9da6c
.
See #5259
2017-06-13 10:43:21 -05:00
Nextcloud bot
ea64cb0028
[tx-robot] updated from transifex
2017-06-13 00:08:22 +00:00
Morris Jobke
aa243376ef
Merge pull request #5271 from nextcloud/use-mailer-to-create-email-template
...
Also use IMailer interface to generate the email template
2017-06-12 17:52:52 -05:00
m4dz
56adbb4e1d
[docs] remove useless TODO mark
2017-06-12 11:19:31 +02:00
m4dz
5feabd4634
[fix] Highlight 'everyone' group by default
2017-06-12 10:14:18 +02:00
Nextcloud bot
08702cbaba
[tx-robot] updated from transifex
2017-06-11 00:08:21 +00:00
Marius Blüm
bfbbc57025
Remove unneeded CSS
...
* was removed with #5166 so there is no more apppasswords-section
Signed-off-by: Marius Blüm <marius@lineone.io>
2017-06-10 21:50:25 +02:00
Nextcloud bot
b2892274fc
[tx-robot] updated from transifex
2017-06-10 00:08:38 +00:00
Lukas Reschke
0433c4e4cf
Merge pull request #5118 from nextcloud/use-language-of-recipient-not-admin
...
Use the language of the recipient not the actor
2017-06-09 11:34:08 +02:00
Nextcloud bot
628284a34c
[tx-robot] updated from transifex
2017-06-09 00:08:24 +00:00
Joas Schilling
3384c5fb70
Merge pull request #5287 from nextcloud/personal-page-gs-mode
...
show input fields if they are not empty but disable them in global scale mode
2017-06-08 15:03:58 +02:00
Nextcloud bot
a74901fce1
[tx-robot] updated from transifex
2017-06-08 00:08:26 +00:00
Morris Jobke
3ad4a2839f
Allow to change avatar when groups are disables
...
* 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>
2017-06-07 11:27:27 -05:00
Bjoern Schiessle
1ad4268046
unify look of disabled display name / email address and the other input fields
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-06-07 18:07:53 +02:00
Bjoern Schiessle
f5731e1ba4
show input fields if they are not empty but disable them in global scale mode
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-06-07 17:13:29 +02:00
Joas Schilling
3678be045e
Merge pull request #5267 from nextcloud/personal-sessions-renamwe
...
reword sessions to security in personal settings
2017-06-07 10:11:08 +02:00
Nextcloud bot
a3c5d43cd5
[tx-robot] updated from transifex
2017-06-07 00:09:00 +00:00
Morris Jobke
72235064fb
Merge pull request #5259 from nextcloud/disable-groups-on-personal-page
...
allow admin to disable groups on personal page
2017-06-06 11:30:08 -05:00
Morris Jobke
b58928b4c1
Also use IMailer interface to generate the email template
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-06-06 10:47:48 -05:00
Robin Appelman
340fdc1e70
reword sessions to security in personal settings
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-06-06 15:25:28 +02:00
Morris Jobke
15314b6f5b
Merge pull request #5223 from nextcloud/do-not-allow-to-set-invisible-fields
...
Don't allow the user to set fields they can't see
2017-06-06 08:06:39 -05:00
Joas Schilling
3ed8ad1584
Bring back the description for app passwords
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-06 13:44:37 +02:00
Bjoern Schiessle
28e1a9da6c
allow admin to disable groups on personal page
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-06-06 09:58:52 +02:00
Morris Jobke
c092b33466
Merge pull request #5166 from nextcloud/feature/merge-sessions-app-passwords-list
...
Combine sessions and app passwords view into one single view
2017-06-05 23:04:06 -05:00
Nextcloud bot
f03d6f225e
[tx-robot] updated from transifex
2017-06-04 00:08:29 +00:00
Nextcloud bot
5d39f700e4
[tx-robot] updated from transifex
2017-06-03 00:09:00 +00:00
Joas Schilling
19041ed1a8
Also cover the settings endpoint
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-02 12:31:37 +02:00
Björn Schießle
74fccf20c8
Merge pull request #5084 from nextcloud/useful-gs-settings
...
add new config switched for the global scale architecture
2017-06-02 10:58:43 +02:00
Nextcloud bot
c70de161cf
[tx-robot] updated from transifex
2017-06-02 00:08:30 +00:00
Nextcloud bot
8801b68d45
[tx-robot] updated from transifex
2017-06-01 00:08:38 +00:00
Nextcloud bot
5f9cc5a2d5
[tx-robot] updated from transifex
2017-05-31 00:08:48 +00:00
Christoph Wurst
593f6281dc
Combine sessions and app passwords view into one single view
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-05-30 09:54:10 +02:00
Nextcloud bot
b9b7f8bede
[tx-robot] updated from transifex
2017-05-30 00:08:44 +00:00
Bjoern Schiessle
7c2d473d76
add new config switched for the global scale architecture
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-05-29 18:19:28 +02:00
Nextcloud bot
4be17dff0f
[tx-robot] updated from transifex
2017-05-29 00:08:33 +00:00
Lukas Reschke
caccb9ca9c
Merge pull request #5126 from nextcloud/setting-the-same-email-shouldnt-trigger-activity
...
Don't trigger activity when the email didn't change
2017-05-28 18:25:09 +01:00
Nextcloud bot
4f2b26d246
[tx-robot] updated from transifex
2017-05-28 00:08:14 +00:00
Nextcloud bot
e3e3e8edf2
[tx-robot] updated from transifex
2017-05-27 00:08:32 +00:00
Joas Schilling
7ef6f065ca
Don't trigger activity when the email didn't change
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-26 12:49:12 +02:00
Björn Schießle
53c8e98f69
Merge pull request #5095 from patschi/patch-1
...
Fix #5059 by adding sanity checks before using var
2017-05-26 12:10:57 +02:00
Joas Schilling
cec6ceba9c
Use the language of the recipient not the actor
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-26 10:16:14 +02:00
Nextcloud bot
c1925ddfd0
[tx-robot] updated from transifex
2017-05-26 00:08:16 +00:00
Nextcloud bot
a46d2f1d39
[tx-robot] updated from transifex
2017-05-25 00:08:04 +00:00
Patrik Kernstock
dba8927011
Fix #5059 by adding sanity checks before using var
...
Signed-off-by: Patrik Kernstock <info@pkern.at>
2017-05-24 15:08:29 +02:00
Nextcloud bot
6cc26efbc5
[tx-robot] updated from transifex
2017-05-24 00:08:22 +00:00
Nextcloud bot
9c8a838624
[tx-robot] updated from transifex
2017-05-23 00:08:29 +00:00
Nextcloud bot
462f12611c
[tx-robot] updated from transifex
2017-05-22 00:08:23 +00:00
Nextcloud bot
c677f49469
[tx-robot] updated from transifex
2017-05-21 00:08:26 +00:00
Nextcloud bot
a442c86a84
[tx-robot] updated from transifex
2017-05-20 00:08:27 +00:00
Morris Jobke
c7ade85982
Fix group restriction regression
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-19 12:05:09 -05:00