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
e7b5ba8cef
Merge pull request #5291 from nextcloud/stable12-5287
...
[stable12] show input fields if they are not empty but disable them in global scale mode
2017-06-07 16:27:50 -05: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
3ba2d6179a
Merge pull request #5278 from nextcloud/stable12-5277
...
[stable12] Allow to change avatar when groups are disables
2017-06-07 11:42:21 -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
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
b39dfe8eda
adjust the test
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-06 08:11:35 -05:00
a62b292dc5
Also cover the settings endpoint
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-06 08:11:31 -05:00
ce34db22d7
Don't allow the user to set fields they can't see
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-06 08:11:28 -05:00
477f4965ca
Merge pull request #5266 from nextcloud/backport-5166-combine-apptokens-and-sessions
...
[stable12] combine apptokens and sessions
2017-06-06 08:03:04 -05:00
3cae858852
Update autoloader
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-06-06 08:01:52 -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
7ff205cf94
[tx-robot] updated from transifex
2017-06-06 00:08:55 +00:00
413221bfe1
[tx-robot] updated from transifex
2017-06-05 00:08:38 +00: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
2d15803a82
Merge pull request #5216 from nextcloud/5213-stable12
...
[stable12] Trigger changeUser hook only on real changes
2017-06-02 13:16:16 +02:00
d2734c6dbe
Merge pull request #5217 from nextcloud/5209-stable12
...
[stable12] fix install on mb4 enabled mariadb/mysql
2017-06-02 13:11:33 +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
0d893f09c4
fix install on mb4 enabled mariadb/mysql
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-01 13:12:30 +02:00
c1f4191a77
emit changeUser only if there really was a change (quota, displayname)
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-01 13:08:23 +02:00
db22c42e78
[tx-robot] updated from transifex
2017-06-01 00:08:48 +00:00
bb583580d7
Merge pull request #5127 from nextcloud/backport-5090-fixing-missing-background-jobs-on-app-update
...
[stable12] Register the autoloading earlier so we can load the background jobs
2017-05-31 11:19:21 +02: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
628a98ed62
Register the autoloading earlier so we can load the background jobs
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-26 12:53:33 +02: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
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
d00d96c902
Merge pull request #5073 from nextcloud/external-get-for-group-sql-type-12
...
[12] use the correct param type when getting external storages for groups
2017-05-23 22:39:34 +02:00
Nextcloud bot
Morris Jobke
Robin Appelman
Bjoern Schiessle
Joas Schilling
Christoph Wurst
blizzz
Patrik Kernstock
Roeland Jago Douma