Merge remote-tracking branch 'remotes/origin/master' into 1.3

Author: rgrebenchuk

CHANGELOG.md

@@ -1,3 +1,14 @@
+CHANGELOG for 1.3.1
+===================
+This changelog references the relevant changes (new features, changes and bugs) done in 1.3.1 versions.
+
+* 1.3.1 (2014-08-14)
+ * Magento Synchronization stabilization improvements
+ * Fixed issue: Incorrect row count on grids.
+ * Fixed issue: Reports and Segments crash when "Is empty" filter is added.
+ * Fixed issue: Recent Emails dashboard widget is broken.
+ * Fixed issue: Accounts cannot be linked to Contacts from Edit Contact page.
+
 CHANGELOG for 1.3.0
 ===================
 This changelog references the relevant changes (new features, changes and bugs) done in 1.3.0 versions.

README.md

@@ -12,7 +12,7 @@ chapter.
 Requirements
 ------------
 
-OroCRM requires Symfony 2.4, Doctrine 2 and PHP 5.4.4 or above.
+OroCRM requires Symfony 2.4, Doctrine 2 and PHP 5.4.9 or above.
 
 Installation
 ------------

composer.json

@@ -22,7 +22,7 @@
     ],
     "require": {
         "php": ">=5.4.4",
-        "oro/platform": "1.3.x-dev"
+        "oro/platform": "1.3.*"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,

composer.lock

@@ -22,7 +22,7 @@ datagrid:
                             join: Oro\Bundle\NavigationBundle\Entity\NavigationHistoryItem
                             alias: history
                             conditionType: WITH
-                            condition: "a.id = substring(history.url, locate('/', history.url, locate('/account/', history.url) + 9) + 1)"
+                            condition: "CONCAT(a.id, '') = substring(history.url, locate('/', history.url, locate('/account/', history.url) + 9) + 1)"
                 where:
                     and:
                       - locate('/account/', history.url) <> 0