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

oroinc · Dec 5, 2013 · 8272fef · 8272fef
2 parents 69934e2 + 4079080
commit 8272fef
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 27 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,13 @@
+CHANGELOG for 1.0.0-beta5
+===================
+This changelog references the relevant changes (new features, changes and bugs) done in 1.0.0-beta5 versions.
+
+* 1.0.0-beta5 (2013-12-05)
+ * Reports creation wizard (Table reports)
+ * B2B Sales Flow adjustments
+ * Call entity
+ * Add weather layer in the map on contact view page
+
 CHANGELOG for 1.0.0-beta4
 ===================
 This changelog references the relevant changes (new features, changes and bugs) done in 1.0.0-beta4 versions.

diff --git a/app/AppKernel.php b/app/AppKernel.php
@@ -8,7 +8,9 @@ class AppKernel extends OroKernel
 {
     public function registerBundles()
     {
-        $bundles = array();
+        $bundles = array(
+        //bundles
+        );
 
         if (in_array($this->getEnvironment(), array('dev', 'test'))) {
             $bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle();

diff --git a/app/config/config.yml b/app/config/config.yml
@@ -205,9 +205,6 @@ a2lix_translation_form:
     locales:                  [en, fr]
     templating:               "OroUIBundle:Form:translateable.html.twig"
 
-apy_js_form_validation:
-    check_modes:              [submit]
-
 lexik_maintenance:
     authorized:
         path:                 "maintenance|.*\.js"             # "maintenance" is only for demo purposes, remove in production!

diff --git a/app/config/config_dev.yml b/app/config/config_dev.yml
@@ -22,8 +22,6 @@ twig:
     base_template_class: Oro\Bundle\UIBundle\Twig\Template
 
 oro_assetic:
-    js_debug:       ~
-    js_debug_all:   false
     css_debug:      ~
     css_debug_all:  false
 

diff --git a/app/config/routing.yml b/app/config/routing.yml
@@ -12,9 +12,6 @@ _imagine:
     resource: .
     type:     imagine
 
-_apy_jsformvalidation:
-    resource: "@APYJsFormValidationBundle/Resources/config/routing/routing.yml"
-
 #
 # ORO routes
 #
@@ -26,4 +23,4 @@ oro_default:
 
 oro_auto_routing:
     resource: .
-    type:     oro_auto
+    type:     oro_auto
diff --git a/composer.json b/composer.json
@@ -10,25 +10,21 @@
          }
     },
     "require": {
-        "oro/platform": "1.0.0-beta4",
-        "oro/crm": "1.0.0-beta4"
+        "oro/platform": "1.0.0-beta5",
+        "oro/crm": "1.0.0-beta5"
     },
     "scripts": {
         "post-install-cmd": [
             "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap",
-            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
-            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile",
-            "php app/console fos:js-routing:dump --target=web/js/routes.js"
+            "Oro\\Bundle\\InstallerBundle\\Composer\\ScriptHandler::installAssets"
         ],
         "post-update-cmd": [
             "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap",
-            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
-            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile",
-            "php app/console fos:js-routing:dump --target=web/js/routes.js"
+            "Oro\\Bundle\\InstallerBundle\\Composer\\ScriptHandler::installAssets"
         ]
     },
     "minimum-stability": "dev",

diff --git a/web/install.php b/web/install.php