Merge branch 'master' into filesystem

5 files changed, 28 insertions, 5 deletions

diff --git a/apps/files/appinfo/filesync.php b/apps/files/appinfo/filesync.php
index e755771de64..3953fe3e137 100644
--- a/apps/files/appinfo/filesync.php
+++ b/apps/files/appinfo/filesync.php
@@ -20,8 +20,8 @@
  * The final URL will look like http://.../remote.php/filesync/oc_chunked/path/to/file
  */
 
-// only need filesystem apps
-$RUNTIME_APPTYPES=array('filesystem','authentication');
+// load needed apps
+$RUNTIME_APPTYPES=array('filesystem','authentication','logging');
 OC_App::loadApps($RUNTIME_APPTYPES);
 if(!OC_User::isLoggedIn()) {
         if(!isset($_SERVER['PHP_AUTH_USER'])) {
diff --git a/apps/files/appinfo/remote.php b/apps/files/appinfo/remote.php
index 9c7b9ab6d5b..f12430f24dd 100644
--- a/apps/files/appinfo/remote.php
+++ b/apps/files/appinfo/remote.php
@@ -22,8 +22,9 @@
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-// only need filesystem apps
-$RUNTIME_APPTYPES=array('filesystem', 'authentication');
+// load needed apps
+$RUNTIME_APPTYPES=array('filesystem','authentication','logging');
+
 OC_App::loadApps($RUNTIME_APPTYPES);
 
 // Backends
@@ -41,6 +42,7 @@ $server->setBaseUri($baseuri);
 $server->addPlugin(new Sabre_DAV_Auth_Plugin($authBackend, 'ownCloud'));
 $server->addPlugin(new Sabre_DAV_Locks_Plugin($lockBackend));
 $server->addPlugin(new Sabre_DAV_Browser_Plugin(false)); // Show something in the Browser, but no upload
+$server->addPlugin(new OC_Connector_Sabre_QuotaPlugin());
 
 // And off we go!
 $server->exec();
diff --git a/apps/files/l10n/nb_NO.php b/apps/files/l10n/nb_NO.php
index 0fe6d293393..98ac82c5d7d 100644
--- a/apps/files/l10n/nb_NO.php
+++ b/apps/files/l10n/nb_NO.php
@@ -10,25 +10,38 @@
 "Unshare" => "Avslutt deling",
 "Delete" => "Slett",
 "Rename" => "Omdøp",
+"{new_name} already exists" => "{new_name} finnes allerede",
 "replace" => "erstatt",
 "suggest name" => "foreslå navn",
 "cancel" => "avbryt",
+"replaced {new_name}" => "erstatt {new_name}",
 "undo" => "angre",
+"replaced {new_name} with {old_name}" => "erstatt {new_name} med {old_name}",
+"deleted {files}" => "slettet {files}",
 "generating ZIP-file, it may take some time." => "opprettet ZIP-fil, dette kan ta litt tid",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Kan ikke laste opp filen din siden det er en mappe eller den har 0 bytes",
 "Upload Error" => "Opplasting feilet",
 "Pending" => "Ventende",
 "1 file uploading" => "1 fil lastes opp",
+"{count} files uploading" => "{count} filer laster opp",
 "Upload cancelled." => "Opplasting avbrutt.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Filopplasting pågår. Forlater du siden nå avbrytes opplastingen.",
 "Invalid name, '/' is not allowed." => "Ugyldig navn, '/' er ikke tillatt. ",
+"{count} files scanned" => "{count} filer lest inn",
 "error while scanning" => "feil under skanning",
 "Name" => "Navn",
 "Size" => "Størrelse",
 "Modified" => "Endret",
+"1 folder" => "1 mappe",
+"{count} folders" => "{count} mapper",
+"1 file" => "1 fil",
+"{count} files" => "{count} filer",
 "seconds ago" => "sekunder siden",
+"1 minute ago" => "1 minutt siden",
+"{minutes} minutes ago" => "{minutes} minutter siden",
 "today" => "i dag",
 "yesterday" => "i går",
+"{days} days ago" => "{days} dager siden",
 "last month" => "forrige måned",
 "months ago" => "måneder siden",
 "last year" => "forrige år",
diff --git a/apps/files/l10n/si_LK.php b/apps/files/l10n/si_LK.php
index b0243e89753..0f85061f8de 100644
--- a/apps/files/l10n/si_LK.php
+++ b/apps/files/l10n/si_LK.php
@@ -1,7 +1,9 @@
 <?php $TRANSLATIONS = array(
 "There is no error, the file uploaded with success" => "නිවැරදි ව ගොනුව උඩුගත කෙරිනි",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "php.ini හි upload_max_filesize නියමයට වඩා උඩුගත කළ ගොනුව විශාලයි",
 "The uploaded file was only partially uploaded" => "උඩුගත කළ ගොනුවේ කොටසක් පමණක් උඩුගත විය",
 "No file was uploaded" => "කිසිදු ගොනවක් උඩුගත නොවිනි",
+"Missing a temporary folder" => "තාවකාලික ෆොල්ඩරයක් සොයාගත නොහැක",
 "Failed to write to disk" => "තැටිගත කිරීම අසාර්ථකයි",
 "Files" => "ගොනු",
 "Delete" => "මකන්න",
@@ -14,12 +16,14 @@
 "Upload cancelled." => "උඩුගත කිරීම අත් හරින්න ලදී",
 "Name" => "නම",
 "Size" => "ප්‍රමාණය",
+"Modified" => "වෙනස් කළ",
 "1 file" => "1 ගොනුවක්",
 "today" => "අද",
 "yesterday" => "පෙර දින",
 "File handling" => "ගොනු පරිහරණය",
 "Maximum upload size" => "උඩුගත කිරීමක උපරිම ප්‍රමාණය",
 "max. possible: " => "හැකි උපරිමය:",
+"0 is unlimited" => "0 යනු සීමාවක් නැති බවය",
 "Save" => "සුරකින්න",
 "New" => "නව",
 "Text file" => "පෙළ ගොනුව",
@@ -27,6 +31,8 @@
 "Upload" => "උඩුගත කිරීම",
 "Cancel upload" => "උඩුගත කිරීම අත් හරින්න",
 "Nothing in here. Upload something!" => "මෙහි කිසිවක් නොමැත. යමක් උඩුගත කරන්න",
+"Share" => "බෙදාහදාගන්න",
 "Download" => "බාගත කිරීම",
-"Upload too large" => "උඩුගත කිරීම විශාල වැඩිය"
+"Upload too large" => "උඩුගත කිරීම විශාල වැඩිය",
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "ඔබ උඩුගත කිරීමට තැත් කරන ගොනු මෙම සේවාදායකයා උඩුගත කිරීමට ඉඩදී ඇති උපරිම ගොනු විශාලත්වයට වඩා වැඩිය"
 );
diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php
index d49f2f4d5d3..f614f02b6c2 100644
--- a/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@@ -14,6 +14,8 @@
 			<div class="file_upload_wrapper svg">
 				<form data-upload-id='1' id="data-upload-form" class="file_upload_form" action="<?php echo OCP\Util::linkTo('files', 'ajax/upload.php'); ?>" method="post" enctype="multipart/form-data" target="file_upload_target_1">
 					<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $_['uploadMaxFilesize'] ?>" id="max_upload">
+					<!-- Send the requesttoken, this is needed for older IE versions because they don't send the CSRF token via HTTP header in this case -->
+					<input type="hidden" name="requesttoken" value="<?php echo $_['requesttoken'] ?>" id="requesttoken">
 					<input type="hidden" class="max_human_file_size" value="(max <?php echo $_['uploadMaxHumanFilesize']; ?>)">
 					<input type="hidden" name="dir" value="<?php echo $_['dir'] ?>" id="dir">
 					<input class="file_upload_start" type="file" name='files[]'/>