designer.js
newsletter Fix JS
Fix synchro champs user & champs usergroup
Merge remote-tracking branch 'origin/master'
Fix Newsletter + Tutoriel
Merge remote-tracking branch 'origin/master'
num version
mailchimp stats
mailchimp subscibe
Social (BO)

Reprise rapide du module SOCIAL il reste du CSS a revoir pour que ce soit "beau" comme le reste du back office

Signed-off-by: Benjamin Mosnier <bm@kappuccino.org>
Merge branch 'master' of github.com:kappuccino/kodeine
Content / Liaisons des user

opt[''assoUser"]

Signed-off-by: Benjamin Mosnier <bm@kappuccino.org>
Update app/module/social/api.socialMessage.php

Revert lignes 45/48; mid_socialmessage doit être (int) >= 0.
(=> voir ticket #864)
Merge branch 'refs/heads/arbo'

Signed-off-by: Benjamin <bm@kappuccino.org>

Conflicts:
	app/module/newsletter/analytic.php
	app/module/social/config/config.xml
	app/module/social/index.php
	app/module/social/ui/menu.php
	module/newsletter/ui/js/designer--.js
Fix js filename

Signed-off-by: Benjamin <bm@kappuccino.org>
Clean

Signed-off-by: Benjamin <bm@kappuccino.org>
Merge branch 'master' of github.com:kappuccino/kodeine
Template

Signed-off-by: Benjamin <bm@kappuccino.org>
Traduction (config)

Signed-off-by: Benjamin <bm@kappuccino.org>
Fix config traduction

Signed-off-by: Benjamin <bm@kappuccino.org>