Skip to content
Permalink
Browse files

Merge branch 'dev'

  • Loading branch information...
JB Lebrun
JB Lebrun committed Oct 1, 2018
2 parents 9254292 + 14d4635 commit deba7fd1d5f5928ec0efa28cf469e36b69542127
Showing with 7,366 additions and 7,911 deletions.
  1. +14 −0 documents/changelogs/Release-20180901.md
  2. +5 −5 engine/etc/static.php.inc
  3. +162 −119 engine/lib/object/CImage.php.inc
  4. +26 −22 engine/lib/object/FSFile.php.inc
  5. +322 −192 engine/lib/object/HTMLForm.php.inc
  6. +21 −29 engine/lib/object/Module.php.inc
  7. +37 −14 engine/lib/object/Plugin.php.inc
  8. +7 −7 engine/lib/object/Theme.php.inc
  9. +64 −31 engine/lib/tool/client.php.inc
  10. +32 −2 engine/lib/tool/clientBots/Bots.php.inc
  11. +12 −2 engine/lib/tool/clientBots/Generics.php.inc
  12. +23 −17 engine/lib/tool/clientBots/Hacks.php.inc
  13. +32 −2 engine/lib/tool/clientBots/Tools.php.inc
  14. +3 −2 engine/lib/tool/clientDevices/Asus.php.inc
  15. +4 −3 engine/lib/tool/clientDevices/BlackBerry.php.inc
  16. +45 −0 engine/lib/tool/clientDevices/Digiciel.php.inc
  17. +45 −0 engine/lib/tool/clientDevices/Doogee.php.inc
  18. +45 −0 engine/lib/tool/clientDevices/Gionee.php.inc
  19. +3 −3 engine/lib/tool/clientDevices/Google.php.inc
  20. +3 −2 engine/lib/tool/clientDevices/HTC.php.inc
  21. +11 −7 engine/lib/tool/clientDevices/Huawei.php.inc
  22. +8 −4 engine/lib/tool/clientDevices/LG.php.inc
  23. +4 −2 engine/lib/tool/clientDevices/Lenovo.php.inc
  24. +45 −0 engine/lib/tool/clientDevices/Meizu.php.inc
  25. +4 −2 engine/lib/tool/clientDevices/OnePlus.php.inc
  26. +46 −0 engine/lib/tool/clientDevices/Orange.php.inc
  27. +4 −2 engine/lib/tool/clientDevices/Samsung.php.inc
  28. +7 −2 engine/lib/tool/clientDevices/Sony.php.inc
  29. +45 −0 engine/lib/tool/clientDevices/Symphony.php.inc
  30. +5 −2 engine/lib/tool/clientDevices/Xiaomi.php.inc
  31. +6 −4 engine/lib/tool/clientDevices/ZTE.php.inc
  32. +23 −1 engine/lib/tool/file.php.inc
  33. +35 −5 engine/lib/tool/url.php.inc
  34. +5 −8 engine/skeleton_site/etc/site.php.inc
  35. +2 −2 plugin/input/AdminItemListViewer/js/{adminitemlistviewer.js → AdminItemListViewer.js}
  36. 0 plugin/input/ContentAnchorMenu/js/{contentanchormenu.js → ContentAnchorMenu.js}
  37. +3 −3 plugin/input/GenericMediaPopup/GenericMediaPopup.php.inc
  38. 0 plugin/input/GenericPageController/js/{genericpagecontroller.js → GenericPageController.js}
  39. +258 −0 plugin/input/GoogleAnalytics/GoogleAnalytics.php.inc
  40. +71 −0 plugin/input/GoogleAnalytics/html/configuration/edit.html.inc
  41. +71 −0 plugin/input/GoogleAnalytics/html/configuration/view.html.inc
  42. +31 −0 plugin/input/GoogleAnalytics/html/input.html.inc
  43. +39 −0 plugin/input/GoogleAnalytics/lib/GoogleAnalyticsConfig.php.inc
  44. +21 −0 plugin/input/GoogleAnalytics/locale/translation_en.php.inc
  45. +21 −0 plugin/input/GoogleAnalytics/locale/translation_fr.php.inc
  46. 0 plugin/input/MultiSelectionList/js/{multiselectionlist.js → MultiSelectionList.js}
  47. 0 plugin/input/PageChooser/js/{pagechooser.js → PageChooser.js}
  48. 0 plugin/input/PerpetualCalendar/js/{perpetualcalendar.js → PerpetualCalendar.js}
  49. 0 plugin/input/QuickItemList/js/{quickitemlist.js → QuickItemList.js}
  50. +1 −1 plugin/input/ReCaptcha/html/input_captcha.html.inc
  51. +0 −576 plugin/module/Admin_CommunityAccountManager/Admin_CommunityAccountManager.php.inc
  52. +0 −27 plugin/module/Admin_CommunityAccountManager/html/admin.html.inc
  53. +0 −217 plugin/module/Admin_CommunityAccountManager/html/admin_edit_account.html.inc
  54. +0 −28 plugin/module/Admin_CommunityAccountManager/html/email_validation.html.inc
  55. +0 −44 plugin/module/Admin_CommunityAccountManager/js/accounteditor.js
  56. +0 −674 plugin/module/Admin_CommunityAccountManager/lib/Admin_CommunityAccountManagerAccount.php.inc
  57. +0 −47 ...n/module/Admin_CommunityAccountManager/lib/Admin_CommunityAccountManagerAccountListParams.php.inc
  58. +0 −100 plugin/module/Admin_CommunityAccountManager/lib/Admin_CommunityAccountManagerConfig.php.inc
  59. +0 −35 plugin/module/Admin_CommunityAccountManager/locale/data/translation_en.php.inc
  60. +0 −42 plugin/module/Admin_CommunityAccountManager/locale/data/translation_fr.php.inc
  61. +0 −117 plugin/module/Admin_CommunityAccountManager/locale/translation_fr.php.inc
  62. +1,550 −1,510 plugin/module/Admin_ContentPage/Admin_ContentPage.php.inc
  63. +30 −30 plugin/module/Admin_ContentPage/css/contentpage.css
  64. +30 −20 plugin/module/Admin_ContentPage/help/fr/help.php.inc
  65. +35 −28 plugin/module/Admin_ContentPage/help/fr/main.html.inc
  66. +44 −37 plugin/module/Admin_ContentPage/help/fr/page_editor.html.inc
  67. +23 −16 plugin/module/Admin_ContentPage/help/fr/page_model.html.inc
  68. +29 −22 plugin/module/Admin_ContentPage/help/fr/page_tree.html.inc
  69. +44 −38 plugin/module/Admin_ContentPage/html/admin_edit_config.html.inc
  70. +343 −346 plugin/module/Admin_ContentPage/html/configuration/edit.html.inc
  71. +194 −188 plugin/module/Admin_ContentPage/html/configuration/view.html.inc
  72. +38 −32 plugin/module/Admin_ContentPage/html/finder.html.inc
  73. +197 −190 plugin/module/Admin_ContentPage/html/modify.html.inc
  74. +117 −111 plugin/module/Admin_ContentPage/html/modify_tab_content_edit.html.inc
  75. +123 −117 plugin/module/Admin_ContentPage/html/modify_tab_content_view.html.inc
  76. +28 −23 plugin/module/Admin_ContentPage/html/modify_tab_lang_edit.html.inc
  77. +26 −20 plugin/module/Admin_ContentPage/html/modify_tab_lang_view.html.inc
  78. +38 −32 plugin/module/Admin_ContentPage/html/modify_tab_meta_edit.html.inc
  79. +36 −29 plugin/module/Admin_ContentPage/html/modify_tab_meta_view.html.inc
  80. +19 −13 plugin/module/Admin_ContentPage/html/request.html.inc
  81. +46 −46 plugin/module/Admin_ContentPage/js/ConfigEditor.js
  82. +81 −81 plugin/module/Admin_ContentPage/js/contentpage_editor.js
  83. +12 −12 plugin/module/Admin_ContentPage/js/contentpage_finder.js
  84. +20 −21 plugin/module/Admin_ContentPage/js/contentpage_modify.js
  85. +19 −19 plugin/module/Admin_ContentPage/js/contentpagetree.js
  86. +190 −197 plugin/module/Admin_ContentPage/lib/Admin_ContentPageConfig.php.inc
  87. +1,790 −1,724 plugin/module/Admin_ContentPage/lib/ContentPage.php.inc
  88. +181 −181 plugin/module/Admin_ContentPage/locale/translation_en.php.inc
  89. +181 −181 plugin/module/Admin_ContentPage/locale/translation_fr.php.inc
  90. +138 −138 plugin/module/Admin_PluginManager/Admin_PluginManager.php.inc
  91. +68 −65 plugin/module/Admin_PluginManager/lib/Admin_PluginManagerItem.php.inc
  92. +4 −4 plugin/module/Admin_SystemLogManager/css/styles.css
  93. +21 −36 plugin/module/Tool_Installer/html/admin_configuration.html.inc
