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

Author: rgrebenchuk

Diff for: .travis.yml

@@ -7,14 +7,10 @@ php:
 
 env:
   - SYMFONY_VERSION=2.3.*
-  - SYMFONY_VERSION=dev-master
 
 before_script:
   - composer self-update
+  - phpenv config-add travis.php.ini
   - composer require symfony/symfony:${SYMFONY_VERSION} --prefer-source
 
 script: phpunit --coverage-text
-
-matrix:
-  allow_failures:
-    - env: SYMFONY_VERSION=dev-master

Diff for: CHANGELOG.md

@@ -1,9 +1,19 @@
+CHANGELOG for 1.0.0-beta1
+===================
+This changelog references the relevant changes (new features, changes and bugs) done in 1.0.0-beta1 versions.
+
+* 1.0.0-beta1 (2013-09-30)
+  * CRM Entities reports
+  * Contacts Import/Export
+  * Account association with contacts
+  * Custom entities and fields in usage
+
 CHANGELOG for 1.0.0-alpha6
 ===================
 
 * 1.0.0-alpha6 (2013-09-12)
-   * Leads and Opportunities
-   * Flexible Workflow Engine (FWE)
+  * Leads and Opportunities
+  * Flexible Workflow Engine (FWE)
 
 CHANGELOG for 1.0.0-alpha5
 ===================

Diff for: README.md

@@ -10,7 +10,7 @@ chapter.
 Requirements
 ------------
 
-OroCRM requires Symfony 2, Doctrine 2 and PHP 5.3.3 or above.
+OroCRM requires Symfony 2, Doctrine 2 and PHP 5.3.8 or above.
 
 Installation
 ------------
@@ -31,3 +31,12 @@ To run unit tests of any bundnles :
 ```bash
 phpunit
 ```
+
+Use as dependency in composer
+-----------------------------
+
+```yaml
+    "require": {
+        "oro/crm": "dev-master",
+    }
+```

Diff for: UPGRADE.md

@@ -1,7 +1,7 @@
-UPGRADE FROM 1.0.0-alpha versions
+UPGRADE to any 1.0.0-alpha and beta version
 =======================
 
 ### General
 
-  * Upgrade to any 1.0.0-alpha is not supported and full reinstall is required
+  * Upgrade to 1.0.0-alpha or beta is not supported and full reinstall with drop database, clear cache folders is required
 

Diff for: composer.json

@@ -4,16 +4,13 @@
     "homepage": "https://github.com/orocrm/crm.git",
     "license": "The Open Software License version 3.0",
     "autoload": {
-        "psr-0": { "OroCRM\\Bundle": "src/" }
+        "psr-0": { 
+            "OroCRM\\Bundle": "src/" 
+         }
     },
     "require": {
-        "php": ">=5.3.3",
-        "oro/platform": "1.0.*@dev"
+        "php": ">=5.3.8",
+        "oro/platform": "dev-master"
     },
-    "minimum-stability": "dev",
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.0-dev"
-        }
-     }
+    "minimum-stability": "dev"
 }

Diff for: phpunit.xml.dist

@@ -15,7 +15,7 @@
 
     <testsuites>
         <testsuite name="Project Unit Tests">
-            <directory suffix="Test.php">src/*/Bundle/*Bundle/Tests/Unit</directory>
+            <directory suffix="Test.php">src/OroCRM/Bundle/*Bundle/Tests/Unit</directory>
         </testsuite>
     </testsuites>
 
@@ -29,13 +29,10 @@
             <directory>src</directory>
             <exclude>
                 <directory>vendor</directory>
-                <directory>src/OroCRM/Bundle/DataFixtures</directory>
-                <directory>src/OroCRM/Bundle/DataFixtures</directory>
-                <directory>src/OroCRM/Bundle/Resources</directory>
-                <directory>src/OroCRM/Bundle/Tests</directory>
-                <directory>src/OroCRM/Bundle/Resources</directory>
-                <directory>src/OroCRM/Bundle/Tests</directory>
-                <directory>src/OroCRM/Bundle/vendor</directory>
+                <directory>src/OroCRM/Bundle/*Bundle/DataFixtures</directory>
+                <directory>src/OroCRM/Bundle/*Bundle/Resources</directory>
+                <directory>src/OroCRM/Bundle/*Bundle/Tests</directory>
+                <directory>src/OroCRM/Bundle/*Bundle/vendor</directory>
             </exclude>
         </whitelist>
     </filter>