Commit Graph

3602 Commits

Author SHA1 Message Date
John Molakvoæ (skjnldsv) 73c4112770
Fix #2473
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2016-12-06 18:07:55 +01:00
Robin Appelman ab993ad486
hide token configure menu when clicking outside it
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-12-06 15:43:37 +01:00
Robin Appelman 4f6993a15e
hide all other token dropdowns when showing one
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-12-06 14:11:54 +01:00
Robin Appelman af6ee647da
center arrow for token dropdown
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-12-06 14:11:37 +01:00
Nextcloud bot 2a647f4d3a
[tx-robot] updated from transifex 2016-12-06 01:07:19 +00:00
Lukas Reschke 7fe02702b0 Merge pull request #2509 from nextcloud/sudo-mode-for-app-enabling
Add sudo mode to enabling and disabling apps
2016-12-05 22:06:14 +01:00
Christoph Wurst 0478db6506 Merge pull request #2484 from nextcloud/fix-wrong-update-of-email-address
make sure that we only update the email address if it really changed
2016-12-05 17:14:23 +01:00
Morris Jobke 86a53b4e19 Merge pull request #2501 from nextcloud/issue-2472-remove-update-notification-after-updating
Remove the update warning and the notification after an successful up…
2016-12-05 15:33:41 +01:00
Lukas Reschke becde58952
Add sudo mode to enabling and disabling apps
Otherwise an administrator could bypass sudo mode by installing an app that allows RCE by design. I've by intention excluded the update endpoint from the requirement because updating apps should be as unintruisive as possible.

Not the cleanest approach by adding this to the AJAX endpoints instead of requiring a controller but for 11 this felt safer for me. We can clean this up together later then. (also the other AJAX endpoints in this folder do have the same logic)

