diff --git a/customize.dist/translations/messages.fr.js b/customize.dist/translations/messages.fr.js
index e8cc86ce2..5db44bf2d 100644
--- a/customize.dist/translations/messages.fr.js
+++ b/customize.dist/translations/messages.fr.js
@@ -61,6 +61,7 @@ define(function () {
out.upgrade = "Améliorer";
out.upgradeTitle = "Améliorer votre compte pour augmenter la limite de stockage";
out.MB = "Mo";
+ out.KB = "Ko";
out.greenLight = "Tout fonctionne bien";
out.orangeLight = "Votre connexion est lente, ce qui réduit la qualité de l'éditeur";
@@ -348,6 +349,21 @@ define(function () {
out.settings_logoutEverywhere = "Se déconnecter de toutes les autres sessions.";
out.settings_logoutEverywhereConfirm = "Êtes-vous sûr ? Vous devrez vous reconnecter sur tous vos autres appareils.";
+ out.upload_serverError = "Erreur interne: impossible d'uploader le fichier pour l'instant.";
+ out.upload_uploadPending = "Vous avez déjà un fichier en cours d'upload. Souhaitez-vous l'annuler et uploader ce nouveau fichier ?";
+ out.upload_success = "Votre fichier ({0}) a été uploadé avec succès et ajouté à votre CryptDrive.";
+ out.upload_notEnoughSpace = "Il n'y a pas assez d'espace libre dans votre CryptDrive pour ce fichier.";
+ out.upload_tooLarge = "Ce fichier dépasse la taille maximale autorisée.";
+ out.upload_choose = "Choisir un fichier";
+ out.upload_pending = "En attente";
+ out.upload_cancelled = "Annulé";
+ out.upload_name = "Nom du fichier";
+ out.upload_size = "Taille";
+ out.upload_progress = "État";
+
+ // general warnings
+ out.warn_notPinned = "Ce pad n'est stocké dans aucun CryptDrive. Il va expirer après 3 mois d'inactivité. En savoir plus...";
+
// index.html
//about.html
diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js
index f0ce247fc..8a1de05a5 100644
--- a/customize.dist/translations/messages.js
+++ b/customize.dist/translations/messages.js
@@ -63,6 +63,7 @@ define(function () {
out.upgrade = "Upgrade";
out.upgradeTitle = "Upgrade your account to increase the storage limit";
out.MB = "MB";
+ out.KB = "KB";
out.greenLight = "Everything is working fine";
out.orangeLight = "Your slow connection may impact your experience";
@@ -236,8 +237,6 @@ define(function () {
out.fm_info_template = 'Contains all the pads stored as templates and that you can re-use when you create a new pad.';
out.fm_info_trash = 'Files deleted from the trash are also removed from "All files" and it is impossible to recover them from the file manager.'; // Same here for "All files" and "out.fm_filesDataName"
out.fm_info_allFiles = 'Contains all the files from "Documents", "Unsorted" and "Trash". You can\'t move or remove files from here.'; // Same here
- out.fm_info_login = "Log in";
- out.fm_info_register = "Sign up";
out.fm_info_anonymous = 'You are not logged in so these pads may be deleted (find out why). ' +
'Sign up or Log in to keep them alive.';
out.fm_alert_backupUrl = "Backup link for this drive.
" +
@@ -360,6 +359,12 @@ define(function () {
out.upload_success = "Your file ({0}) has been successfully uploaded and added to your drive.";
out.upload_notEnoughSpace = "There is not enough space for this file in your CryptDrive.";
out.upload_tooLarge = "This file exceeds the maximum upload size.";
+ out.upload_choose = "Choose a file";
+ out.upload_pending = "Pending";
+ out.upload_cancelled = "Cancelled";
+ out.upload_name = "File name";
+ out.upload_size = "Size";
+ out.upload_progress = "Progress";
// general warnings
out.warn_notPinned = "This pad is not in anyone's CryptDrive. It will expire after 3 months. Learn more...";
diff --git a/rpc.js b/rpc.js
index 2f2b96a4c..ef2e547c3 100644
--- a/rpc.js
+++ b/rpc.js
@@ -13,7 +13,7 @@ var RPC = module.exports;
var Store = require("./storage/file");
-var DEFAULT_LIMIT = 50 * 1024 * 1024;
+var DEFAULT_LIMIT = 150 * 1024 * 1024;
var isValidId = function (chan) {
return /^[a-fA-F0-9]/.test(chan) ||
diff --git a/www/file/inner.html b/www/file/inner.html
index 482fb4955..9b982b648 100644
--- a/www/file/inner.html
+++ b/www/file/inner.html
@@ -42,6 +42,8 @@
margin: auto;
}
#upload-form label{
+ text-align: center;
+ line-height: 50vh;
position: relative;
}
@@ -82,14 +84,56 @@
display: block;
}
+ #status {
+ display: none;
+ width: 80vw;
+ margin-top: 50px;
+ margin-left: 10vw;
+ border: 1px solid black;
+ border-collapse: collapse;
+ }
+ #status tr:nth-child(1) {
+ background-color: #ccc;
+ border: 1px solid #999;
+ }
+ #status tr:nth-child(1) td { text-align: center; }
+ #status td {
+ border-left: 1px solid #BBB;
+ border-right: 1px solid #BBB;
+ padding: 0 10px;
+ }
+ #status .upProgress {
+ width: 200px;
+ position: relative;
+ text-align: center;
+ }
+ #status .progressContainer {
+ position: absolute;
+ width: 0px;
+ left: 5px;
+ top: 1px; bottom: 1px;
+ background-color: rgba(0,0,255,0.3);
+ }
+ #status .upCancel { text-align: center; }
+ #status .fa.cancel {
+ color: rgb(255, 0, 115);
+ }
File name | +Size | +Progress | +Cancel | +