Merge remote-tracking branch 'remotes/dev/1.1'

oroinc · Apr 28, 2014 · 2bae1f2 · 2bae1f2
2 parents 5390b58 + e64da15
commit 2bae1f2
Show file tree

Hide file tree

Showing 11 changed files with 112 additions and 33 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,24 @@
+CHANGELOG for 1.1.0
+===================
+This changelog references the relevant changes (new features, changes and bugs) done in 1.1.0 versions.
+
+* 1.1.0 (2014-04-28)
+ * Magento order completion
+ * Magento order creation
+ * Dashboard management
+
+CHANGELOG for 1.0.1
+===================
+This changelog references the relevant changes (new features, changes and bugs) done in 1.0.1 versions.
+
+* 1.0.1 (2014-04-18)
+ * Issue #1049 – Problems with import of several Magento orders per cart
+ * Issue #944 – Problems with import of Magento orders from Admin website
+ * Issue #971 – Orders and Shopping Cart grids on the Account view are not clickable
+ * Issue #970 – Artifacts on the Account view page
+ * Issue #934 – Contact widget is not working correctly
+ * Issue #931 – ACL is not implemented correctly for Calls and Emails on Magento-related entity pages
+
 CHANGELOG for 1.0.0
 ===================
 This changelog references the relevant changes (new features, changes and bugs) done in 1.0.0 versions.

diff --git a/README.md b/README.md
@@ -72,6 +72,8 @@ php app/console oro:cron --env prod
 
 Installed PHP Accelerators must be compatible with Symfony and Doctrine (support DOCBLOCKs).
 
+Note that the port used in Websocket must be open in firewall for outgoing/incoming connections
+
 Using MySQL 5.6 on HDD is potentially risky because of performance issues.
 
 Recommended configuration for this case:
@@ -92,12 +94,13 @@ To load sample data you need to run console command
 ```bash
 php app/console oro:migration:data:load --fixtures-type=demo --env=prod
 ```
-## Package Manager Configuration
 
-Github OAuth token should be configured in package manager settings
+## Web Server Configuration
 
+OroCRM application is based on symfony standard application so web server cofiguration recomendation are the [same][5].
 
 [1]:  http://symfony.com/doc/2.3/book/installation.html
 [2]:  http://getcomposer.org/
 [3]:  http://dev.mysql.com/doc/refman/5.6/en/optimizing-innodb-diskio.html
 [4]:  https://github.com/joyent/node/wiki/Installing-Node.js-via-package-manager
