Merge branch 'master' of github.com:forkcms/forkcms into code-style-f…

…ixes

.htaccess

@@ -34,6 +34,11 @@ FileETag MTime Size
 	RewriteRule src/Backend/Cache/CompiledTemplates - [F]
 	RewriteRule src/Backend/Cache/Locale/.*\.php - [F]
 
+	# redirect all trafic to https
+	# RewriteCond %{SERVER_PORT} 80
+	# RewriteCond %{HTTP_HOST} !.*\.dev [NC]
+	# RewriteRule ^(.*)$ https://www.<domain>.be/$1 [R=301,L]
+
 	# one url to rule them all
 	# RewriteCond %{HTTP_HOST} !^www\.<domain>\.be [NC]
 	# RewriteCond %{HTTP_HOST} !.*\.dev [NC]

app/AppKernel.php

@@ -37,6 +37,10 @@ public function registerBundles()
             new SimpleBus\SymfonyBridge\SimpleBusCommandBusBundle(),
             new SimpleBus\SymfonyBridge\DoctrineOrmBridgeBundle(),
             new SimpleBus\SymfonyBridge\SimpleBusEventBusBundle(),
+            new Backend\Modules\Mailmotor\Mailmotor,
+            new MailMotor\Bundle\MailMotorBundle\MailMotorMailMotorBundle(),
+            new MailMotor\Bundle\MailChimpBundle\MailMotorMailChimpBundle(),
+            new MailMotor\Bundle\CampaignMonitorBundle\MailMotorCampaignMonitorBundle(),
         );
 
         if (in_array($this->getEnvironment(), array('dev', 'test'))) {

app/config/doctrine.yml

@@ -23,6 +23,7 @@ doctrine:
             datetime: Common\Doctrine\Type\UTCDateTimeType
             datetimetz: Common\Doctrine\Type\UTCDateTimeType
             time: Common\Doctrine\Type\UTCDateTimeType
+            date: Common\Doctrine\Type\UTCDateTimeType
 
     orm:
         auto_generate_proxy_classes: "%kernel.debug%"

composer.json

@@ -29,7 +29,10 @@
         "doctrine/doctrine-bundle": "^1.6",
         "doctrine/orm": "^2.5",
         "simple-bus/symfony-bridge": "^4.1",
-        "simple-bus/doctrine-orm-bridge": "^4.0"
+        "simple-bus/doctrine-orm-bridge": "^4.0",
+        "mailmotor/mailchimp-bundle": "^2.0",
+        "mailmotor/campaignmonitor-bundle": "^1.0",
+        "mailmotor/mailmotor-bundle": "^2.0"
     },
     "require-dev": {
         "jdorn/sql-formatter": "1.2.17",