Dev (#86)

* support tcp proxy (#72)

* fix selected item display bug

* [Update]add ssh keep-alive

* Fix MFA login http response error

* [update] update new core API (#76)

* fix docker config from env (#77)

* V52 bugfix (#78)

* fix select all item display bug

* fix js bugs

* 修复关闭seesion的bug和移除无效的配置 (#80)

* [Update] add asset load policy config

* modify readme

* [Update] 修改url

* [update]fix selecting asset bugs

* [update]修改websftp的js翻译

* 修改debug信息

* 修改连接复用

* 支持文件夹下载

* fix bugs

* upgrade jquery related files

* add zipMaxSize and zipTmpPath config

* remove debug code

* 优化复用连接代码

* 修改配置, 并移除无效的配置项

* 修复网域连接未释放问题

* 修复语言设置无效的问题

* 修复最后一个命令记录问题 (#85)

* update elfinder

* fix bugs

* add protocol field for session

* version to 1.5.3

README.md

@@ -42,7 +42,7 @@ make linux
 tar xzf koko-[branch name]-[commit]-linux-amd64.tar.gz
 ```
 
-3.创建配置文件config.yml,配置参数请参考[coco](https://github.com/jumpserver/coco/blob/master/config_example.yml)
+3.创建配置文件config.yml,配置参数请参考[cmd](https://github.com/jumpserver/koko/tree/master/cmd)目录下的config_example.yml文件
 ```shell
 touch config.yml
 ```

cmd/config_example.yml

@@ -24,33 +24,14 @@ BOOTSTRAP_TOKEN: <PleasgeChangeSameWithJumpserver>
 # ACCESS KEY 保存的地址, 默认注册后会保存到该文件中
 # ACCESS_KEY_FILE: data/keys/.access_key
 
-# 加密密钥
-# SECRET_KEY: null
-
 # 设置日志级别 [DEBUG, INFO, WARN, ERROR, FATAL, CRITICAL]
 # LOG_LEVEL: INFO
 
-# 日志存放的目录
-# LOG_DIR: logs
-
-# SSH白名单
-# ALLOW_SSH_USER: all
-
-# SSH黑名单, 如果用户同时在白名单和黑名单，黑名单优先生效
-# BLOCK_SSH_USER:
-#   -
-
-# 和Jumpserver 保持心跳时间间隔
-# HEARTBEAT_INTERVAL: 5
-
-# Admin的名字，出问题会提示给用户
-# ADMINS: ''
-
 # SSH连接超时时间 (default 15 seconds)
 # SSH_TIMEOUT: 15
 
 # 语言 [en,zh]
-# LANGUAGE_CODE: zh
+# LANG: zh
 
 # SFTP的根目录, 可选 /tmp, Home其他自定义目录
 # SFTP_ROOT: /tmp
@@ -60,3 +41,12 @@ BOOTSTRAP_TOKEN: <PleasgeChangeSameWithJumpserver>
 
 # 是否复用和用户后端资产已建立的连接(用户不会复用其他用户的连接)
 # REUSE_CONNECTION: true
+
+# 资产加载策略, 可根据资产规模自行调整. 默认异步加载资产, 异步搜索分页; 如果为all, 则资产全部加载, 本地搜索分页.
+# ASSET_LOAD_POLICY:
+
+# zip压缩的最大额度 (单位: M)
+# ZIP_MAX_SIZE: 1024M
+
+# zip压缩存放的临时目录 /tmp
+# ZIP_TMP_PATH: /tmp
\ No newline at end of file

cmd/static/plugins/elfinder/extras/quicklook.googledocs.js

@@ -25,7 +25,7 @@ try {
 					preview.hide();
 					$('<div class="elfinder-quicklook-info-data"><button class="elfinder-info-button">'+fm.i18n('getLink')+'</button></div>').appendTo(ql.info.find('.elfinder-quicklook-info'))
 					.on('click', function() {
-						$(this).html('<span class="elfinder-info-spinner">');
+						$(this).html('<span class="elfinder-spinner">');
 						fm.request({
 							data : {cmd : 'url', target : file.hash},
 							preventDefault : true
@@ -45,22 +45,27 @@ try {
 				}
 				if (file.url !== '' && file.url != '1') {
 					e.stopImmediatePropagation();
-					preview.one('change', function() {
-						loading.remove();
-						node.off('load').remove();
-					});
 
-					loading = $('<div class="elfinder-quicklook-info-data">'+fm.i18n('nowLoading')+'<span class="elfinder-info-spinner"></div>').appendTo(ql.info.find('.elfinder-quicklook-info'));
+					loading = $('<div class="elfinder-quicklook-info-data"><span class="elfinder-spinner-text">'+fm.i18n('nowLoading')+'</span><span class="elfinder-spinner"/></div>').appendTo(ql.info.find('.elfinder-quicklook-info'));
 
 					node = $('<iframe class="elfinder-quicklook-preview-iframe"/>')
 						.css('background-color', 'transparent')
-						.appendTo(preview)
 						.on('load', function() {
 							ql.hideinfo();
 							loading.remove();
-							$(this).css('background-color', '#fff').show();
+							node.css('background-color', '#fff');
+						})
+						.on('error', function() {
+							loading.remove();
+							node.remove();
 						})
+						.appendTo(preview)
 						.attr('src', fm.url(file.hash));
+
+					preview.one('change', function() {
+						loading.remove();
+						node.off('load').remove();
+					});
 				}
 			}
 			

cmd/static/plugins/elfinder/extras/quicklook.googledocs.min.js

-!function(n,e){"function"==typeof define&&define.amd?define(["elfinder"],e):"undefined"!=typeof exports?module.exports=e(require("elfinder")):e(n.elFinder)}(this,function(n){"use strict";try{n.prototype.commands.quicklook.plugins||(n.prototype.commands.quicklook.plugins=[]),n.prototype.commands.quicklook.plugins.push(function(n){var e=n.fm,o=n.preview;o.on("update",function(i){var t,l,r=(n.window,i.file);0===r.mime.indexOf("application/vnd.google-apps.")&&("1"==r.url&&(o.hide(),$('<div class="elfinder-quicklook-info-data"><button class="elfinder-info-button">'+e.i18n("getLink")+"</button></div>").appendTo(n.info.find(".elfinder-quicklook-info")).on("click",function(){$(this).html('<span class="elfinder-info-spinner">'),e.request({data:{cmd:"url",target:r.hash},preventDefault:!0}).always(function(){o.show(),$(this).html("")}).done(function(i){var t=e.file(r.hash);n.value.url=t.url=i.url||"",n.value.url&&o.trigger($.Event("update",{file:n.value}))})})),""!==r.url&&"1"!=r.url&&(i.stopImmediatePropagation(),o.one("change",function(){l.remove(),t.off("load").remove()}),l=$('<div class="elfinder-quicklook-info-data">'+e.i18n("nowLoading")+'<span class="elfinder-info-spinner"></div>').appendTo(n.info.find(".elfinder-quicklook-info")),t=$('<iframe class="elfinder-quicklook-preview-iframe"/>').css("background-color","transparent").appendTo(o).on("load",function(){n.hideinfo(),l.remove(),$(this).css("background-color","#fff").show()}).attr("src",e.url(r.hash))))})})}catch(e){}});
+!function(e,n){"function"==typeof define&&define.amd?define(["elfinder"],n):"undefined"!=typeof exports?module.exports=n(require("elfinder")):n(e.elFinder)}(this,function(e){"use strict";try{e.prototype.commands.quicklook.plugins||(e.prototype.commands.quicklook.plugins=[]),e.prototype.commands.quicklook.plugins.push(function(e){var n=e.fm,o=e.preview;o.on("update",function(i){var r,t,a=(e.window,i.file);0===a.mime.indexOf("application/vnd.google-apps.")&&("1"==a.url&&(o.hide(),$('<div class="elfinder-quicklook-info-data"><button class="elfinder-info-button">'+n.i18n("getLink")+"</button></div>").appendTo(e.info.find(".elfinder-quicklook-info")).on("click",function(){$(this).html('<span class="elfinder-spinner">'),n.request({data:{cmd:"url",target:a.hash},preventDefault:!0}).always(function(){o.show(),$(this).html("")}).done(function(i){var r=n.file(a.hash);e.value.url=r.url=i.url||"",e.value.url&&o.trigger($.Event("update",{file:e.value}))})})),""!==a.url&&"1"!=a.url&&(i.stopImmediatePropagation(),t=$('<div class="elfinder-quicklook-info-data"><span class="elfinder-spinner-text">'+n.i18n("nowLoading")+'</span><span class="elfinder-spinner"/></div>').appendTo(e.info.find(".elfinder-quicklook-info")),r=$('<iframe class="elfinder-quicklook-preview-iframe"/>').css("background-color","transparent").on("load",function(){e.hideinfo(),t.remove(),r.css("background-color","#fff")}).on("error",function(){t.remove(),r.remove()}).appendTo(o).attr("src",n.url(a.hash)),o.one("change",function(){t.remove(),r.off("load").remove()})))})})}catch(n){}});
\ No newline at end of file

cmd/static/plugins/elfinder/i18n/elfinder.LANG.js

@@ -121,6 +121,7 @@
 			'errEditorNotFound'    : 'Editor not found to this file type.', // from v2.1.25 added 23.5.2017
 			'errServerError'       : 'Error occurred on the server side.', // from v2.1.25 added 16.6.2017
 			'errEmpty'             : 'Unable to empty folder "$1".', // from v2.1.25 added 22.6.2017
+			'moreErrors'           : 'There are $1 more errors.', // from v2.1.44 added 9.12.2018
 
 			/******************************* commands names ********************************/
 			'cmdarchive'   : 'Create archive',
@@ -296,7 +297,8 @@
 			'untitled folder'   : 'NewFolder',   // added 10.11.2015
 			'Archive'           : 'NewArchive',  // from v2.1 added 10.11.2015
 			'untitled file'     : 'NewFile.$1',  // from v2.1.41 added 6.8.2018
-			'extentionfile'     : '$1 File',     // from v2.1.41 added 6.8.2018
+			'extentionfile'     : '$1: File',    // from v2.1.41 added 6.8.2018
+			'extentiontype'     : '$1: $2',      // from v2.1.43 added 17.10.2018
 
 			/********************************** messages **********************************/
 			'confirmReq'      : 'Confirmation required',
@@ -307,6 +309,7 @@
 			'confirmNonUTF8'  : 'Character encoding of this file couldn\'t be detected. It need to temporarily convert to UTF-8 for editting.<br/>Please select character encoding of this file.', // from v2.1.19 added 28.11.2016
 			'confirmNotSave'  : 'It has been modified.<br/>Losing work if you do not save changes.', // from v2.1 added 15.7.2015
 			'confirmTrash'    : 'Are you sure you want to move items to trash bin?', //from v2.1.24 added 29.4.2017
+			'confirmMove'     : 'Are you sure you want to move items to "$1"?', //from v2.1.50 added 27.7.2019
 			'apllyAll'        : 'Apply to all',
 			'name'            : 'Name',
 			'size'            : 'Size',
@@ -484,6 +487,16 @@
 			'makefileTypes'   : 'File types to enable with "New file"', // from v2.1.41 added 7.8.2018
 			'typeOfTextfile'  : 'Type of the Text file', // from v2.1.41 added 7.8.2018
 			'add'             : 'Add', // from v2.1.41 added 7.8.2018
+			'theme'           : 'Theme', // from v2.1.43 added 19.10.2018
+			'default'         : 'Default', // from v2.1.43 added 19.10.2018
+			'description'     : 'Description', // from v2.1.43 added 19.10.2018
+			'website'         : 'Website', // from v2.1.43 added 19.10.2018
+			'author'          : 'Author', // from v2.1.43 added 19.10.2018
+			'email'           : 'Email', // from v2.1.43 added 19.10.2018
+			'license'         : 'License', // from v2.1.43 added 19.10.2018
+			'exportToSave'    : 'This item can\'t be saved. To avoid losing the edits you need to export to your PC.', // from v2.1.44 added 1.12.2018
+			'dblclickToSelect': 'Double click on the file to select it.', // from v2.1.47 added 22.1.2019
+			'useFullscreen'   : 'Use fullscreen mode', // from v2.1.47 added 19.2.2019
 
 			/********************************** mimetypes **********************************/
 			'kindUnknown'     : 'Unknown',

cmd/static/plugins/elfinder/i18n/elfinder.cs.js

 /**
  * Czech translation
- * @author Jay Gridley <gridley.jay@hotmail.com>
  * @author RobiNN <kelcakrobo@gmail.com>
- * @version 2018-05-05
+ * @author Jay Gridley <gridley.jay@hotmail.com>
+ * @version 2019-08-09
  */
 (function(root, factory) {
 	if (typeof define === 'function' && define.amd) {
@@ -14,12 +14,12 @@
 	}
 }(this, function(elFinder) {
 	elFinder.prototype.i18.cs = {
-		translator : 'Jay Gridley &lt;gridley.jay@hotmail.com&gt;, RobiNN &lt;kelcakrobo@gmail.com&gt;',
+		translator : 'RobiNN &lt;kelcakrobo@gmail.com&gt;, Jay Gridley &lt;gridley.jay@hotmail.com&gt;',
 		language   : 'Čeština',
 		direction  : 'ltr',
-		dateFormat : 'd. m. Y H:i', // Mar 13, 2012 05:27 PM
-		fancyDateFormat : '$1 H:i', // will produce smth like: Today 12:25 PM
-		nonameDateFormat : 'ymd-His', // to apply if upload file is noname: 120513172700
+		dateFormat : 'd. m. Y H:i', // will show like: 09. 08. 2019 14:18
+		fancyDateFormat : '$1 H:i', // will show like: Dnes 14:18
+		nonameDateFormat : 'ymd-His', // noname upload will show like: 190809-141840
 		messages   : {
 
 			/********************************** errors **********************************/
@@ -115,6 +115,7 @@
 			'errEditorNotFound'    : 'Editor tohoto typu souboru nebyl nalezen.', // from v2.1.25 added 23.5.2017
 			'errServerError'       : 'Došlo k chybě na straně serveru.', // from v2.1.25 added 16.6.2017
 			'errEmpty'             : 'Nelze vyprázdnit složku "$1".', // from v2.1.25 added 22.6.2017
+			'moreErrors'           : 'Existují ještě další $1 chyby.', // from v2.1.44 added 9.12.2018
 
 			/******************************* commands names ********************************/
 			'cmdarchive'   : 'Vytvořit archív',
@@ -163,6 +164,7 @@
 			'cmdselectnone': 'Nic nevyberať', // from v2.1.28 added 15.08.2017
 			'cmdselectinvert': 'Invertovat výběr', // from v2.1.28 added 15.08.2017
 			'cmdopennew'   : 'Otevři v novém okně', // from v2.1.38 added 3.4.2018
+			'cmdhide'      : 'Skrýt (Předvolba)', // from v2.1.41 added 24.7.2018
 
 			/*********************************** buttons ***********************************/
 			'btnClose'  : 'Zavřít',
@@ -224,6 +226,7 @@
 			'ntfchkdir'   : 'Kontrola cílové složky', // from v2.1.24 added 3.5.2017
 			'ntfundo'     : 'Zrušit  předchozí operaci', // from v2.1.27 added 31.07.2017
 			'ntfredo'     : 'Obnovit předchozí zrušení', // from v2.1.27 added 31.07.2017
+			'ntfchkcontent' : 'Kontrola obsahu', // from v2.1.41 added 3.8.2018
 
 			/*********************************** volumes *********************************/
 			'volume_Trash' : 'Koš', //from v2.1.24 added 29.4.2017
@@ -284,9 +287,12 @@
 			'sortAlsoTreeview'  : 'Také stromové zobrazení',  // from v2.1.15 added 01.08.2016
 
 			/********************************** new items **********************************/
-			'untitled file.txt' : 'Nový textový soubor.txt', // added 10.11.2015
+			'untitled file.txt' : 'Nový soubor.txt', // added 10.11.2015
 			'untitled folder'   : 'Nová složka',   // added 10.11.2015
 			'Archive'           : 'Nový archiv',  // from v2.1 added 10.11.2015
+			'untitled file'     : 'Nový soubor.$1',  // from v2.1.41 added 6.8.2018
+			'extentionfile'     : '$1 soubor',    // from v2.1.41 added 6.8.2018
+			'extentiontype'     : '$1: $2',      // from v2.1.43 added 17.10.2018
 
 			/********************************** messages **********************************/
 			'confirmReq'      : 'Požadováno potvrzení',
@@ -297,6 +303,7 @@
 			'confirmNonUTF8'  : 'Kódování tohoto souboru nemoholo rozpoznán. Pro úpravy je třeba dočasně převést do kódování UTF-8.<br/>Prosím, vyberte kódování znaků souboru.', // from v2.1.19 added 28.11.2016
 			'confirmNotSave'  : 'Byl změněn.<br/>Pokud obsahuje neuložené změny, dojde ke ztrátě práce.', // from v2.1 added 15.7.2015
 			'confirmTrash'    : 'Opravdu chcete položky přesunout do koše?', //from v2.1.24 added 29.4.2017
+			'confirmMove'     : 'Opravdu chcete položky přesunout do "$1"?', //from v2.1.50 added 27.7.2019
 			'apllyAll'        : 'Pro všechny',
 			'name'            : 'Název',
 			'size'            : 'Velikost',
@@ -314,6 +321,10 @@
 			'selectlfile'     : 'Vybrat poslední položku',
 			'viewlist'        : 'Seznam',
 			'viewicons'       : 'Ikony',
+			'viewSmall'       : 'Malé ikony', // from v2.1.39 added 22.5.2018
+			'viewMedium'      : 'Střední ikony', // from v2.1.39 added 22.5.2018
+			'viewLarge'       : 'Velké ikony', // from v2.1.39 added 22.5.2018
+			'viewExtraLarge'  : 'Extra velké ikony', // from v2.1.39 added 22.5.2018
 			'places'          : 'Místa',
 			'calc'            : 'Vypočítat',
 			'path'            : 'Cesta',
@@ -408,7 +419,7 @@
 			'contextmenu'     : 'Kontextové menu', // from v2.1.15 added 9.9.2016
 			'pageTurning'     : 'Otáčení stránky', // from v2.1.15 added 10.9.2016
 			'volumeRoots'     : 'Kořeny média', // from v2.1.16 added 16.9.2016
-			'reset'           : 'Reset', // from v2.1.16 added 1.10.2016
+			'reset'           : 'Obnovit', // from v2.1.16 added 1.10.2016
 			'bgcolor'         : 'Barva pozadí', // from v2.1.16 added 1.10.2016
 			'colorPicker'     : 'Výběr barvy', // from v2.1.16 added 1.10.2016
 			'8pxgrid'         : '8px mřížka', // from v2.1.16 added 4.10.2016
@@ -427,7 +438,7 @@
 			'TextArea'        : 'Textarea', // from v2.1.25 added 14.6.2017
 			'folderToEmpty'   : 'Vyprázdnit složku "$1".', // from v2.1.25 added 22.6.2017
 			'filderIsEmpty'   : 'Ve složce "$1" nejsou žádné položky.', // from v2.1.25 added 22.6.2017
-			'preference'      : 'Preference', // from v2.1.26 added 28.6.2017
+			'preference'      : 'Předvolby', // from v2.1.26 added 28.6.2017
 			'language'        : 'Nastavte jazyk', // from v2.1.26 added 28.6.2017
 			'clearBrowserData': 'Inicializujte nastavení uložená v tomto prohlížeči', // from v2.1.26 added 28.6.2017
 			'toolbarPref'     : 'Nastavení panelu nástrojů', // from v2.1.27 added 2.8.2017
@@ -457,6 +468,29 @@
 			'workspace'       : 'Pracovní prostor', // from v2.1.38 added 4.4.2018
 			'dialog'          : 'Dialog', // from v2.1.38 added 4.4.2018
 			'all'             : 'Všechno', // from v2.1.38 added 4.4.2018
+			'iconSize'        : 'Velikost ikony (zobrazení ikon)', // from v2.1.39 added 7.5.2018
+			'editorMaximized' : 'Otevřete maximalizované okno editora', // from v2.1.40 added 30.6.2018
+			'editorConvNoApi' : 'Protože konverze podle API momentálně není k dispozici, převeďte na webové stránce.', //from v2.1.40 added 8.7.2018
+			'editorConvNeedUpload' : 'Po konverzi musíte nahrát převeden soubor pomocí URL položky nebo stažený soubor k uložení převedeného souboru.', //from v2.1.40 added 8.7.2018
+			'convertOn'       : 'Převést na stránce $1', // from v2.1.40 added 10.7.2018
+			'integrations'    : 'Integrace', // from v2.1.40 added 11.7.2018
+			'integrationWith' : 'Tento elFinder má integrované následující externí služby. Před použitím zkontrolujte podmínky používání, zásady ochrany osobních údajů atd.', // from v2.1.40 added 11.7.2018
+			'showHidden'      : 'Zobrazit skryté položky', // from v2.1.41 added 24.7.2018
+			'hideHidden'      : 'Skrýt skryté položky', // from v2.1.41 added 24.7.2018
+			'toggleHidden'    : 'Zobrazit/skrýt skryté položky', // from v2.1.41 added 24.7.2018
+			'makefileTypes'   : 'Typy souborů, jež mají být povoleny pomocí "Nový soubor"', // from v2.1.41 added 7.8.2018
+			'typeOfTextfile'  : 'Typ textového souboru', // from v2.1.41 added 7.8.2018
+			'add'             : 'Přidat', // from v2.1.41 added 7.8.2018
+			'theme'           : 'Téma', // from v2.1.43 added 19.10.2018
+			'default'         : 'Výchozí', // from v2.1.43 added 19.10.2018
+			'description'     : 'Popis', // from v2.1.43 added 19.10.2018
+			'website'         : 'Stránka', // from v2.1.43 added 19.10.2018
+			'author'          : 'Autor', // from v2.1.43 added 19.10.2018
+			'email'           : 'E-mail', // from v2.1.43 added 19.10.2018
+			'license'         : 'Licence', // from v2.1.43 added 19.10.2018
+			'exportToSave'    : 'Tuto položku nelze uložit. Abyste se vyhnuli ztrátě úprav, musíte je exportovat do počítače.', // from v2.1.44 added 1.12.2018
+			'dblclickToSelect': 'Poklepáním na soubor jej vyberte.', // from v2.1.47 added 22.1.2019
+			'useFullscreen'   : 'Použít režim celé obrazovky', // from v2.1.47 added 19.2.2019
 
 			/********************************** mimetypes **********************************/
 			'kindUnknown'     : 'Neznámý',

cmd/static/plugins/elfinder/i18n/elfinder.fr.js

@@ -3,7 +3,7 @@
  * @author Régis Guyomarch <regisg@gmail.com>
  * @author Benoit Delachaux <benorde33@gmail.com>
  * @author Jonathan Grunder <jonathan.grunder@gmail.com>
- * @version 2018-06-06
+ * @version 2019-06-11
  */
 (function(root, factory) {
 	if (typeof define === 'function' && define.amd) {
@@ -18,9 +18,9 @@
 		translator : 'Régis Guyomarch &lt;regisg@gmail.com&gt;, Benoit Delachaux &lt;benorde33@gmail.com&gt;, Jonathan Grunder &lt;jonathan.grunder@gmail.com&gt;',
 		language   : 'française',
 		direction  : 'ltr',
-		dateFormat : 'd/M/Y H:i', // Mar 13, 2012 05:27 PM
-		fancyDateFormat : '$1 H:i', // will produce smth like: Today 12:25 PM
-		nonameDateFormat : 'ymd-His', // to apply if upload file is noname: 120513172700
+		dateFormat : 'd/M/Y H:i', // will show like: 11/Jun/2019 19:33
+		fancyDateFormat : '$1 H:i', // will show like: Aujourd'hui 19:33
+		nonameDateFormat : 'ymd-His', // noname upload will show like: 190611-193346
 		messages   : {
 
 			/********************************** errors **********************************/
@@ -112,10 +112,11 @@
 			'errSearchTimeout'     : 'Délai d’attente dépassé pour la recherche "$1". Le résultat de la recherche est partiel.', // from v2.1 added 12.1.2016
 			'errReauthRequire'     : 'Réauthorisation requise.', // from v2.1.10 added 24.3.2016
 			'errMaxTargets'        : 'Le nombre maximal d\'éléments pouvant être sélectionnés est $1.', // from v2.1.17 added 17.10.2016
-			'errRestore'           : 'Impossible de restorer la corbeille. La destination de la restoration n\'a pu être identifiée.', // from v2.1.24 added 3.5.2017
+			'errRestore'           : 'Impossible de restaurer la corbeille. La destination de la restauration n\'a pu être identifiée.', // from v2.1.24 added 3.5.2017
 			'errEditorNotFound'    : 'Aucun éditeur n\'a été trouvé pour ce type de fichier.', // from v2.1.25 added 23.5.2017
 			'errServerError'       : 'Une erreur est survenue du côté serveur.', // from v2.1.25 added 16.6.2017
 			'errEmpty'             : 'Impossible de vider le dossier "$1".', // from v2.1.25 added 22.6.2017
+			'moreErrors'           : 'There are $1 more errors.', // from v2.1.44 added 9.12.2018
 
 			/******************************* commands names ********************************/
 			'cmdarchive'   : 'Créer une archive',
@@ -141,7 +142,7 @@
 			'cmdrename'    : 'Renommer',
 			'cmdrm'        : 'Supprimer',
 			'cmdtrash'     : 'À la corbeille', //from v2.1.24 added 29.4.2017
-			'cmdrestore'   : 'Restorer', //from v2.1.24 added 3.5.2017
+			'cmdrestore'   : 'Restaurer', //from v2.1.24 added 3.5.2017
 			'cmdsearch'    : 'Trouver les fichiers',
 			'cmdup'        : 'Remonter au dossier parent',
 			'cmdupload'    : 'Envoyer les fichiers',
@@ -150,7 +151,7 @@
 			'cmdsort'      : 'Trier',
 			'cmdnetmount'  : 'Monter un volume réseau', // added 18.04.2012
 			'cmdnetunmount': 'Démonter', // from v2.1 added 30.04.2012
-			'cmdplaces'    : 'Vers Places', // added 28.12.2014
+			'cmdplaces'    : 'Vers Favoris', // added 28.12.2014
 			'cmdchmod'     : 'Changer de mode', // from v2.1 added 20.6.2015
 			'cmdopendir'   : 'Ouvrir un dossier', // from v2.1 added 13.1.2016
 			'cmdcolwidth'  : 'Réinitialiser largeur colone', // from v2.1.13 added 12.06.2016
@@ -164,6 +165,7 @@
 			'cmdselectnone': 'Tout désélectionner', // from v2.1.28 added 15.08.2017
 			'cmdselectinvert': 'Inverser la sélection', // from v2.1.28 added 15.08.2017
 			'cmdopennew'   : 'Ouvrir dans une nouvelle fenêtre', // from v2.1.38 added 3.4.2018
+			'cmdhide'      : 'Hide (Preference)', // from v2.1.41 added 24.7.2018
 
 			/*********************************** buttons ***********************************/
 			'btnClose'  : 'Fermer',
@@ -221,10 +223,11 @@
 			'ntfparents'  : 'Traitement de l\'information du chemin', // from v2.1.17 added 2.11.2016
 			'ntfchunkmerge': 'Traitement du fichier envoyé', // from v2.1.17 added 2.11.2016
 			'ntftrash'    : 'Mettre à la corbeille', // from v2.1.24 added 2.5.2017
-			'ntfrestore'  : 'Restorer depuis la corbeille', // from v2.1.24 added 3.5.2017
+			'ntfrestore'  : 'Restaurer depuis la corbeille', // from v2.1.24 added 3.5.2017
 			'ntfchkdir'   : 'Validation du dossier de destination', // from v2.1.24 added 3.5.2017
 			'ntfundo'     : 'Annuler l\'opération précédente', // from v2.1.27 added 31.07.2017
 			'ntfredo'     : 'Refaire l\'opération annulée', // from v2.1.27 added 31.07.2017
+			'ntfchkcontent' : 'Checking contents', // from v2.1.41 added 3.8.2018
 
 			/*********************************** volumes *********************************/
 			'volume_Trash' : 'Corbeille', //from v2.1.24 added 29.4.2017
@@ -288,6 +291,9 @@
 			'untitled file.txt' : 'NouveauFichier.txt', // added 10.11.2015
 			'untitled folder'   : 'NouveauDossier',   // added 10.11.2015
 			'Archive'           : 'NouvelleArchive',  // from v2.1 added 10.11.2015
+			'untitled file'     : 'NewFile.$1',  // from v2.1.41 added 6.8.2018
+			'extentionfile'     : '$1: File',    // from v2.1.41 added 6.8.2018
+			'extentiontype'     : '$1: $2',      // from v2.1.43 added 17.10.2018
 
 			/********************************** messages **********************************/
 			'confirmReq'      : 'Confirmation requise',
@@ -319,7 +325,7 @@
 			'viewMedium'      : 'Moyennes icônes', // from v2.1.39 added 22.5.2018
 			'viewLarge'       : 'Grandes icônes', // from v2.1.39 added 22.5.2018
 			'viewExtraLarge'  : 'Très grandes icônes', // from v2.1.39 added 22.5.2018
-			'places'          : 'Places',
+			'places'          : 'Favoris',
 			'calc'            : 'Calculer',
 			'path'            : 'Chemin',
 			'aliasfor'        : 'Raccourcis pour',
@@ -358,8 +364,8 @@
 			'selectForUpload' : 'Sélectionner les fichiers à envoyer',
 			'moveFiles'       : 'Déplacer les éléments',
 			'copyFiles'       : 'Copier les éléments',
-			'restoreFiles'    : 'Restorer les éléments', // from v2.1.24 added 5.5.2017
-			'rmFromPlaces'    : 'Retirer des places',
+			'restoreFiles'    : 'Restaurer les éléments', // from v2.1.24 added 5.5.2017
+			'rmFromPlaces'    : 'Retirer des favoris',
 			'aspectRatio'     : 'Ratio d’affichage',
 			'scale'           : 'Mise à l\'échelle',
 			'width'           : 'Largeur',
@@ -462,7 +468,29 @@
 			'workspace'       : 'Espace de travail', // from v2.1.38 added 4.4.2018
 			'dialog'          : 'Dialogue', // from v2.1.38 added 4.4.2018
 			'all'             : 'Tout', // from v2.1.38 added 4.4.2018
-			'iconSize'        : 'Icon Size (Icons view)', // form v2.1.39 added 7.5.2018
+			'iconSize'        : 'Icon Size (Icons view)', // from v2.1.39 added 7.5.2018
+			'editorMaximized' : 'Open the maximized editor window', // from v2.1.40 added 30.6.2018
+			'editorConvNoApi' : 'Because conversion by API is not currently available, please convert on the website.', //from v2.1.40 added 8.7.2018
+			'editorConvNeedUpload' : 'After conversion, you must be upload with the item URL or a downloaded file to save the converted file.', //from v2.1.40 added 8.7.2018
+			'convertOn'       : 'Convert on the site of $1', // from v2.1.40 added 10.7.2018
+			'integrations'    : 'Integrations', // from v2.1.40 added 11.7.2018
+			'integrationWith' : 'This elFinder has the following external services integrated. Please check the terms of use, privacy policy, etc. before using it.', // from v2.1.40 added 11.7.2018
+			'showHidden'      : 'Show hidden items', // from v2.1.41 added 24.7.2018
+			'hideHidden'      : 'Hide hidden items', // from v2.1.41 added 24.7.2018
+			'toggleHidden'    : 'Show/Hide hidden items', // from v2.1.41 added 24.7.2018
+			'makefileTypes'   : 'File types to enable with "New file"', // from v2.1.41 added 7.8.2018
+			'typeOfTextfile'  : 'Type of the Text file', // from v2.1.41 added 7.8.2018
+			'add'             : 'Add', // from v2.1.41 added 7.8.2018
+			'theme'           : 'Theme', // from v2.1.43 added 19.10.2018
+			'default'         : 'Default', // from v2.1.43 added 19.10.2018
+			'description'     : 'Description', // from v2.1.43 added 19.10.2018
+			'website'         : 'Website', // from v2.1.43 added 19.10.2018
+			'author'          : 'Author', // from v2.1.43 added 19.10.2018
+			'email'           : 'Email', // from v2.1.43 added 19.10.2018
+			'license'         : 'License', // from v2.1.43 added 19.10.2018
+			'exportToSave'    : 'This item can\'t be saved. To avoid losing the edits you need to export to your PC.', // from v2.1.44 added 1.12.2018
+			'dblclickToSelect': 'Double click on the file to select it.', // from v2.1.47 added 22.1.2019
+			'useFullscreen'   : 'Use fullscreen mode', // from v2.1.47 added 19.2.2019
 
 			/********************************** mimetypes **********************************/
 			'kindUnknown'     : 'Inconnu',
@@ -548,4 +576,3 @@
 		}
 	};
 }));
-

cmd/static/plugins/elfinder/i18n/elfinder.it.js

@@ -151,7 +151,7 @@
 			'cmdsort'      : 'Ordina',
 			'cmdnetmount'  : 'Monta disco di rete', // added 18.04.2012
 			'cmdnetunmount': 'Smonta', // from v2.1 added 30.04.2012
-			'cmdplaces'    : 'Alle cartelle', // added 28.12.2014
+			'cmdplaces'    : 'Aggiungi ad Accesso rapido', // added 28.12.2014
 			'cmdchmod'     : 'Cambia modalità', // from v2.1 added 20.6.2015
 			'cmdopendir'   : 'Apri una cartella', // from v2.1 added 13.1.2016
 			'cmdcolwidth'  : 'Reimposta dimensione colonne', // from v2.1.13 added 12.06.2016
@@ -320,7 +320,7 @@
 			'viewMedium'      : 'Icone medie', // from v2.1.39 added 22.5.2018
 			'viewLarge'       : 'Icone grandi', // from v2.1.39 added 22.5.2018
 			'viewExtraLarge'  : 'Icone molto grandi', // from v2.1.39 added 22.5.2018
-			'places'          : 'Cartelle',
+			'places'          : 'Accesso rapido',
 			'calc'            : 'Calcola',
 			'path'            : 'Percorso',
 			'aliasfor'        : 'Alias per',
@@ -360,7 +360,7 @@
 			'moveFiles'       : 'Sposta file',
 			'copyFiles'       : 'Copia file',
 			'restoreFiles'    : 'Ripristina oggetti', // from v2.1.24 added 5.5.2017
-			'rmFromPlaces'    : 'Rimuovi da places',
+			'rmFromPlaces'    : 'Rimuovi da Accesso rapido',
 			'aspectRatio'     : 'Proporzioni',
 			'scale'           : 'Scala',
 			'width'           : 'Larghezza',

cmd/static/plugins/elfinder/i18n/elfinder.ja.js

@@ -2,7 +2,7 @@
  * Japanese translation
  * @author Tomoaki Yoshida <info@yoshida-studio.jp>
  * @author Naoki Sawada <hypweb+elfinder@gmail.com>
- * @version 2018-08-24
+ * @version 2019-07-27
  */
 (function(root, factory) {
 	if (typeof define === 'function' && define.amd) {
@@ -115,6 +115,7 @@
 			'errEditorNotFound'    : 'このファイルタイプのエディターがありません。', // from v2.1.25 added 23.5.2017
 			'errServerError'       : 'サーバー側でエラーが発生しました。', // from v2.1.25 added 16.6.2017
 			'errEmpty'             : 'フォルダ"$1"を空にすることができません。', // from v2.1.25 added 22.6.2017
+			'moreErrors'           : 'さらに $1 件のエラーがあります。', // from v2.1.44 added 9.12.2018
 
 			/******************************* commands names ********************************/
 			'cmdarchive'   : 'アーカイブ作成',
@@ -290,7 +291,8 @@
 			'untitled folder'   : '新規フォルダ',   // added 10.11.2015
 			'Archive'           : '新規アーカイブ',  // from v2.1 added 10.11.2015
 			'untitled file'     : '新規ファイル.$1',  // from v2.1.41 added 6.8.2018
-			'extentionfile'     : '$1 ファイル',     // from v2.1.41 added 6.8.2018
+			'extentionfile'     : '$1: ファイル',     // from v2.1.41 added 6.8.2018
+			'extentiontype'     : '$1: $2',      // from v2.1.43 added 17.10.2018
 
 			/********************************** messages **********************************/
 			'confirmReq'      : '処理を実行しますか？',
@@ -301,6 +303,7 @@
 			'confirmNonUTF8'  : 'このファイルの文字エンコーディングを判別できませんでした。編集するには一時的に UTF-8 に変換する必要があります。<br/>文字エンコーディングを指定してください。', // from v2.1.19 added 28.11.2016
 			'confirmNotSave'  : '変更されています。<br/>保存せずに閉じると編集内容が失われます。', // from v2.1 added 15.7.2015
 			'confirmTrash'    : 'アイテムをごみ箱に移動してもよろしいですか？', //from v2.1.24 added 29.4.2017
+			'confirmMove'     : 'アイテムを"$1"に移動してもよろしいですか？', //from v2.1.50 added 27.7.2019
 			'apllyAll'        : '全てに適用します',
 			'name'            : '名前',
 			'size'            : 'サイズ',
@@ -478,6 +481,16 @@
 			'makefileTypes'   : '「新しいファイル」で有効にするファイルタイプ', // from v2.1.41 added 7.8.2018
 			'typeOfTextfile'  : 'テキストファイルのタイプ', // from v2.1.41 added 7.8.2018
 			'add'             : '追加', // from v2.1.41 added 7.8.2018
+			'theme'           : 'テーマ', // from v2.1.43 added 19.10.2018
+			'default'         : 'デフォルト', // from v2.1.43 added 19.10.2018
+			'description'     : '説明', // from v2.1.43 added 19.10.2018
+			'website'         : 'ウェブサイト', // from v2.1.43 added 19.10.2018
+			'author'          : '作者', // from v2.1.43 added 19.10.2018
+			'email'           : 'Email', // from v2.1.43 added 19.10.2018
+			'license'         : 'ライセンス', // from v2.1.43 added 19.10.2018
+			'exportToSave'    : 'このアイテムは保存できません。 編集内容を失わないようにするには、PCにエクスポートする必要があります。', // from v2.1.44 added 1.12.2018
+			'dblclickToSelect': 'ファイルをダブルクリックして選択します。', // from v2.1.47 added 22.1.2019
+			'useFullscreen'   : 'フルスクリーンモードの利用', // from v2.1.47 added 19.2.2019
 
 			/********************************** mimetypes **********************************/
 			'kindUnknown'     : '不明',

cmd/static/plugins/elfinder/img/volume_icon_box.svg

+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48"><g fill="#0288d1"><path d="M25.6 18c-3 0-5.8 1.8-7.2 4.5a8 8 0 0 0-12.2-2.9V12c0-.8-.8-1.7-1.6-1.7-1 0-1.6.7-1.6 1.7v14.5C3 31 6.7 35 11 35c3.2 0 6-1.8 7.4-4.5 1.4 2.7 4 4.5 7.2 4.5 4.6 0 8.1-3.9 8.1-8.4 0-4.7-3.5-8.6-8-8.6M11 31.6a5 5 0 0 1-4.9-5 5 5 0 0 1 4.9-5.2c2.6 0 4.8 2.4 4.8 5.1.2 2.7-2 5-4.8 5zm14.5 0a5 5 0 0 1-4.8-5 5 5 0 0 1 4.8-5.2 5 5 0 0 1 4.9 5.1c0 2.7-2.3 5-4.9 5z"/><path d="M44.8 32.4l-4.3-6 4.3-5.8c.5-.7.3-1.9-.3-2.4-.7-.5-1.8-.3-2.3.3l-3.6 5.1-3.6-5c-.5-.7-1.7-.9-2.3-.4-.7.5-.8 1.7-.3 2.4l4.2 5.9-4.2 5.9c-.5.6-.4 1.8.3 2.3.6.5 1.8.3 2.3-.3l3.6-5 3.6 5c.5.6 1.6.8 2.3.3.6-.5.8-1.7.3-2.3"/></g></svg>
\ No newline at end of file