Ref https://github.com/nextcloud/server/issues/2487

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-12-05 15:12:28 +01:00
Morris Jobke 8adf617726 Merge pull request #2468 from nextcloud/fix-personal-settings-readonly
personal settings: handle read-only parameters correctly
2016-12-05 12:15:04 +01:00
Morris Jobke decce7ec8d Merge pull request #2502 from nextcloud/personal-settings-dead-code
remove dead js code from personal settings
2016-12-05 12:06:05 +01:00
Joas Schilling 3a653b56ee
Remove the update warning and the notification after an successful update
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-05 10:50:28 +01:00
Christoph Wurst 46abd9e3d9
remove dead js code from personal settings
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-12-05 10:50:04 +01:00
Christoph Wurst b19b788e7a
Allow emtpy values on personal page and fix saving checkmark position
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-12-05 10:48:52 +01:00
Bjoern Schiessle 9e66d5d7cf
hide password recovery note if email address can't be set
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-12-05 10:03:39 +01:00
Roeland Jago Douma eeb81ec783 Merge pull request #2491 from nextcloud/fix-groups-enable-visual
Put "Enable only for specific groups" into a new div
2016-12-05 08:45:18 +01:00
Nextcloud bot dda39728e3
[tx-robot] updated from transifex 2016-12-05 01:07:41 +00:00
John Molakvoæ (skjnldsv) 0d61707e25 Change groups enable to block element
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: Felix A. Epp <work@felixepp.de>
2016-12-05 00:02:41 +01:00
Nextcloud bot 3bea7ac6ac
[tx-robot] updated from transifex 2016-12-04 01:07:30 +00:00
John Molakvoæ cd2c17bf83 Merge pull request #2434 from nextcloud/app-list-grow
dont grow items in the app list
2016-12-03 09:20:39 +01:00
John Molakvoæ (skjnldsv) f82a40d478
use flex and specify rows to align everything
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2016-12-03 08:34:11 +01:00
Nextcloud bot 181cf9c7f3
[tx-robot] updated from transifex 2016-12-03 01:07:26 +00:00
Bjoern Schiessle f25ad2e404
make sure that we only update the email address if it really changed
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-12-02 18:07:08 +01:00
Bjoern Schiessle 2f517899a2
handle read-only parameters correctly
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-12-02 14:43:54 +01:00
Nextcloud bot 1b5ff9f5c7
[tx-robot] updated from transifex 2016-12-02 01:07:35 +00:00
Robin Appelman 214b9b74c4
dont grow items in the app list
Signed-off-by: Robin Appelman <robin@icewind.nl>
2016-12-01 14:17:47 +01:00
Lukas Reschke 1eab2a63c6 Merge pull request #2423 from nextcloud/fix-language-names
Fix naming of languages
2016-12-01 13:39:17 +01:00
Roeland Jago Douma 220452e943 Merge pull request #2425 from nextcloud/show-real-apps-rating
Show app store rating only for 5+ votes
2016-12-01 11:56:33 +01:00
Nextcloud bot 4ca7f9c896
[tx-robot] updated from transifex 2016-12-01 01:07:17 +00:00
Morris Jobke 9f27c2b3e7
Show app store rating only for 5+ votes
* shows the rating of an app only if a given amount of ratings are given
* fixes #2001

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-30 15:59:02 +01:00
Morris Jobke 01a62dee30
Language
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-30 15:20:04 +01:00
Nextcloud bot f075c22c72
[tx-robot] updated from transifex 2016-11-30 14:18:08 +00:00
Morris Jobke 0b4ff4f747
Fix password change in user management
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2016-11-30 13:36:37 +01:00
Morris Jobke 86168c8ea7 Merge pull request #1446 from nextcloud/fix-mail-design
Fix mail design
2016-11-30 11:31:43 +01:00
Roeland Jago Douma 8e361b723c
Fix minor mail issues
* a nextcloud
* Strong username & url

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-11-30 08:51:50 +01:00
Nextcloud bot 41dcceeb35
[tx-robot] updated from transifex 2016-11-30 01:07:16 +00:00
Felix Epp 6aa79cacfd Fix mail header logo [fixes #1326]
Signed-off-by: Felix A. Epp <work@felixepp.de>
2016-11-30 01:06:47 +01:00
Nextcloud bot 0fb912e724
[tx-robot] updated from transifex 2016-11-29 17:57:47 +00:00
Nextcloud bot a84dacc16f
[tx-robot] updated from transifex 2016-11-29 17:03:24 +00:00
Nextcloud bot e8ea9a5d27
[tx-robot] updated from transifex 2016-11-29 01:06:47 +00:00
Lukas Reschke 9dead382ef
Fix Regex for iPhone and add iPad
The previous Regex worked for an iPhone with version "10.0" but not with "10.0.1" which was wrong. I modified the Regex to also match for those situations.

I also added a Regex for the iPad

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-28 18:42:49 +01:00
Nextcloud bot 4e682d4113
[tx-robot] updated from transifex 2016-11-28 01:06:56 +00:00
Nextcloud bot 9788cf04ee
[tx-robot] updated from transifex 2016-11-27 01:07:08 +00:00
Nextcloud bot 8f4ec8583d
[tx-robot] updated from transifex 2016-11-26 01:06:57 +00:00
Morris Jobke 64fb0fb3dd Merge pull request #2276 from nextcloud/update-email-address
Update email address
2016-11-25 11:40:20 +01:00
Bjoern Schiessle 0de685c562
bring back setEmailAddress for the user management
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-25 10:26:48 +01:00
John Molakvoæ (skjnldsv) dc4ceb7338
Loading icon fix #2198
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2016-11-24 17:28:21 +01:00
blizzz cb69accdc5 Merge pull request #2307 from nextcloud/better-filter-on-appstore
Loop for newest version in appstore response
2016-11-24 16:57:14 +01:00
Lukas Reschke cbf943301f Merge pull request #2224 from nextcloud/fix-visibility-switcher
Fix visibility switcher for avatar
2016-11-24 15:47:55 +01:00
Lukas Reschke 7162166bae
Also show updates on the "enabled" page
The enabled page doesn't pass through "getAppsForCategory" thus it also needs to have that special logic applied.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-24 15:04:23 +01:00
Bjoern Schiessle 546989959c
update email address correctly
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
2016-11-23 20:19:31 +01:00
Joas Schilling f0670aadbe Merge pull request #2239 from nextcloud/cleanup-settings-application-again
Cleanup settings application again
2016-11-23 11:07:10 +01:00
Joas Schilling 7b0b7e801f Merge pull request #2250 from nextcloud/check-if-data-is-defined
Check if data is defined
2016-11-22 20:31:32 +01:00
Lukas Reschke 623c02fe6e
Remove superfluous email input field
That field is already there and looking at the code this seems to have been missed on a rebase.

Fixes https://github.com/nextcloud/server/issues/2222

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-22 18:29:09 +01:00
Lukas Reschke e827be759d
Check if data is defined
Otherwise when adding a user as subadmin this would throw the following JS error:

```
users.js?v=bc2aae7…:500 Uncaught TypeError: Cannot read property 'message' of undefined(…)(anonymous function) @ users.js?v=bc2aae7…:500j @ jquery.js:3099fireWith @ jquery.js:3211x @ jquery.js:8264(anonymous function) @ jquery.js:8605
```

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-22 18:23:48 +01:00
Joas Schilling 7f1bf10044
Clean up the Application class again
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-11-22 15:04:03 +01:00
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 91f735acf3
Make Christoph happier
Apparently this failed for him as per https://github.com/nextcloud/server/pull/2224#issuecomment-262085537

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-21 23:21:53 +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 267ecab405
Fix visibility switcher for avatar
Fixes #2223

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2016-11-21 21:50:57 +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