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

Author: rgrebenchuk

CHANGELOG.md

@@ -1,3 +1,15 @@
+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)
+ * ACL management in scope of organization and business unit
+ * "Option Set" Field Type for Entity Field
+ * Form validation improvements
+ * Tabs implementation on entity view pages
+ * Eliminated registry js-component
+ * Implemented responsive markup on most pages
+
 CHANGELOG for 1.0.0-beta4
 ===================
 This changelog references the relevant changes (new features, changes and bugs) done in 1.0.0-beta4 versions.

app/AppKernel.php

@@ -1,6 +1,5 @@
 <?php
 
-use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\Config\Loader\LoaderInterface;
 
 use Oro\Bundle\DistributionBundle\OroKernel;
@@ -9,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();

app/config/config.yml

@@ -43,7 +43,6 @@ twig:
 assetic:
     debug:                    false
     use_controller:           false
-
     #java: /usr/bin/java
     filters:
         cssrewrite: ~
@@ -204,9 +203,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!

app/config/config_dev.yml

@@ -23,8 +23,6 @@ monolog:
             level: info
 
 oro_assetic:
-    js_debug:       ~
-    js_debug_all:   false
     css_debug:      ~
     css_debug_all:  false
 

app/config/config_test.yml

@@ -34,8 +34,6 @@ monolog:
             level: error
 
 oro_assetic:
-    js_debug:       ~
-    js_debug_all:   false
     css_debug:      ~
     css_debug_all:  false
 

app/config/routing.yml

@@ -12,9 +12,6 @@ _imagine:
     resource: .
     type:     imagine
 
-_apy_jsformvalidation:
-    resource: "@APYJsFormValidationBundle/Resources/config/routing/routing.yml"
-
 #
 # ORO routes
 #

app/karma.conf.js.dist

@@ -1,4 +1,4 @@
-/* global module, config */
+/* global module */
 module.exports = function(config) {
   'use strict';
 
@@ -22,23 +22,23 @@ module.exports = function(config) {
     ],
 
     preprocessors: {
-      'web/bundles/*/js/**/*.js': ['requirejs-exposure', 'coverage']
+      'web/bundles/*/js/**/*.js': ['requirejs-exposure']//, 'coverage']
     },
 
     // use dots reporter, as travis terminal does not support escaping sequences
     // possible values: 'dots', 'progress'
     // CLI --reporters progress
-    reporters: ['progress', 'coverage', 'junit'],
+    reporters: ['progress', /*'coverage',*/ 'junit'],
 
     junitReporter: {
       // will be resolved to basePath (in the same way as files/exclude patterns)
       outputFile: 'build/logs/karma.xml'
     },
 
-    coverageReporter: {
+    /*coverageReporter: {
       type: 'html',
       dir:  'build/logs/js-coverage/'
-    },
+    },*/
 
     // web server port
     // CLI --port 9876
@@ -85,7 +85,7 @@ module.exports = function(config) {
       'karma-requirejs',
       'karma-jasmine',
       'karma-junit-reporter',
-      'karma-coverage',
+//      'karma-coverage',
       'karma-phantomjs-launcher',
 //      'karma-chrome-launcher',
 //      'karma-firefox-launcher',

composer.json

@@ -10,24 +10,20 @@
          }
     },
     "require": {
-        "oro/platform": "1.0.0-beta4"
+        "oro/platform": "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",