Push Stable version 1.2.1
Commit Stable version 1.2.1
Commit Stable Version 1.2.1
99ko v1.2.2
99ko v1.2.3
Update to 1.2.5

CORE : Mise à jour Normalize.css => OK
CORE : Mise à jour jQuery => OK
CORE : Intégration du plugin Menu => OK
CORE : Corrections d'erreurs PHP (notice / warning) => OK
CORE : La gestion de la configuration et des plugins sont désormais par
des plugins => OK
CLASSE PLUGIN : Correction d'un bug en rapport avec la réécriture d'URL
dans la méthode addToBreadcrumb() => ANNULE
CLASSE PLUGIN : Prise en charge de l'attribut target dans la méthode
addToNavigation => OK
CLASSE PLUGIN : Modification dans l'ordre de chargement des plugins =>
OK
PLUGIN PAGE : Correction d'un bug en rapport avec la réécriture d'URL
dans la liste des pages de l'administration => OK
PLUGIN PAGE : Interactions avec le plugin menu =>ANNULE
PLUGIN PAGE : Améliorations mineures (administration) => OK
LIB SHOW : Bug - Présence des éléments de navigation pour les plugins
inactifs => OK
LIB SHOW : Prise en charge d'un fichier JS pour les thèmes => OK
ADMIN : Mise en place de messages de confirmations => ANNULE
ADMIN : Maxlength sur le champ priorité plugin => OK
ADMIN : Correction d'une faille de sécurité => OK
ADMIN : Diverses modifications majeures du code source => OK
Update 1.2.6
Update 1.2.6.1
Update 1.2.6.3
Added cache base
Install now redirects to login on installSuccess
Merge branch 'Dev'

Conflicts:
	admin/css/color_defaut.css
	admin/css/common.css
	admin/css/login.css
	admin/css/style.css
	admin/footer.php
	admin/header.php
	admin/home.php
	admin/images/exclamation.png
	admin/images/information.png
	admin/images/logo.png
	admin/images/pre_bg.png
	admin/images/tick.png
	admin/images/warning.png
	admin/index.php
	admin/js/html5.js
	admin/js/plugin-config.js
	admin/js/tinybox2/images/close.png
	admin/js/tinybox2/images/preload.gif
	admin/js/tinybox2/packed.js
	admin/js/tinybox2/style.css
	admin/login.php
	changelog-1.2.txt
	common/common.php
	common/core.lib.php
	common/jquery.js
	common/normalize.css
	common/plugin.class.php
	common/show.lib.php
	common/util.lib.php
	index.php
	install.php
	plugin/configmanager/admin.php
	plugin/configmanager/configmanager.php
	plugin/configmanager/other/configmanager.css
	plugin/configmanager/other/configmanager.js
	plugin/configmanager/param/config.json
	plugin/configmanager/param/hooks.json
	plugin/configmanager/param/infos.json
	plugin/configmanager/template/admin.php
	plugin/menu/admin.php
	plugin/menu/img/delete.png
	plugin/menu/img/down.png
	plugin/menu/img/up.png
	plugin/menu/lib/menu.class.php
	plugin/menu/lib/menuLink.class.php
	plugin/menu/menu.php
	plugin/menu/other/menu.css
	plugin/menu/other/menu.js
	plugin/menu/param/config.json
	plugin/menu/param/hooks.json
	plugin/menu/param/infos.json
	plugin/menu/template/admin.php
	plugin/page/admin.php
	plugin/page/page.php
	plugin/page/param/hooks.json
	plugin/page/param/infos.json
	plugin/page/public.php
	plugin/page/template/admin.php
	plugin/pluginsmanager/admin.php
	plugin/pluginsmanager/other/pluginsmanager.js
	plugin/pluginsmanager/param/config.json
	plugin/pluginsmanager/param/hooks.json
	plugin/pluginsmanager/pluginsmanager.php
	plugin/pluginsmanager/template/admin.php
	readme.txt
	theme/defaulthtml5/PT_Sans-Narrow-Web-Regular.ttf
	theme/defaulthtml5/footer.php
	theme/defaulthtml5/header.php
	theme/defaulthtml5/scripts.js
	theme/defaulthtml5/styles.css
Merge branch 'master' into i18n

Conflicts:
	admin/css/style.css
	admin/header.php
	admin/home.php
	admin/index.php
	admin/login.php
	common/common.php
	common/core.lib.php
	common/jquery.js
	common/normalize.css
	common/plugin.class.php
	common/show.lib.php
	install.php
	plugin/configmanager/admin.php
	plugin/configmanager/param/infos.json
	plugin/configmanager/template/admin.php
	plugin/menu/template/admin.php
	plugin/page/admin.php
	plugin/page/page.php
	plugin/page/template/admin.php
	plugin/pluginsmanager/admin.php
	plugin/pluginsmanager/template/admin.php
	theme/defaulthtml5/footer.php
	theme/defaulthtml5/header.php