Merge remote-tracking branch 'origin/master' into public/master

michael-oro · michael-oro · commit 67026a36164e · 2015-09-28T07:14:19.000-07:00
* origin/master:
  Updated submodule references:
  BB-1136: Redirect to frontend after backend login - add default path
  BAP-8994: Upgrade Doctrine to eleminate the Security Misconfiguration Vulnerability  - updated composer.json to change doctrine version
diff --git a/app/config/security.yml b/app/config/security.yml
@@ -67,6 +67,7 @@ security:
                 csrf_provider:              form.csrf_provider
                 check_path:                 oro_user_security_check
                 login_path:                 oro_user_security_login
+                default_target_path:        oro_default
             logout:
                 path:                       oro_user_security_logout
                 invalidate_session:         false
diff --git a/composer.json b/composer.json
@@ -22,7 +22,7 @@
         "ext-xml": "*",
         "symfony/symfony": "2.7.*",
         "twig/twig": "1.20.0",
-        "doctrine/orm": "2.5.0",
+        "doctrine/orm": "2.5.1",
         "doctrine/doctrine-bundle": "1.4.0",
         "doctrine/dbal": "2.5.1",
         "doctrine/data-fixtures": "1.1.1",
diff --git a/src/Oro b/src/Oro
@@ -1 +1 @@
-Subproject commit a778db63600310c30509395ba916f96aebee8da3
+Subproject commit 03567c606a8804063b454640768df4ab042162d0
diff --git a/src/OroB2B b/src/OroB2B
@@ -1 +1 @@
-Subproject commit 9a714efb2260f970d99054dddd45ac30c4bda8a5
+Subproject commit 8a44ac1d84f1bfb00bc8ce36bf2c7a1ce7b072b4