+[5]:  http://symfony.com/doc/2.3/cookbook/configuration/web_server_configuration.html
diff --git a/UPGRADE.md b/UPGRADE.md
@@ -1,3 +1,51 @@
+UPGRADE to 1.1.0 from 1.0.1
+=======================
+
+### General
+
+  * Pull changes from repository
+```bash
+git pull
+git checkout 1.1.0
+```
+  * Upgrade composer dependency
+```bash
+php composer.phar install --prefer-dist
+```
+  * Remove old caches and assets
+```bash
+rm -rf app/cache/*
+rm -rf web/js/*
+rm -rf web/css/*
+```
+  * Upgrade platform
+```bash
+php app/console oro:platform:update --env=prod
+
+UPGRADE to 1.0.1 from 1.0.0
+=======================
+
+### General
+
+  * Pull changes from repository
+```bash
+git pull
+git checkout 1.0.1
+```
+  * Upgrade composer dependency
+```bash
+php composer.phar install --prefer-dist
+```
+  * Remove old caches and assets
+```bash
+rm -rf app/cache/*
+rm -rf web/js/*
+rm -rf web/css/*
+```
+  * Upgrade platform
+```bash
+php app/console oro:platform:update --env=prod
+
 UPGRADE to 1.0.0 from 1.0.0-RC3
 =======================
 

diff --git a/app/DistributionKernel.php b/app/DistributionKernel.php
@@ -11,15 +11,17 @@ class DistributionKernel extends Kernel
     public function registerBundles()
     {
         $bundles = array(
-            new \Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
-            new \Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
-            new \Symfony\Bundle\TwigBundle\TwigBundle(),
-            new \Symfony\Bundle\AsseticBundle\AsseticBundle(),
-            new \Symfony\Bundle\MonologBundle\MonologBundle(),
+            new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
+            new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
+            new Symfony\Bundle\TwigBundle\TwigBundle(),
+            new Symfony\Bundle\AsseticBundle\AsseticBundle(),
+            new Symfony\Bundle\MonologBundle\MonologBundle(),
             new Oro\Bundle\DistributionBundle\OroDistributionBundle(),
-            new \Symfony\Bundle\SecurityBundle\SecurityBundle(),
+            new Symfony\Bundle\SecurityBundle\SecurityBundle(),
             new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
-            new \Oro\Bundle\HelpBundle\OroHelpBundle(),
+            new Oro\Bundle\HelpBundle\OroHelpBundle(),
+            new Lexik\Bundle\MaintenanceBundle\LexikMaintenanceBundle(),
+            new Oro\Bundle\PlatformBundle\OroPlatformBundle(),
         );
 
         if (in_array($this->getEnvironment(), array('dev'))) {

diff --git a/app/OroRequirements.php b/app/OroRequirements.php
@@ -51,6 +51,12 @@ public function __construct()
             'Install and enable the <strong>GD</strong> extension at least ' . self::REQUIRED_GD_VERSION . ' version'
         );
 
+        $this->addOroRequirement(
+            null !== $curlVersion && version_compare($curlVersion['version'], self::REQUIRED_CURL_VERSION, '>='),
+            'cURL extension must be at least ' . self::REQUIRED_CURL_VERSION,
+            'Install and enable the <strong>cURL</strong> extension at least ' . self::REQUIRED_CURL_VERSION . ' version'
+        );
+
         $this->addOroRequirement(
             function_exists('mcrypt_encrypt'),
             'mcrypt_encrypt() should be available',
@@ -75,12 +81,6 @@ class_exists('SoapClient'),
             'Install and enable the <strong>SOAP</strong> extension.'
         );
 
-        $this->addRecommendation(
-            null !== $curlVersion && version_compare($curlVersion['version'], self::REQUIRED_CURL_VERSION, '>='),
-            'cURL extension must be at least ' . self::REQUIRED_CURL_VERSION,
-            'Install and enable the <strong>cURL</strong> extension at least ' . self::REQUIRED_CURL_VERSION . ' version'
-        );
-
         // Windows specific checks
         if (defined('PHP_WINDOWS_VERSION_BUILD')) {
             $this->addRecommendation(

diff --git a/app/Resources/TwigBundle/views/Exception/error.html.twig b/app/Resources/TwigBundle/views/Exception/error.html.twig
@@ -10,6 +10,9 @@
 {% block header %}
     {% if app.user is not null %}
         {{ parent() }}
+        {% if status_code == 503 %}
+            {% block navbar %}{% endblock %}
+        {% endif %}
     {% else %}
         <header class="navbar" id="oroplatform-header">
             <div class="navbar-inner">

diff --git a/app/config/config.yml b/app/config/config.yml
@@ -173,11 +173,6 @@ stof_doctrine_extensions:
             tree:             true
 
 services:
-    # this cache should be used to caching data which need to be shared between nodes in a web farm
-    oro.cache.abstract:
-        abstract: true
-        class:                Oro\Bundle\SecurityBundle\Cache\FilesystemCache
-        arguments:            [%kernel.cache_dir%/oro_data]
     twig.extension.intl:
          class: Twig_Extensions_Extension_Intl
          tags:
@@ -195,7 +190,7 @@ services:
               db_id_col:      id
 
 escape_wsse_authentication:
-    authentication_provider_class: Oro\Bundle\UserBundle\Security\WsseUserProvider
+    authentication_provider_class: Oro\Bundle\UserBundle\Security\WsseAuthProvider
     authentication_listener_class: Oro\Bundle\UserBundle\Security\WsseAuthListener
 
 liip_imagine:
@@ -231,7 +226,7 @@ lexik_maintenance:
     driver:
         class:                Lexik\Bundle\MaintenanceBundle\Drivers\FileDriver
         options:
-            file_path:        %kernel.root_dir%/cache/lock
+            file_path:        %kernel.root_dir%/cache/maintenance_lock
 
 #
 # ORO Bundles config
@@ -270,8 +265,5 @@ oro_help:
         oro_default:
             uri: Platform/OroDashboardBundle
 
-oro_dashboard:
-    default_dashboard: main
-
 oro_theme:
     active_theme: oro
diff --git a/app/config/dist/config.yml b/app/config/dist/config.yml
@@ -58,6 +58,12 @@ twig:
     debug:                    "%kernel.debug%"
     strict_variables:         "%kernel.debug%"
 
+lexik_maintenance:
+    driver:
+        class:                Lexik\Bundle\MaintenanceBundle\Drivers\FileDriver
+        options:
+            file_path:        %kernel.root_dir%/cache/maintenance_lock
+
 services:
     oro.cache.abstract:
         abstract:             true

diff --git a/app/config/routing.yml b/app/config/routing.yml
@@ -18,7 +18,7 @@ _imagine:
 oro_default:
     pattern:  /
     defaults:
-        _controller: OroDashboardBundle:Dashboard:index
+        _controller: OroDashboardBundle:Dashboard:view
 
 oro_auto_routing:
     resource: .

diff --git a/app/phpunit.xml.dist b/app/phpunit.xml.dist
@@ -19,10 +19,12 @@
 
     <testsuites>
         <testsuite name="Project Test Suite">
+            <directory suffix="Test.php">../src/*/src/*/Component/*/Tests/Unit</directory>
             <directory suffix="Test.php">../src/*/src/*/Bundle/*Bundle/Tests/Unit</directory>
             <directory suffix="Test.php">../src/*/src/*/Bundle/*Bundle/Tests/Functional</directory>
         </testsuite>
         <testsuite name="Unit Tests">
+            <directory suffix="Test.php">../src/*/src/*/Component/*/Tests/Unit</directory>
             <directory suffix="Test.php">../src/*/src/*/Bundle/*Bundle/Tests/Unit</directory>
         </testsuite>
         <testsuite name="Functional Tests">
@@ -37,6 +39,7 @@
             <directory suffix="Test.php">../src/OroCRMPackages/src/OroCRM/Bundle/*Bundle/Tests/Functional</directory>
         </testsuite>
         <testsuite name="Project Oro Unit Tests">
+            <directory suffix="Test.php">../src/Oro/src/Oro/Component/*/Tests/Unit</directory>
             <directory suffix="Test.php">../src/Oro/src/Oro/Bundle/*Bundle/Tests/Unit</directory>
         </testsuite>
         <testsuite name="Project Oro Functional Tests">
@@ -87,6 +90,8 @@
             <exclude>
                 <directory>../vendor</directory>
                 <directory>../src/*/tests</directory>
+                <directory>../src/*/Component/*/Tests</directory>
+                <directory>../src/*/src/*/Component/*/Tests</directory>
                 <directory>../src/*/src/*/Bundle/TestFrameworkBundle</directory>
                 <directory>../src/*/Bundle/*Bundle/DataFixtures</directory>
                 <directory>../src/*/Bundle/*Bundle/Resources</directory>

diff --git a/composer.json b/composer.json
@@ -4,20 +4,19 @@
     "homepage": "https://github.com/orocrm/crm-application.git",
     "license": "OSL-3.0",
     "autoload": {
-        "psr-0": { 
-           "": "src/"
-         }
+        "psr-0": {
+            "": "src/"
+        }
     },
     "repositories": [
-       {
+        {
             "type": "composer",
             "url": "http://packagist.orocrm.com"
         }
     ],
     "require": {
-        "oro/platform": "1.0.0",
-        "oro/crm": "1.0.0",
-        "knplabs/knp-menu": "2.0.x-dev#ff1a6e73e79c9f75c6a130d03b07f05c89fede63"
+        "oro/platform": "1.x-dev",
+        "oro/crm": "1.x-dev"
     },
     "scripts": {
         "post-install-cmd": [