apps/files_trashbin/lib/Controller/PreviewController.php

@@ -85,8 +85,8 @@ class PreviewController extends Controller {
 	 */
 	public function getPreview(
 		int $fileId,
-		int $x = 44,
-		int $y = 44
+		int $x = 128,
+		int $y = 128
 	) {
 
 		if ($x === 0 || $y === 0) {

apps/files_trashbin/src/app.js

@@ -47,7 +47,7 @@ OCA.Trashbin.App = {
 					},
 					{
 						name: 'delete',
-						displayName: t('files', 'Delete'),
+						displayName: t('files_trashbin', 'Delete permanently'),
 						iconClass: 'icon-delete',
 					}
 				],
@@ -95,7 +95,7 @@ OCA.Trashbin.App = {
 
 		fileActions.registerAction({
 			name: 'Delete',
-			displayName: t('files', 'Delete'),
+			displayName: t('files_trashbin', 'Delete permanently'),
 			mime: 'all',
 			permissions: OC.PERMISSION_READ,
 			iconClass: 'icon-delete',

apps/user_ldap/templates/renewpassword.php

@@ -1,8 +1,5 @@
 <?php /** @var $l OC_L10N */ ?>
 <?php
-script('core', [
-	'jquery-showpassword',
-]);
 script('user_ldap', [
 	'renewPassword',
 ]);

core/templates/installation.php

@@ -1,6 +1,5 @@
 <?php
 script('core', [
-	'jquery-showpassword',
 	'installation'
 ]);
 ?>

lib/public/AppFramework/Http/EmptyContentSecurityPolicy.php

@@ -468,7 +468,11 @@ class EmptyContentSecurityPolicy {
 		}
 
 		if(!empty($this->allowedFrameDomains)) {
-			$policy .= 'frame-src ' . implode(' ', $this->allowedFrameDomains);
+			$policy .= 'frame-src ';
+			if(is_string($this->useJsNonce)) {
+				$policy .= '\'nonce-' . base64_encode($this->useJsNonce) . '\' ';
+			}
+			$policy .= implode(' ', $this->allowedFrameDomains);
 			$policy .= ';';
 		}
 

settings/templates/settings/frame.php

@@ -30,8 +30,10 @@ script('files', 'jquery.fileupload');
 
 <div id="app-navigation">
 	<ul>
-		<li class="app-navigation-caption"><?php p($l->t('Personal')); ?></li>
+		<?php if(!empty($_['forms']['admin'])) { ?>
+			<li class="app-navigation-caption"><?php p($l->t('Personal')); ?></li>
 		<?php
+		}
 		foreach($_['forms']['personal'] as $form) {
 			if (isset($form['anchor'])) {
 				$anchor = \OC::$server->getURLGenerator()->linkToRoute('settings.PersonalSettings.index', ['section' => $form['anchor']]);

settings/templates/settings/personal/security.php

@@ -28,7 +28,6 @@ script('settings', [
 
 if($_['passwordChangeSupported']) {
 	script('settings', 'security_password');
-	script('jquery-showpassword');
 }
 
 ?>

tests/acceptance/features/access-levels.feature

@@ -12,7 +12,8 @@ Feature: access-levels
   Scenario: regular users cannot see admin-level items on the Settings page
     Given I am logged in
     When I visit the settings page
-    Then I see that the "Personal" settings panel is shown
+    Then I see that the "Personal info" entry in the settings panel is shown
+    And I see that the "Personal" settings panel is not shown
     And I see that the "Administration" settings panel is not shown
 
   Scenario: admin users can see admin-level items on the Settings page

tests/acceptance/features/bootstrap/SettingsMenuContext.php

@@ -93,6 +93,15 @@ class SettingsMenuContext implements Context, ActorAwareInterface {
 		describedAs($itemText . " item in Settings panel");
 	}
 
+	/**
+	 * @param string $itemText
+	 * @return Locator
+	 */
+	private static function settingsPanelEntryFor($itemText) {
+		return Locator::forThe()->xpath("//div[@id = 'app-navigation']//ul//li[normalize-space() = '$itemText']")->
+		describedAs($itemText . " entry in Settings panel");
+	}
+
 	/**
 	 * @return array 
 	 */
@@ -188,6 +197,15 @@ class SettingsMenuContext implements Context, ActorAwareInterface {
 		);
 	}
 
+	/**
+	 * @Then I see that the :itemText entry in the settings panel is shown
+	 */
+	public function iSeeThatTheItemEntryInTheSettingsPanelIsShown($itemText) {
+		PHPUnit_Framework_Assert::assertTrue(
+			$this->actor->find(self::settingsPanelEntryFor($itemText), 10)->isVisible()
+		);
+	}
+
 	/**
 	 * @Then I see that the :itemText settings panel is not shown
 	 */

tests/acceptance/run.sh

@@ -147,7 +147,18 @@ function prepareDocker() {
 	# "docker cp" does not take them into account (the extracted files are set
 	# to root).
 	echo "Copying local Git working directory of Nextcloud to the container"
-	tar --create --file="$NEXTCLOUD_LOCAL_TAR" --exclude=".git" --exclude="./build" --exclude="./config/config.php" --exclude="./data" --exclude="./data-autotest" --exclude="./tests" --exclude="./apps-extra" --exclude="apps-writable" --directory=../../ .
+	tar --create --file="$NEXTCLOUD_LOCAL_TAR" \
+		--exclude=".git" \
+		--exclude="./build" \
+		--exclude="./config/config.php" \
+		--exclude="./data" \
+		--exclude="./data-autotest" \
+		--exclude="./tests" \
+		--exclude="./apps-extra" \
+		--exclude="./apps-writable" \
+		--exclude="node_modules" \
+		--directory=../../ \
+		.
 	tar --append --file="$NEXTCLOUD_LOCAL_TAR" --directory=../../ tests/acceptance/
 
 	docker exec $NEXTCLOUD_LOCAL_CONTAINER mkdir /nextcloud