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

oroinc · Feb 25, 2014 · 5ef9077 · 5ef9077
2 parents 1c8d225 + 3b4e775
commit 5ef9077
Show file tree

Hide file tree

Showing 7 changed files with 74 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,12 @@
+CHANGELOG for 1.0.0-rc2
+===================
+This changelog references the relevant changes (new features, changes and bugs) done in 1.0.0-rc2 versions.
+
+* 1.0.0-rc2 (2014-02-25)
+ * Refactored Flexible Workflows
+ * Embedded forms
+ * Account merging
+
 CHANGELOG for 1.0.0-rc1
 ===================
 This changelog references the relevant changes (new features, changes and bugs) done in 1.0.0-rc1 versions.

diff --git a/README.md b/README.md
@@ -77,7 +77,7 @@ Demo Data uploading
 To upload this feature you need to run console command
 
  ```bash
-php app/console doctrine:fixture:load --verbose --append --no-interaction --env=prod --fixtures=vendor/oro/crm/src/OroCRM/Bundle/DemoDataBundle/DataFixtures
+php app/console oro:installer:fixtures:load --env prod --fixtures-type=demo
 ```
 
 Checking your System Configuration

diff --git a/UPGRADE.md b/UPGRADE.md
@@ -1,3 +1,45 @@
+UPGRADE to 1.0.0-RC2 from 1.0.0-RC1
+=======================
+
+### General
+
+  * Pull changes from repository
+```bash
+git pull
+```
+  * Upgrade composer dependency
+```bash
+php composer.phar update --prefer-dist
+```
+  * Remove old caches
+```bash
+rm -rf app/cache/*
+```
+  * Fix extended entities configuration by executing below queries in mysql console.
+
+delete FROM oro_entity_config_value where code = 'schema' and field_id is not null;
+delete FROM oro_entity_config_value where field_id in (select id FROM oro_entity_config_field where field_name like 'field_%');
+delete FROM oro_entity_config_field where field_name like 'field_%';
+delete FROM oro_entity_config_value where code = 'set_options' and value = 'Array';
+
+  * Update extend entities configuration
+```bash
+php app/console oro:entity-extend:update-config --env=prod
+php app/console oro:entity-extend:dump --env=prod
+```
+  * Upgrade platform
+```bash
+php app/console oro:platform:update --env=prod
+```
+  * Load new fixtures
+```bash
+php app/console oro:installer:fixtures:load --env=prod
+```
+  * Load new workflows definitions
+```bash
+php app/console oro:workflow:definitions:load --env=prod
+```
+
 UPGRADE to any 1.0.0-alpha and beta version
 =======================
 

diff --git a/app/OroRequirements.php b/app/OroRequirements.php
@@ -150,6 +150,14 @@ function ($cfgValue) use ($mem) {
                 'Change the permissions of the "<strong>web</strong>" directory so that the web server can write into it.'
             );
         }
+
+        if (is_file($baseDir . '/app/config/parameters.yml')) {
+            $this->addOroRequirement(
+                is_writable($baseDir . '/app/config/parameters.yml'),
+                'app/config/parameters.yml file must be writable',
+                'Change the permissions of the "<strong>app/config/parameters.yml</strong>" file so that the web server can write into it.'
+            );
+        }
     }
 
     /**

diff --git a/app/config/security.yml b/app/config/security.yml
@@ -5,6 +5,9 @@ security:
             id: security.acl.cache.doctrine
             prefix: sf2_acl_
 
+    access_decision_manager:
+        strategy: unanimous
+
     providers:
         chain_provider:
             chain:
@@ -42,6 +45,11 @@ security:
             provider:                       chain_provider
             anonymous:                      true
 
+        embedded_form:
+            pattern:                        ^/embedded-form/(submit|success)
+            provider:                       chain_provider
+            anonymous:                      true
+
         main:
             pattern:                        ^/
             provider:                       chain_provider

diff --git a/app/phpunit.xml.dist b/app/phpunit.xml.dist
@@ -30,9 +30,11 @@
         </testsuite>
         <testsuite name="Project OroCRM Unit Tests">
             <directory suffix="Test.php">../src/OroCRM/src/OroCRM/Bundle/*Bundle/Tests/Unit</directory>
+            <directory suffix="Test.php">../src/OroCRMPackages/src/OroCRM/Bundle/*Bundle/Tests/Unit</directory>
         </testsuite>
         <testsuite name="Project OroCRM Functional Tests">
             <directory suffix="Test.php">../src/OroCRM/src/OroCRM/Bundle/*Bundle/Tests/Functional</directory>
+            <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/Bundle/*Bundle/Tests/Unit</directory>

diff --git a/composer.json b/composer.json
@@ -2,16 +2,16 @@
     "name": "oro/crm-application",
     "description": "The OroCRM distribution",
     "homepage": "https://github.com/orocrm/crm-application.git",
-    "license": "The Open Software License version 3.0",
+    "license": "OSL-3.0",
     "autoload": {
         "psr-0": { 
            "": "src/"
          }
     },
     "require": {
-        "oro/platform": "1.0.0-rc2",
-        "oro/crm": "1.0.0-rc1",
-        "escapestudios/wsse-authentication-bundle": "2.3.x-dev#ac3f700a88966e6483ff84d5de2b751d7622736d"
+        "oro/platform": "1.0.0-rc3",
+        "oro/crm": "1.0.0-rc2",
+        "oro/crm-magento-embedded-contact-us": "1.0.0-rc1"
     },
     "scripts": {
         "post-install-cmd": [