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

.gitignore

@@ -2,8 +2,10 @@
 /.buildpath
 /.project
 /.idea
+/node_modules
 /composer.phar
 composer.lock
+/build/logs/*
 /vendor
 /cov
 /web/bundles

CHANGELOG.md

@@ -1,3 +1,15 @@
+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 
+ * Grid refactoring
+ * Form validation improvements
+ * Make all entities as Extended
+ * JavaScript Tests
+ * 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

@@ -16,11 +16,15 @@ Installation
 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/platform-application.git Platform Application project with
 
+```bash
     git clone https://github.com/orocrm/platform-application.git
+```
 
 - Make sure that you have installed Java
 
@@ -30,20 +34,29 @@ http://getcomposer.org/ or just run the following command:
 
 - Install Platform Application 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 "bap_standard")
 
 - Open the BAP 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
 app/console clank:server
+```
 
 [1]:  http://symfony.com/doc/2.3/book/installation.html
 [2]:  http://getcomposer.org/

app/.gitignore

@@ -1,2 +1,3 @@
 /bootstrap.php.cache
 /phpunit.xml
+/karma.conf.js

app/config/routing.yml

@@ -24,10 +24,6 @@ oro_default:
         template:    :Default:index.html.twig
         _controller: FrameworkBundle:Template:template
 
-oro_assets:
-    resource: .
-    type:     oro_assetic
-
 oro_auto_routing:
     resource: .
     type:     oro_auto

app/karma.conf.js.dist

@@ -0,0 +1,95 @@
+/* global module, config */
+module.exports = function(config) {
+  'use strict';
+
+  config.set({
+    // base path, that will be used to resolve files and exclude
+    basePath: '../',
+
+    frameworks: ['jasmine', 'requirejs-exposure', 'requirejs'],
+
+    // list of files / patterns to load in the browser
+    files: [
+      {pattern: 'web/bundles/**/*.js', included: false},
+      {pattern: 'src/*/src/*/Bundle/*Bundle/Tests/JS/**/*Spec.js', included: false},
+
+      'web/js/require-config.js',
+      'src/Oro/src/Oro/Bundle/TestFrameworkBundle/Karma/main.js'
+    ],
+
+    // list of files to exclude
+    exclude: [
+    ],
+
+    preprocessors: {
+      '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'],
+
+    junitReporter: {
+      // will be resolved to basePath (in the same way as files/exclude patterns)
+      outputFile: 'build/logs/karma.xml'
+    },
+
+    coverageReporter: {
+      type: 'html',
+      dir:  'build/logs/js-coverage/'
+    },
+
+    // web server port
+    // CLI --port 9876
+    port: 9876,
+
+    // enable / disable colors in the output (reporters and logs)
+    // CLI --colors --no-colors
+    colors: true,
+
+    // level of logging
+    // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
+    // CLI --log-level debug
+    logLevel: config.LOG_INFO,
+
+    // enable / disable watching file and executing tests whenever any file changes
+    // CLI --auto-watch --no-auto-watch
+    autoWatch: true,
+
+    // Start these browsers, currently available:
+    // - Chrome
+    // - ChromeCanary
+    // - Firefox
+    // - Opera
+    // - Safari (only Mac)
+    // - PhantomJS
+    // - IE (only Windows)
+    // CLI --browsers Chrome,Firefox,Safari
+//    browsers: [process.env.TRAVIS ? 'Firefox' : 'Chrome'],
+    browsers: ['PhantomJS'],
+
+    // If browser does not capture in given timeout [ms], kill it
+    // CLI --capture-timeout 5000
+    captureTimeout: 20000,
+
+    // Auto run tests on start (when browsers are captured) and exit
+    // CLI --single-run --no-single-run
+    singleRun: false,
+
+    // report which specs are slower than 500ms
+    // CLI --report-slower-than 500
+    reportSlowerThan: 500,
+
+    plugins: [
+      'karma-requirejs',
+      'karma-jasmine',
+      'karma-junit-reporter',
+      'karma-coverage',
+      'karma-phantomjs-launcher',
+//      'karma-chrome-launcher',
+//      'karma-firefox-launcher',
+      'karma-requirejs-exposure'
+    ]
+  });
+};

composer.json

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