@@ -0,0 +1,14 @@
# CaMykS Changelog
## Release 20180901

* [2018-08-01 11:01:51 +0200 | JB Lebrun] Adds August 2018 release history in changelogs [#View details](https://github.com/Dj1b/CaMykS/commit/2eb16ac11ba06f6f69b8e7d5671b69df67a7287a)
* [2018-08-01 15:10:37 +0200 | JB Lebrun] Normalises files format, indents more nicely the code and makes the AdminPage template, ready to be parsed by Doxygen. [#View details](https://github.com/Dj1b/CaMykS/commit/f248f20973f94693a197fa035b448387abf4b992)
* [2018-08-01 16:14:44 +0200 | JB Lebrun] Removes old and useless templates, normalises files format, indents more nicely the code and makes all visit mode templates, ready to be parsed by Doxygen. [#View details](https://github.com/Dj1b/CaMykS/commit/5f14cab709e0522404c87ee21c66c6c9ac8b419e)
* [2018-08-01 17:48:07 +0200 | JB Lebrun] Normalises files format, indents more nicely the code and makes all included themes, ready to be parsed by Doxygen. [#View details](https://github.com/Dj1b/CaMykS/commit/1f4615ba031d1f622f743aa3666c034dc32a1254)
* [2018-08-28 10:31:17 +0200 | JB Lebrun] Updates User Agent detection in client library. [#View details](https://github.com/Dj1b/CaMykS/commit/11e6462c2c908ffe1540d555eb9abbaf321ac72e)
* [2018-08-31 11:30:10 +0200 | JB Lebrun] Updates .gitignore file to correctly ignore emacs temp files. [#View details](https://github.com/Dj1b/CaMykS/commit/786be6f31417c4a05e353c8c52cd9c3cd8da5778)
* [2018-08-31 11:32:26 +0200 | JB Lebrun] Enhances security while manipulating files and folders in file and folder library, and in FileManager input. [#View details](https://github.com/Dj1b/CaMykS/commit/ca71e6450482acefdf9395d5d00e75698af31c45)
* [2018-08-31 17:23:34 +0200 | JB Lebrun] Adds a new method in array library, to fill all values of an array with the same value. [#View details](https://github.com/Dj1b/CaMykS/commit/8e7b6b90b97e3578e98c684493cd7166c1d1d955)
* [2018-08-31 17:25:24 +0200 | JB Lebrun] Updates User Agent detection in client library. [#View details](https://github.com/Dj1b/CaMykS/commit/5da2eeb58649323838d45d0de35158906b1e67d8)
* [2018-08-31 17:28:50 +0200 | JB Lebrun] Does some files cleaning. [#View details](https://github.com/Dj1b/CaMykS/commit/78b63b721792d2b988738a63abeac5410e898c27)
* [2018-09-03 11:07:09 +0200 | JB Lebrun] Prepares release. [#View details](https://github.com/Dj1b/CaMykS/commit/7a7db2558af2484ca001dca7ff0a8ffb786ce933)
@@ -5,9 +5,9 @@
* @details Engine / Configuration file
* @file engine/etc/static.php.inc
* @author CaMykS Team <camyks.contact@gmail.com>
* @version 1.0.3
* @version 1.0.4
* @date Creation: Sep 2005
* @date Modification: Sep 2018
* @date Modification: Oct 2018
* @copyright 2005 - 2018 CaMykS Team
* @note This program is distributed as is - WITHOUT ANY WARRANTY;
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ -23,7 +23,7 @@ $this->website = 'https://www.camyks.net';
* @var string $this->version
* @brief CaMykS full version
*/
$this->version = '1.0-20180901';
$this->version = '1.0-20181001';
/**
* @var string $this->mversion
@@ -35,13 +35,13 @@ $this->mversion = '1.0';
* @var string $this->nversion
* @brief CaMykS minor version
*/
$this->nversion = '20180901';
$this->nversion = '20181001';
/**
* @var integer $this->last_modification_date
* @brief CaMykS last modification date
*/
$this->last_modification_date = mktime(0, 0, 0, 9, 1, 2018);
$this->last_modification_date = mktime(0, 0, 0, 10, 1, 2018);
/**
* @var string $this->engine_folder
Oops, something went wrong.

0 comments on commit deba7fd

Please sign in to comment.
You can’t perform that action at this time.