10 files changed, 47 insertions, 22 deletions

diff --git a/build/integration/features/bootstrap/BasicStructure.php b/build/integration/features/bootstrap/BasicStructure.php
index 8e1fcf86ba1..8961efc6f31 100644
--- a/build/integration/features/bootstrap/BasicStructure.php
+++ b/build/integration/features/bootstrap/BasicStructure.php
@@ -353,6 +353,30 @@ trait BasicStructure {
 		fclose($file);
 	}
 
+	public function createFileWithText($name, $text){
+		$file = fopen("work/" . "$name", 'w');
+		fwrite($file, $text);
+		fclose($file);
+	}
+
+	/**
+	 * @Given file :filename of size :size is created in local storage
+	 * @param string $filename
+	 * @param string $size
+	 */
+	public function fileIsCreatedInLocalStorageWithSize($filename, $size) {
+		$this->createFileSpecificSize("local_storage/$filename", $size);
+	}
+
+	/**
+	 * @Given file :filename with text :text is created in local storage
+	 * @param string $filename
+	 * @param string $text
+	 */
+	public function fileIsCreatedInLocalStorageWithText($filename, $text) {
+		$this->createFileWithText("local_storage/$filename", $text);
+	}
+
 	/**
 	 * @When User :user empties trashbin
 	 * @param string $user
diff --git a/core/Command/Encryption/EncryptAll.php b/core/Command/Encryption/EncryptAll.php
index 3a0c88c0798..584bc8a70c7 100644
--- a/core/Command/Encryption/EncryptAll.php
+++ b/core/Command/Encryption/EncryptAll.php
@@ -109,10 +109,10 @@ class EncryptAll extends Command {
 		}
 
 		$output->writeln("\n");
-		$output->writeln('You are about to start to encrypt all files stored in your ownCloud.');
-		$output->writeln('It will depend on the encryption module you use which files get encrypted.');
-		$output->writeln('Depending on the number and size of your files this can take some time');
-		$output->writeln('Please make sure that no user access his files during this process!');
+		$output->writeln('You are about to encrypt all files stored in your Nextcloud installation.');
+		$output->writeln('Depending on the number of available files, and their size, this may take quite some time.');
+		$output->writeln('Please ensure that no user accesses their files during this time!');
+		$output->writeln('Note: The encryption module you use determines which files get encrypted.');
 		$output->writeln('');
 		$question = new ConfirmationQuestion('Do you really want to continue? (y/n) ', false);
 		if ($this->questionHelper->ask($input, $output, $question)) {
diff --git a/core/css/header.scss b/core/css/header.scss
index 2f0c1522b0b..cd87a34ece8 100644
--- a/core/css/header.scss
+++ b/core/css/header.scss
@@ -399,7 +399,6 @@ nav {
 
 	/* Profile picture in header */
 	.avatardiv {
-		margin-right: 8px;
 		cursor: pointer;
 		height: 32px;
 		width: 32px;
@@ -458,9 +457,6 @@ nav {
 	.avatardiv.avatardiv-shown + #expandDisplayName {
 		display: none;
 	}
-	#expand {
-		display: block;
-	}
 }
 
 #appmenu {
diff --git a/core/js/sharedialogview.js b/core/js/sharedialogview.js
index 58dd706fb1f..47471955563 100644
--- a/core/js/sharedialogview.js
+++ b/core/js/sharedialogview.js
@@ -120,6 +120,8 @@
 				'_onSelectRecipient',
 				'onShareWithFieldChanged'
 			);
+
+			OC.Plugins.attach('OCA.Share.ShareDialogView', this);
 		},
 
 		onShareWithFieldChanged: function() {
diff --git a/core/js/tests/specHelper.js b/core/js/tests/specHelper.js
index f9bdeae0d64..7897a2f2842 100644
--- a/core/js/tests/specHelper.js
+++ b/core/js/tests/specHelper.js
@@ -177,6 +177,10 @@ window.isPhantom = /phantom/i.test(navigator.userAgent);
 		delete($.fn.select2);
 
 		ajaxErrorStub.restore();
+
+		// reset pop state handlers
+		OC.Util.History._handlers = [];
+
 	});
 })();
 
