1965889fc8
[tx-robot] updated from transifex
2017-06-15 00:08:52 +00:00
c4b65ab5e2
Revert "allow admin to disable groups on personal page"
...
This reverts commit 28e1a9da6c#5259
2017-06-13 11:17:48 -05:00
7db495a246
Merge pull request #5120 from nextcloud/backport-5118-use-language-of-recipient-not-admin
...
[stable12] Use the language of the recipient not the actor
2017-06-12 22:31:08 -05:00
e0d8b17b20
[tx-robot] updated from transifex
2017-06-13 00:08:32 +00:00
a4cba7df69
Merge pull request #5272 from nextcloud/stable12-5271
...
[stable12] Also use IMailer interface to generate the email template
2017-06-12 17:51:07 -05:00
ea39d4feec
[tx-robot] updated from transifex
2017-06-11 00:08:31 +00:00
b11d197d52
[tx-robot] updated from transifex
2017-06-10 00:08:47 +00:00
5722afc1d7
Merge pull request #5123 from patschi/patch-2
...
[stable12] Backported Fix #5059
2017-06-08 20:07:25 -05:00
6434305333
[tx-robot] updated from transifex
2017-06-09 00:08:34 +00:00
11ff813c8c
Merge pull request #5285 from nextcloud/personal-sessions-renamwe-12
...
[12] reword sessions to security in personal settings
2017-06-08 12:09:14 +02:00
d00c5886aa
[tx-robot] updated from transifex
2017-06-08 00:08:37 +00:00
6e765ccf39
unify look of disabled display name / email address and the other input fields
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-06-07 11:43:31 -05:00
ee53a2ed42
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 11:43:27 -05:00
d866547805
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:30:56 -05:00
d08a6c74ab
Merge pull request #5186 from nextcloud/backport-5126-email-change-spam
...
[stable12] Don't trigger activity when the email didn't change
2017-06-07 11:14:00 -05:00
4972f9409a
reword sessions to security in personal settings
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-06-07 14:36:47 +02:00
85418640b3
[tx-robot] updated from transifex
2017-06-07 00:09:14 +00:00
952caf8f85
Also use IMailer interface to generate the email template
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-06-06 10:48:53 -05:00
f29d53f509
Merge pull request #5270 from nextcloud/stable12-5223
...
[stable12] Don't allow the user to set fields they can't see
2017-06-06 16:58:16 +02:00
3cacc05217
Merge pull request #5261 from nextcloud/disable-groups-on-personal-page-nc12
...
[stable12] allow admin to disable groups on personal page
2017-06-06 08:53:55 -05:00
a62b292dc5
Also cover the settings endpoint
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-06 08:11:31 -05:00
91de490b9e
Bring back the description for app passwords
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-06 13:48:11 +02:00
c3cd07ec15
Combine sessions and app passwords view into one single view
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-06-06 13:47:59 +02:00
de809b4ac7
allow admin to disable groups on personal page
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-06-06 10:12:26 +02:00
cf3988e248
[tx-robot] updated from transifex
2017-06-04 00:08:39 +00:00
5d6345ea4b
[tx-robot] updated from transifex
2017-06-03 00:09:12 +00:00
52f6c22954
Merge pull request #5224 from nextcloud/useful-gs-settings-stable12
...
[stable12] add new config switched for the global scale architecture
2017-06-02 20:18:45 +02:00
a61aabea83
Merge pull request #5225 from nextcloud/no-client-info-without-firstrunwizard
...
Don't show client info, when the app is disabled
2017-06-02 18:09:54 +02:00
777e7bbf53
Don't show client info, when the app is disabled
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-02 11:25:20 +02:00
6e7ff24474
add new config switched for the global scale architecture
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-06-02 11:00:08 +02:00
577ea59968
[tx-robot] updated from transifex
2017-06-02 00:08:40 +00:00
db22c42e78
[tx-robot] updated from transifex
2017-06-01 00:08:48 +00:00
ea9613efa0
Don't trigger activity when the email didn't change
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-31 11:17:11 +02:00
99117349df
[tx-robot] updated from transifex
2017-05-31 00:08:57 +00:00
6ae58b6dcb
[tx-robot] updated from transifex
2017-05-30 00:08:54 +00:00
2d8ec64ee5
[tx-robot] updated from transifex
2017-05-29 00:08:44 +00:00
df3efa4984
[tx-robot] updated from transifex
2017-05-28 00:08:24 +00:00
2e223cd1dc
[tx-robot] updated from transifex
2017-05-27 00:08:42 +00:00
fd0c102f24
Backported Fix #5059 to stable12 by adding sanity checks before using var
...
Signed-off-by: Patrik Kernstock <info@pkern.at>
2017-05-26 12:16:46 +02:00
d8abc4c16c
Use the language of the recipient not the actor
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-26 11:08:37 +02:00
0ed02da5dd
[tx-robot] updated from transifex
2017-05-26 00:08:26 +00:00
13d1c95db1
[tx-robot] updated from transifex
2017-05-25 00:08:13 +00:00
9055109243
[tx-robot] updated from transifex
2017-05-24 00:08:31 +00:00
6e005e0ffa
[tx-robot] updated from transifex
2017-05-23 00:08:39 +00:00
9325003a72
[tx-robot] updated from transifex
2017-05-22 00:08:32 +00:00
fa47ed7979
[tx-robot] updated from transifex
2017-05-21 00:08:35 +00:00
df61c9e283
[tx-robot] updated from transifex
2017-05-20 00:08:37 +00:00
5fbfebac35
Fix group restriction regression
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-19 12:09:49 -05:00
90837b9175
Merge pull request #4949 from nextcloud/workaround-4948
...
Lowercase the scriptname again
2017-05-19 12:37:53 +02:00
e14bd212f7
[tx-robot] updated from transifex
2017-05-19 00:08:36 +00:00
Nextcloud bot
Morris Jobke
Robin Appelman
Bjoern Schiessle
Joas Schilling
Christoph Wurst
Patrik Kernstock
Lukas Reschke