Merge branch 'master' into dev

3 years ago · 2762c7df82
parent c6aee2862f eca6b4fb87
commit 2762c7df82
161 changed files with 0 additions and 0 deletions
--- a/core/class/SitemapGenerator.class.php
+++ b/core/class/SitemapGenerator.class.php
--- a/core/class/autoload.php
+++ b/core/class/autoload.php
--- a/core/class/helper.class.php
+++ b/core/class/helper.class.php
--- a/core/class/jsondb/Dot.class.php
+++ b/core/class/jsondb/Dot.class.php
--- a/core/class/jsondb/JsonDb.class.php
+++ b/core/class/jsondb/JsonDb.class.php
--- a/core/class/phpmailer/Exception.class.php
+++ b/core/class/phpmailer/Exception.class.php
--- a/core/class/phpmailer/PHPMailer.class.php
+++ b/core/class/phpmailer/PHPMailer.class.php
--- a/core/class/phpmailer/SMTP.class.php
+++ b/core/class/phpmailer/SMTP.class.php
--- a/core/class/template.class.php
+++ b/core/class/template.class.php
--- a/core/core.js.php
+++ b/core/core.js.php
--- a/core/core.php
+++ b/core/core.php
--- a/core/layout/blank.php
+++ b/core/layout/blank.php
--- a/core/layout/light.php
+++ b/core/layout/light.php
--- a/core/layout/mail.php
+++ b/core/layout/mail.php
--- a/core/layout/main.php
+++ b/core/layout/main.php
--- a/core/module/config/config.php
+++ b/core/module/config/config.php
--- a/core/module/config/view/backup/backup.php
+++ b/core/module/config/view/backup/backup.php
--- a/core/module/config/view/index/index.js.php
+++ b/core/module/config/view/index/index.js.php
--- a/core/module/config/view/index/index.php
+++ b/core/module/config/view/index/index.php
--- a/core/module/config/view/manage/manage.php
+++ b/core/module/config/view/manage/manage.php
--- a/core/module/config/view/restore/restore.php
+++ b/core/module/config/view/restore/restore.php
--- a/core/module/config/view/script/script.php
+++ b/core/module/config/view/script/script.php
--- a/core/module/install/install.php
+++ b/core/module/install/install.php
--- a/core/module/install/ressource/defaultdata.php
+++ b/core/module/install/ressource/defaultdata.php
--- a/core/module/install/view/index/index.js.php
+++ b/core/module/install/view/index/index.js.php
--- a/core/module/install/view/index/index.php
+++ b/core/module/install/view/index/index.php
--- a/core/module/install/view/update/update.js.php
+++ b/core/module/install/view/update/update.js.php
--- a/core/module/install/view/update/update.php
+++ b/core/module/install/view/update/update.php
--- a/core/module/maintenance/maintenance.php
+++ b/core/module/maintenance/maintenance.php
--- a/core/module/maintenance/view/index/index.php
+++ b/core/module/maintenance/view/index/index.php
--- a/core/module/page/page.php
+++ b/core/module/page/page.php
--- a/core/module/page/view/edit/edit.js.php
+++ b/core/module/page/view/edit/edit.js.php
--- a/core/module/page/view/edit/edit.php
+++ b/core/module/page/view/edit/edit.php
--- a/core/module/search/search.php
+++ b/core/module/search/search.php
--- a/core/module/search/view/index/index.php
+++ b/core/module/search/view/index/index.php
--- a/core/module/search/view/result/result.php
+++ b/core/module/search/view/result/result.php
--- a/core/module/sitemap/sitemap.php
+++ b/core/module/sitemap/sitemap.php
--- a/core/module/sitemap/view/index/index.php
+++ b/core/module/sitemap/view/index/index.php
--- a/core/module/theme/theme.php
+++ b/core/module/theme/theme.php
--- a/core/module/theme/view/admin/admin.js.php
+++ b/core/module/theme/view/admin/admin.js.php
--- a/core/module/theme/view/admin/admin.php
+++ b/core/module/theme/view/admin/admin.php
--- a/core/module/theme/view/advanced/advanced.js.php
+++ b/core/module/theme/view/advanced/advanced.js.php
--- a/core/module/theme/view/advanced/advanced.php
+++ b/core/module/theme/view/advanced/advanced.php
--- a/core/module/theme/view/body/body.js.php
+++ b/core/module/theme/view/body/body.js.php
--- a/core/module/theme/view/body/body.php
+++ b/core/module/theme/view/body/body.php
--- a/core/module/theme/view/footer/footer.js.php
+++ b/core/module/theme/view/footer/footer.js.php
--- a/core/module/theme/view/footer/footer.php
+++ b/core/module/theme/view/footer/footer.php
--- a/core/module/theme/view/header/header.js.php
+++ b/core/module/theme/view/header/header.js.php
--- a/core/module/theme/view/header/header.php
+++ b/core/module/theme/view/header/header.php
--- a/core/module/theme/view/index/index.js.php
+++ b/core/module/theme/view/index/index.js.php
--- a/core/module/theme/view/index/index.php
+++ b/core/module/theme/view/index/index.php
--- a/core/module/theme/view/manage/manage.php
+++ b/core/module/theme/view/manage/manage.php
--- a/core/module/theme/view/menu/menu.js.php
+++ b/core/module/theme/view/menu/menu.js.php
--- a/core/module/theme/view/menu/menu.php
+++ b/core/module/theme/view/menu/menu.php
--- a/core/module/theme/view/site/site.js.php
+++ b/core/module/theme/view/site/site.js.php
--- a/core/module/theme/view/site/site.php
+++ b/core/module/theme/view/site/site.php
--- a/core/module/user/user.php
+++ b/core/module/user/user.php
--- a/core/module/user/view/add/add.js.php
+++ b/core/module/user/view/add/add.js.php
--- a/core/module/user/view/add/add.php
+++ b/core/module/user/view/add/add.php
--- a/core/module/user/view/edit/edit.js.php
+++ b/core/module/user/view/edit/edit.js.php
--- a/core/module/user/view/edit/edit.php
+++ b/core/module/user/view/edit/edit.php
--- a/core/module/user/view/forgot/forgot.php
+++ b/core/module/user/view/forgot/forgot.php
--- a/core/module/user/view/index/index.js.php
+++ b/core/module/user/view/index/index.js.php
--- a/core/module/user/view/index/index.php
+++ b/core/module/user/view/index/index.php
--- a/core/module/user/view/login/login.php
+++ b/core/module/user/view/login/login.php
--- a/core/module/user/view/reset/reset.php
+++ b/core/module/user/view/reset/reset.php
--- a/core/vendor/filemanager/UploadHandler.php
+++ b/core/vendor/filemanager/UploadHandler.php
--- a/core/vendor/filemanager/ajax_calls.php
+++ b/core/vendor/filemanager/ajax_calls.php
--- a/core/vendor/filemanager/config/config.php
+++ b/core/vendor/filemanager/config/config.php
--- a/core/vendor/filemanager/dialog.php
+++ b/core/vendor/filemanager/dialog.php
--- a/core/vendor/filemanager/execute.php
+++ b/core/vendor/filemanager/execute.php
--- a/core/vendor/filemanager/force_download.php
+++ b/core/vendor/filemanager/force_download.php
--- a/core/vendor/filemanager/include/FtpClient.php
+++ b/core/vendor/filemanager/include/FtpClient.php
--- a/core/vendor/filemanager/include/FtpException.php
+++ b/core/vendor/filemanager/include/FtpException.php
--- a/core/vendor/filemanager/include/FtpWrapper.php
+++ b/core/vendor/filemanager/include/FtpWrapper.php
--- a/core/vendor/filemanager/include/Response.php
+++ b/core/vendor/filemanager/include/Response.php
--- a/core/vendor/filemanager/include/ftp_class.php
+++ b/core/vendor/filemanager/include/ftp_class.php
--- a/core/vendor/filemanager/include/mime_type_lib.php
+++ b/core/vendor/filemanager/include/mime_type_lib.php
--- a/core/vendor/filemanager/include/php_image_magician.php
+++ b/core/vendor/filemanager/include/php_image_magician.php
--- a/core/vendor/filemanager/include/utils.php
+++ b/core/vendor/filemanager/include/utils.php
--- a/core/vendor/filemanager/index.php
+++ b/core/vendor/filemanager/index.php
--- a/core/vendor/filemanager/lang/az_AZ.php
+++ b/core/vendor/filemanager/lang/az_AZ.php
--- a/core/vendor/filemanager/lang/bg_BG.php
+++ b/core/vendor/filemanager/lang/bg_BG.php
--- a/core/vendor/filemanager/lang/ca.php
+++ b/core/vendor/filemanager/lang/ca.php
--- a/core/vendor/filemanager/lang/cs.php
+++ b/core/vendor/filemanager/lang/cs.php
--- a/core/vendor/filemanager/lang/da.php
+++ b/core/vendor/filemanager/lang/da.php
--- a/core/vendor/filemanager/lang/de.php
+++ b/core/vendor/filemanager/lang/de.php
--- a/core/vendor/filemanager/lang/el_GR.php
+++ b/core/vendor/filemanager/lang/el_GR.php
--- a/core/vendor/filemanager/lang/en_EN.php
+++ b/core/vendor/filemanager/lang/en_EN.php
--- a/core/vendor/filemanager/lang/es.php
+++ b/core/vendor/filemanager/lang/es.php
--- a/core/vendor/filemanager/lang/fa.php
+++ b/core/vendor/filemanager/lang/fa.php
--- a/core/vendor/filemanager/lang/fr_FR.php
+++ b/core/vendor/filemanager/lang/fr_FR.php
--- a/core/vendor/filemanager/lang/he_IL.php
+++ b/core/vendor/filemanager/lang/he_IL.php
--- a/core/vendor/filemanager/lang/hr.php
+++ b/core/vendor/filemanager/lang/hr.php
--- a/core/vendor/filemanager/lang/hu_HU.php
+++ b/core/vendor/filemanager/lang/hu_HU.php
--- a/core/vendor/filemanager/lang/id.php
+++ b/core/vendor/filemanager/lang/id.php
--- a/core/vendor/filemanager/lang/it.php
+++ b/core/vendor/filemanager/lang/it.php
--- a/core/vendor/filemanager/lang/ja.php
+++ b/core/vendor/filemanager/lang/ja.php
--- a/core/vendor/filemanager/lang/languages.php
+++ b/core/vendor/filemanager/lang/languages.php
--- a/core/vendor/filemanager/lang/lt.php
+++ b/core/vendor/filemanager/lang/lt.php
--- a/Show More
+++ b/Show More