Commit Graph

3636 Commits

Author SHA1 Message Date
Morris Jobke 4158f386b5
add a bit of space around paragraphs
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-01-17 11:38:09 +01:00
Morris Jobke bc604299b5
fix list style of app description
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-01-17 11:37:50 +01:00
Joas Schilling e05f53e018
Allow ordered lists as well
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-17 11:37:37 +01:00
Lukas Reschke a30d170aca
Manually whitelist tags
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-01-17 11:37:26 +01:00
Lukas Reschke 2382bf9011
Apply DOMPurify over HTML
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-01-17 11:37:16 +01:00
Morris Jobke 45c12d26ce
Fix JSUnit tests
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-01-17 11:37:06 +01:00
Joas Schilling a21dfdf8e7
Don't render non HTTP links, images and quotes
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-17 11:36:49 +01:00
Joas Schilling eb94f748c8
Render markdown
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-01-17 11:36:23 +01:00
Nextcloud bot f044edaadc
[tx-robot] updated from transifex 2017-01-16 01:15:59 +00:00
Nextcloud bot fc2a2c3ee9
[tx-robot] updated from transifex 2017-01-12 01:07:53 +00:00
Nextcloud bot 685381f3a1
[tx-robot] updated from transifex 2017-01-11 15:20:31 +00:00
Nextcloud bot 639391717d
[tx-robot] updated from transifex 2017-01-09 08:25:08 +00:00
Nextcloud bot 2c2c4cc6c7
[tx-robot] updated from transifex 2017-01-05 13:10:01 +00:00
Nextcloud bot 14bc90df9e
[tx-robot] updated from transifex 2017-01-03 01:07:56 +00:00
Nextcloud bot c9039a59aa
[tx-robot] updated from transifex 2017-01-02 01:07:41 +00:00
Nextcloud bot 768f1cf533
[tx-robot] updated from transifex 2016-12-30 01:07:36 +00:00
Nextcloud bot a2b45c3cb7
[tx-robot] updated from transifex 2016-12-29 01:08:08 +00:00
Nextcloud bot a4c85c76a9
[tx-robot] updated from transifex 2016-12-28 01:07:49 +00:00
Nextcloud bot ca6d8c5eba
[tx-robot] updated from transifex 2016-12-27 01:07:48 +00:00
Nextcloud bot 015408fc3a
[tx-robot] updated from transifex 2016-12-26 01:09:33 +00:00
Morris Jobke a581e2fab3 Merge pull request #2751 from nextcloud/backport-2643-apps-buttons-wording
[stable11] fix wording for apps mgmt buttons
2016-12-22 14:39:16 +01:00
amittel a1779827c5
Changed anchor
from `avatar` to `personal-settings`

fixes #2711
2016-12-21 17:09:04 +01:00
Jan-Christoph Borchardt c86f779e4a
fix wording for apps mgmt buttons
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-12-19 11:54:38 +01:00
Nextcloud bot 0c6c85bafb
[tx-robot] updated from transifex 2016-12-12 01:07:18 +00:00
Lukas Reschke aedd1fc9a0 Merge pull request #2598 from nextcloud/fix_2403
Check for app updates on disabled page
2016-12-10 12:21:20 +01:00
Nextcloud bot 7cb99e74db
[tx-robot] updated from transifex 2016-12-10 01:07:15 +00:00
Roeland Jago Douma d59ffb8bf1
Check for app updates on disabled page
Fixes #2403

We need to check for updates of disabled apps so that if you update with
incompatible apps you at least get a chance to upgrade.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2016-12-09 22:30:54 +01:00
Christoph Wurst fbc494234b Fix dev manual link for NC11
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2016-12-09 19:32:16 +01:00
Nextcloud bot 88d90066ba
[tx-robot] updated from transifex 2016-12-09 01:07:18 +00:00
Joas Schilling 10daad9346
Allow non-subadmins to change their language
Signed-off-by: Joas Schilling <coding@schilljs.com>
2016-12-08 16:24:21 +01:00
Roeland Jago Douma 158cc9c261 Merge pull request #2545 from nextcloud/fix-popover-width
Fix popover width
2016-12-08 13:49:56 +01:00
Roeland Jago Douma ce707912b4 Merge pull request #2534 from nextcloud/fix-avatar-upload-buttons
Fix avatar delete button
2016-12-08 13:44:26 +01:00
Nextcloud bot 74d1b0bada
[tx-robot] updated from transifex 2016-12-08 01:07:26 +00:00
John Molakvoæ (skjnldsv) efbbf4d865
Fix popover federationScopeMenu
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2016-12-07 11:29:55 +01:00
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