diff --git a/lib/private/Authentication/Token/DefaultTokenProvider.php b/lib/private/Authentication/Token/DefaultTokenProvider.php
index 0e1196a9da4..6fd85295e03 100644
--- a/lib/private/Authentication/Token/DefaultTokenProvider.php
+++ b/lib/private/Authentication/Token/DefaultTokenProvider.php
@@ -253,10 +253,10 @@ class DefaultTokenProvider implements IProvider {
 	 */
 	public function invalidateOldTokens() {
 		$olderThan = $this->time->getTime() - (int) $this->config->getSystemValue('session_lifetime', 60 * 60 * 24);
-		$this->logger->debug('Invalidating session tokens older than ' . date('c', $olderThan));
+		$this->logger->debug('Invalidating session tokens older than ' . date('c', $olderThan), ['app' => 'cron']);
 		$this->mapper->invalidateOld($olderThan, IToken::DO_NOT_REMEMBER);
 		$rememberThreshold = $this->time->getTime() - (int) $this->config->getSystemValue('remember_login_cookie_lifetime', 60 * 60 * 24 * 15);
-		$this->logger->debug('Invalidating remembered session tokens older than ' . date('c', $rememberThreshold));
+		$this->logger->debug('Invalidating remembered session tokens older than ' . date('c', $rememberThreshold), ['app' => 'cron']);
 		$this->mapper->invalidateOld($rememberThreshold, IToken::REMEMBER);
 	}
 
diff --git a/lib/private/Template/ResourceLocator.php b/lib/private/Template/ResourceLocator.php
index 9015bf5d97c..e82a77ba65f 100755
--- a/lib/private/Template/ResourceLocator.php
+++ b/lib/private/Template/ResourceLocator.php
@@ -84,7 +84,7 @@ abstract class ResourceLocator {
 					$this->doFindTheme($resource);
 				} catch (ResourceNotFoundException $e) {
 					$resourceApp = substr($resource, 0, strpos($resource, '/'));
-					$this->logger->debug('Could not find resource file "' . $e->getResourcePath() . '"', ['app' => $resourceApp]);
+					$this->logger->debug('Could not find resource file in theme "' . $e->getResourcePath() . '"', ['app' => $resourceApp]);
 				}
 			}
 		}
diff --git a/settings/js/personal.js b/settings/js/personal.js
index 89491b96657..52ab2f23f87 100644
--- a/settings/js/personal.js
+++ b/settings/js/personal.js
@@ -20,7 +20,8 @@ OC.Settings = OC.Settings || {};
 jQuery.fn.keyUpDelayedOrEnter = function (callback, allowEmptyValue) {
 	var cb = callback;
 	var that = this;
-	this.keyup(_.debounce(function (event) {
+
+	this.on('input', _.debounce(function (event) {
 		// enter is already handled in keypress
 		if (event.keyCode === 13) {
 			return;
@@ -36,14 +37,6 @@ jQuery.fn.keyUpDelayedOrEnter = function (callback, allowEmptyValue) {
 			cb(event);
 		}
 	});
-
-	this.bind('paste', null, function (event) {
-		if(!event.keyCode){
-			if (allowEmptyValue || that.val() !== '') {
-				cb(event);
-			}
-		}
-	});
 };
 
 function updateAvatar (hidedefault) {
diff --git a/settings/personal.php b/settings/personal.php
index a1fcd10e0ad..a4449754f64 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -158,6 +158,7 @@ $userData = $accountManager->getUser($user);
 
 $tmpl->assign('total_space', $totalSpace);
 $tmpl->assign('usage_relative', $storageInfo['relative']);
+$tmpl->assign('quota', $storageInfo['quota']);
 $tmpl->assign('clients', $clients);
 $tmpl->assign('email', $userData[\OC\Accounts\AccountManager::PROPERTY_EMAIL]['value']);
 $tmpl->assign('languages', $languages);
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index 31aa268f776..b47e2e28ffa 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -28,8 +28,13 @@
 	<div style="width:<?php p($_['usage_relative']);?>%"
 		<?php if($_['usage_relative'] > 80): ?> class="quota-warning" <?php endif; ?>>
 		<p id="quotatext">
-			<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong>',
-			array($_['usage'], $_['total_space'])));?>
+			<?php if ($_['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED): ?>
+				<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong>',
+					[$_['usage'], $_['total_space']]));?>
+			<?php else: ?>
+				<?php print_unescaped($l->t('You are using <strong>%s</strong> of <strong>%s</strong> (<strong>%s %%</strong>)',
+					[$_['usage'], $_['total_space'],  $_['usage_relative']]));?>
+			<?php endif ?>
 		</p>
 	</div>
 </div>