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

CHANGELOG.md

@@ -1,3 +1,13 @@
+CHANGELOG for 1.0.0-beta4
+===================
+This changelog references the relevant changes (new features, changes and bugs) done in 1.0.0-beta4 versions.
+
+* 1.0.0-beta4 (2013-11-21)
+ * Removed install.bat/install.sh 
+ * Workflow transitions
+ * Make all entities as Extended
+ * End support for Internet Explorer 9 
+
 CHANGELOG for 1.0.0-beta3
 ===================
 This changelog references the relevant changes (new features, changes and bugs) done in 1.0.0-beta3 versions.

README.md

@@ -25,11 +25,15 @@ Installation instructions:
 If you don't have Composer yet, download it following the instructions on
 http://getcomposer.org/ or just run the following command:
 
+```bash
     curl -s https://getcomposer.org/installer | php
+```
 
 - Clone https://github.com/orocrm/crm-application.git OroCRM project with
 
+```bash
     git clone http://github.com/orocrm/crm-application.git
+```
 
 - Make sure that you have installed Java
 
@@ -38,34 +42,69 @@ http://getcomposer.org/ or just run the following command:
   you will be able to customize all the values interactively.
 - Install OroCRM dependencies with composer. If installation process seems too slow you can use "--prefer-dist" option.
 
-    php composer.phar install
+```bash
+    php composer.phar install --prefer-dist
+```
 
 - Create the database (default name is "oro_crm")
 
 - Open the OroCRM URL and initialize application with Install Wizard
-  Alternatively with script (for Linux and Mac OS install.sh, for Windows install.bat)
-  After installation you can login as application administrator using user name "admin" and password "admin".
+
+- Alternatively with command line
+
+```bash
+app/console oro:install
+```
+
+- After installation you can login as application administrator using user name "admin" and password "admin".
 
 Instant messaging between the browser and the web server
 --------------------------------------------------------
 To use this feature you need to configure parameters.yml websocket parameters and run server with console command
 
- ```bash
+```bash
 app/console clank:server --env prod
+```
 
 Reporting
 ---------
 To use this feature you need to run report data collector with console command
 
- ```bash
+```bash
 app/console oro:report:update --env prod
+```
 
 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
+```
+
+Instant messaging between the browser and the web server
+--------------------------------------------------------
+To use this feature you need to configure parameters.yml websocket parameters and run server with console command
+
+```bash
+app/console clank:server --env prod
+```
+
+Reporting
+---------
+To use this feature you need to run report data collector with console command
+
+```bash
+app/console oro:report:update --env prod
+```
+
+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
+```
 
 Checking your System Configuration
 -------------------------------------
@@ -75,7 +114,9 @@ configured for a Symfony application.
 
 Execute the `check.php` script from the command line:
 
+```bash
     php app/check.php
+```
 
 Access the `config.php` script from a browser:
 

app/config/config.yml

@@ -43,10 +43,6 @@ twig:
 assetic:
     debug:                    false
     use_controller:           false
-    bundles:
-        - OroCRMDashboardBundle
-        - OroCRMAccountBundle
-        - OroCRMContactBundle
 
     #java: /usr/bin/java
     filters:

app/config/config_test.yml

@@ -34,11 +34,5 @@ monolog:
         main:
             level: error
 
-oro_assetic:
-    js_debug:       ~
-    js_debug_all:   false
-    css_debug:      ~
-    css_debug_all:  false
-
 oro_require_js:
     js_engine: ~

app/config/routing.yml

@@ -15,22 +15,6 @@ _imagine:
 _apy_jsformvalidation:
     resource: "@APYJsFormValidationBundle/Resources/config/routing/routing.yml"
 
-#
-# OROCRM routes
-#
-orocrm_contact:
-    resource: "@OroCRMContactBundle/Resources/config/routing.yml"
-
-orocrm_account:
-    resource: "@OroCRMAccountBundle/Resources/config/routing.yml"
-
-orocrm_sales:
-    resource: "@OroCRMSalesBundle/Resources/config/routing.yml"
-    prefix:   /sales
-
-orocrm_report:
-    resource: "@OroCRMReportBundle/Resources/config/routing.yml"
-
 #
 # ORO routes
 #

composer.json

@@ -10,8 +10,8 @@
          }
     },
     "require": {
-        "oro/platform": "1.0.0-beta3",
-        "oro/crm": "1.0.0-beta3"
+        "oro/platform": "1.0.0-beta4",
+        "oro/crm": "1.0.0-beta4"
     },
     "scripts": {
         "post-install-cmd": [