Arthur Schiwon
07cf046216
take over changes from #5166 and follow #5267
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-23 12:37:42 +02:00
Robin Appelman
e8f5c21db9
Fix trait usage
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-06-23 12:37:42 +02:00
Arthur Schiwon
f873182965
remove obsolete files
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-23 12:37:41 +02:00
Arthur Schiwon
3dca4de8b3
add Additional (+ Fallback) section for Personal settings
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-23 12:36:38 +02:00
Arthur Schiwon
d56e86cfde
sync clients have their own place
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-23 12:36:38 +02:00
Arthur Schiwon
8c076e0bda
take over app passwords
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-23 12:36:38 +02:00
Arthur Schiwon
489ac4391b
convert Sessions section
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-23 12:36:38 +02:00
Arthur Schiwon
8bd887b2c6
add storage info, fix URL generation
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-23 12:36:38 +02:00
Arthur Schiwon
045f652ef2
completing PersonalInfo
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-23 12:36:37 +02:00
Arthur Schiwon
039ee7e3aa
brief, incomplete personal info settings implementation
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-23 12:36:37 +02:00
Arthur Schiwon
560ab2e911
one settings link, common template, styling
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-23 12:36:37 +02:00
Arthur Schiwon
247b305b79
add route and controller. consolidate common settings functions in a trait.
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2017-06-23 12:36:17 +02:00
blizzz
d9beeaec90
Merge pull request #5508 from nextcloud/no-activity-before-login
...
Don't create activities for email and password change before login
2017-06-23 12:04:49 +02:00
Nextcloud bot
c935f1f9cc
[tx-robot] updated from transifex
2017-06-23 00:09:12 +00:00
Joas Schilling
c50cb6ad81
Don't create activities for email and password change before login
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-22 09:02:12 +02:00
Joas Schilling
7816c54625
Allow to force a language and set it via the ocs api
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-21 11:34:52 +02:00
Nextcloud bot
146c699eb4
[tx-robot] updated from transifex
2017-06-21 00:08:15 +00:00
Joas Schilling
90fa27694a
Use PNG version of the icons for shipped activities
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-20 13:48:51 +02:00
Joas Schilling
e30ed1de84
Also allow group admins to toogle the storage location
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-20 10:35:22 +02:00
Nextcloud bot
2660a3b49c
[tx-robot] updated from transifex
2017-06-20 00:08:41 +00:00
Joas Schilling
35413d9912
Don't try to save the setting when its not an admin
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-19 12:55:00 +02:00
Nextcloud bot
76d10bc46b
[tx-robot] updated from transifex
2017-06-19 00:08:20 +00:00
Nextcloud bot
26d6c4a64a
[tx-robot] updated from transifex
2017-06-17 00:08:26 +00:00
Nextcloud bot
74654288e6
[tx-robot] updated from transifex
2017-06-16 00:08:44 +00:00
Robin Appelman
2e8e6f95b9
show used space in user list
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-06-15 14:06:54 +02:00
Nextcloud bot
7a269ae872
[tx-robot] updated from transifex
2017-06-15 00:08:40 +00:00
Joas Schilling
e62e7a201d
Use translated Hint instead of english error on password policy
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-06-14 12:17:16 +02:00
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
Lukas Reschke
dd29e5ab9d
Merge pull request #4950 from nextcloud/master-workaround-4948
...
Lowercase the scriptname again
2017-05-19 12:37:32 +02:00
Nextcloud bot
e24105feba
[tx-robot] updated from transifex
2017-05-19 00:08:26 +00:00
Lukas Reschke
eab9468109
Lowercase the scriptname again
...
Ref https://github.com/nextcloud/server/issues/4948
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-05-19 01:59:00 +02:00
Lukas Reschke
7976927628
Merge pull request #4894 from nextcloud/generic-security-activities
...
Change 2FA activities to more generic security activities
2017-05-19 00:50:44 +02:00
Christoph Wurst
0928b5f621
Change 2FA activities to more generic security activities
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-05-18 22:10:57 +02:00
Bjoern Schiessle
1eb7f4956b
delete auth token when client gets deleted
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2017-05-18 20:49:07 +02:00
Nextcloud bot
d41fd7471c
[tx-robot] updated from transifex
2017-05-18 00:07:48 +00:00
Lukas Reschke
6e6327ec74
Merge pull request #4923 from nextcloud/backgroundjobs-wording
...
Change cron wording to background jobs
2017-05-17 20:38:03 +02:00
Nextcloud bot
11e04e394d
[tx-robot] updated from transifex
2017-05-17 15:56:32 +00:00
Nextcloud bot
443cbdc739
[tx-robot] updated from transifex
2017-05-17 00:08:09 +00:00
Jan-Christoph Borchardt
43cfad705c
Change cron wording to background jobs
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-05-16 21:12:28 +02:00
Nextcloud bot
7d1f362aa0
[tx-robot] updated from transifex
2017-05-16 00:08:08 +00:00
Morris Jobke
be33234266
Remove OC_App:installApp
...
* uses Installer->installApp now
* removes unused code
* fixes #4453
* added some additional checks
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-15 00:03:35 -05:00
Nextcloud bot
9ad57cabc8
[tx-robot] updated from transifex
2017-05-15 00:08:14 +00:00
Nextcloud bot
b1bd9ff0b9
[tx-robot] updated from transifex
2017-05-14 00:07:54 +00:00
Nextcloud bot
6e3a914f4a
[tx-robot] updated from transifex
2017-05-13 00:08:00 +00:00
Lukas Reschke
98a7b34661
Merge pull request #4822 from nextcloud/fix-input-size
...
Fix size of enforced expiry date input
2017-05-12 12:31:30 +02:00
Joas Schilling
16d84815c7
Merge pull request #4826 from nextcloud/hide-cropper-input
...
Hide checkbox in avatarcropper
2017-05-12 09:54:55 +02:00
Morris Jobke
f444090272
Hide checkbox in avatarcropper
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-11 19:18:09 -05:00
Nextcloud bot
645f0aa96f
[tx-robot] updated from transifex
2017-05-12 00:07:46 +00:00
Morris Jobke
768e88a6c0
Fix size of enforced expiry date input
...
* fixes #4819
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-05-11 17:18:00 -05:00
Nextcloud bot
241226c23c
[tx-robot] updated from transifex
2017-05-11 00:08:08 +00:00
Joas Schilling
538d32fe87
Automatic injection into the Fetchers
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-05-10 09:56:38 +02:00