Commit Graph

3494 Commits

Author SHA1 Message Date
Lukas Reschke 54f80ce6d9
Add SubAdminMiddleware back
Removed by mistake in #1946

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-22 13:33:23 +01:00
Roeland Jago Douma 9c52f16dbb Merge pull request #2228 from nextcloud/use-appid-instead-of-app-element
Use app ID instead of object
2016-11-22 10:06:33 +01:00
Nextcloud bot b0cf78aa1e
[tx-robot] updated from transifex 2016-11-22 01:06:54 +00:00
Lukas Reschke 8ee11956da
Use app ID instead of object
Fixes several error messages when installing an app from the appstore, including:

```
Illegal offset type in isset or empty at /media/psf/stable9/lib/private/legacy/app.php#662
Illegal offset type at /media/psf/stable9/lib/private/legacy/app.php#663
Illegal offset type at /media/psf/stable9/lib/private/legacy/app.php#661
Object of class OC_App could not be converted to string at /media/psf/stable9/lib/private/legacy/app.php#81
trim() expects parameter 1 to be string, object given at /media/psf/stable9/lib/private/legacy/app.php#628
```

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-22 00:24:23 +01:00
Lukas Reschke 1e06d0bb47 Merge pull request #2221 from nextcloud/from-is-featured-to-featured
Error log spam: Cast "isFeatured" to "featured"
2016-11-21 23:11:29 +01:00
Lukas Reschke e2bfce0d26
Cast "isFeatured" to "featured"
The appstore returns a "isFeatured" in the current API revision. We need to cast this thus.

Fixes the following error log message when opening the tab "Customization":

> Undefined index: featured at /media/psf/stable9/settings/Controller/AppSettingsController.php#233

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-21 21:34:37 +01:00
Bjoern Schiessle 2a712abdfd
use date as device name if no name was given
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-21 20:28:21 +01:00
Robin Appelman cd24010fa4 Merge pull request #2214 from nextcloud/remove-logging
remove old logging section
2016-11-21 17:17:02 +01:00
Robin Appelman c694bd3455
remove old logging section
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-11-21 13:46:31 +01:00
Bjoern Schiessle a1ca54a0ae
center checkmark to indicate that the setting was stored 2016-11-21 11:30:03 +01:00
Bjoern Schiessle 4a05aa8a02
don't try to verify email address if no email address is set 2016-11-21 11:30:03 +01:00
Bjoern Schiessle 5aed91c321
small fixes
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-21 11:30:03 +01:00
Lukas Reschke 16181c5463
Ask for password when scope is changed
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-21 11:30:02 +01:00
Lukas Reschke e87933bc3d
Fix mail scope
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-21 11:30:02 +01:00
Lukas Reschke 5acc3d3c5e
Highlight current entry
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-21 11:30:02 +01:00
Lukas Reschke a0c64044b2
Make JS aware of password verification
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-21 11:30:02 +01:00
Jan-Christoph Borchardt 6e783f8345
make icons a bit smaller
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-21 11:30:01 +01:00
Jan-Christoph Borchardt f062c6daee
fix menu positioning hack
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-21 11:30:01 +01:00
Jan-Christoph Borchardt e53e585e91
put explanatory text directly in popup
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-11-21 11:30:01 +01:00
Lukas Reschke 8bf4111368
Fix changing display names for subadmins
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-21 11:30:00 +01:00
Lukas Reschke 662dff046d
Adjust permission checks
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-21 11:30:00 +01:00
Lukas Reschke fb91bf6a5b
Add a signer class for signing
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-21 11:30:00 +01:00
Bjoern Schiessle a32d6e481f
fix unit tests
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-21 11:30:00 +01:00
Roeland Jago Douma 056ce5125e
Fix password display issue
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-21 11:29:59 +01:00
Bjoern Schiessle 061ef0cc7c
rearrange input fields
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-21 11:29:59 +01:00
Bjoern Schiessle fa87b2fbf2
limit max-width to have never more than two input fields next to each other
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-21 11:29:59 +01:00
Roeland Jago Douma 845f0bd401
Fix position of menu
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-21 11:29:58 +01:00
Roeland Jago Douma a15809ceed
Fix location of menu
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-21 11:29:58 +01:00
Bjoern Schiessle f489fd99c3
change scope to 'local' for display name and avatar
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-21 11:29:58 +01:00
Bjoern Schiessle 3f8bfbdb11
change order of email and phone number
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-21 11:29:58 +01:00
Robin Appelman f7a4db5040
fix avatar cropper 2016-11-21 11:29:58 +01:00
Bjoern Schiessle 8f33d9d1c0
update system address book if the user change the personal settings
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-21 11:29:57 +01:00
John Molakvoæ (skjnldsv) 987995ac92
Fix popup arrow positioning
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2016-11-21 11:29:57 +01:00
John Molakvoæ (skjnldsv) b75ef0f8b3
Fix popover layout fix for files and global
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2016-11-21 11:29:57 +01:00
Christoph Wurst 77c034fc69
remove double import 2016-11-21 11:29:57 +01:00
Christoph Wurst 9c7533ff6b
fix profile picture fed sharing scope menu
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-11-21 11:29:57 +01:00
Björn Schießle de1f3f05fd
allow to change display names in the user settings again
keep display name and email address in sync with the accounts table

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-21 11:29:54 +01:00
Björn Schießle 1700e3dccc
allow multiple values for phone, website, address and email
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-21 11:29:50 +01:00
Björn Schießle 445a254c1e
display stored user data
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-21 11:29:43 +01:00
Björn Schießle 40b99734d3
introduce accounts table and keep it up-to-date with the data added to the personal settings
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-21 11:29:41 +01:00
Christoph Wurst d1233b47b0
use PUT to update user settings
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-21 11:29:38 +01:00
Christoph Wurst 78f6e29954
Add federation scope to the user avatar
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-21 11:29:33 +01:00
Christoph Wurst 20739c93a6
Persist settings on the server
Persist personal settings federated sharing scopes

Show new settings fields in read-only mode too

Insert values on page load

Return updated values; show inline success feedback

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-21 11:29:24 +01:00
Christoph Wurst c42d977185
Add more personal information fields to the settings page for enhanced federated sharing
fix layout

Add generic way of handling input change events

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-21 11:29:10 +01:00
Nextcloud bot ba9b17c906
[tx-robot] updated from transifex 2016-11-21 01:06:58 +00:00
Nextcloud bot 97af4f762d
[tx-robot] updated from transifex 2016-11-20 01:06:44 +00:00
Nextcloud bot b1ee9862f8
[tx-robot] updated from transifex 2016-11-19 01:06:44 +00:00
Morris Jobke 332eaec4c0 Merge pull request #1447 from nextcloud/password-confirmation-for-some-actions
Password confirmation for some actions
2016-11-18 15:42:30 +01:00
Morris Jobke 3ffd9a755f
Fix user management callbacks
* properly handle user management actions like display name, email or password field change

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-18 14:19:07 +01:00
Morris Jobke 8ef356a86d
fix displayname
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-18 13:50:18 +01:00