Merge branch 1.0.0-alpha3

CHANGELOG.md

@@ -0,0 +1,15 @@
+CHANGELOG for 1.0.0-alpha3
+===================
+
+This changelog references the relevant changes (new features, changes and bugs) done in 1.0.0-alpha3 versions.
+
+* 1.0.0-alpha3 (2013-06-27)
+ * Placeholders
+ * Developer toolbar works with AJAX navigation requests
+ * Configuring hidden columns in a Grid
+ * Auto-complete form type
+ * Added Address Book
+ * Localized countries and regions
+ * Enhanced data change log with ability to save changes for collections
+ * Removed dependency on lib ICU
+

README.md

@@ -18,9 +18,9 @@ http://getcomposer.org/ or just run the following command:
 
     curl -s https://getcomposer.org/installer | php
 
-- Clone https://github.com/orocrm/platform-application.git Platform Application project with
+- Clone http://github.com/orocrm/platform-application.git Platform Application project with
 
-    git clone https://github.com/orocrm/platform-application.git
+    git clone http://github.com/orocrm/platform-application.git
 
 - Go to app/config folder and create parameters.yml using parameters.dist.yml as example. Update database name and credentials
 - Install Platform Application dependencies with composer. If installation process seems too slow you can use "--prefer-dist" option.

UPGRADE.md

@@ -0,0 +1,7 @@
+UPGRADE FROM 1.0.0-alpha2 to 1.0.0-alpha3
+=======================
+
+### General
+
+  * Upgrade to 1.0.0-alpha3 is not supported and full reinstall is required
+

app/AppKernel.php

@@ -33,10 +33,12 @@ public function registerBundles()
             new Liip\ImagineBundle\LiipImagineBundle(),
             new Bazinga\ExposeTranslationBundle\BazingaExposeTranslationBundle(),
             new APY\JsFormValidationBundle\APYJsFormValidationBundle(),
+            new Genemu\Bundle\FormBundle\GenemuFormBundle(),
 
             // BAP bundles
             new Oro\Bundle\FlexibleEntityBundle\OroFlexibleEntityBundle(),
             new Oro\Bundle\UIBundle\OroUIBundle(),
+            new Oro\Bundle\FormBundle\OroFormBundle(),
             new Oro\Bundle\JsFormValidationBundle\OroJsFormValidationBundle(),
             new Oro\Bundle\SoapBundle\OroSoapBundle(),
             new Oro\Bundle\SearchBundle\OroSearchBundle(),
@@ -51,6 +53,7 @@ public function registerBundles()
             new Oro\Bundle\WindowsBundle\OroWindowsBundle(),
             new Oro\Bundle\AddressBundle\OroAddressBundle(),
             new Oro\Bundle\DataAuditBundle\OroDataAuditBundle(),
+
         );
 
         if (in_array($this->getEnvironment(), array('dev', 'devjs', 'test'))) {
@@ -61,7 +64,6 @@ public function registerBundles()
 
         if (in_array($this->getEnvironment(), array('test', 'perf'))) {
             $bundles[] = new Oro\Bundle\TestFrameworkBundle\OroTestFrameworkBundle();
-            $bundles[] = new Acme\Bundle\TestsBundle\AcmeTestsBundle();
         }
 
         return $bundles;

app/Resources/TwigBundle/views/Exception/error.html.twig

@@ -1,6 +1,6 @@
 {% extends 'OroUIBundle:Default:index.html.twig' %}
 {% block hash_nav %}{% endblock %}
-{% oro_title_set({titleTemplate : "%code% - %status%" , params: {'%code%': status_code, '%status%' :status_text }}) %}
+{% oro_title_set({titleTemplate : "%code% - %status%" , params: {'%code%': status_code, '%status%' :status_text }, force : true}) %}
 {% block bodyClass %}error-page{% endblock %}
 {% block header %}
 {% endblock %}

app/Resources/views/base.html.twig

@@ -1,5 +1,4 @@
 {% extends "OroUIBundle:Default:index.html.twig" %}
-{% use ':Default:components.html.twig' %}
 
 {% block head_script %}
     {{ parent() }}
@@ -11,3 +10,7 @@
     {{ block('head_style_component') }}
 {% endblock %}
 
+{% block main %}
+    {{ parent() }}
+    {{ oro_windows_restore() }}
+{% endblock %}

app/config/config.yml

@@ -43,6 +43,7 @@ assetic:
         - OroFilterBundle
         - OroNavigationBundle
         - OroWindowsBundle
+        - OroSegmentationTreeBundle
     #java: /usr/bin/java
     filters:
         cssrewrite: ~
@@ -91,19 +92,19 @@ knp_paginator:
 
 fos_rest:
     view:
-        failed_validation: HTTP_BAD_REQUEST
-        default_engine: php
+        failed_validation:    HTTP_BAD_REQUEST
+        default_engine:       php
         formats:
-            json: true
-            xml: true
+            json:             true
+            xml:              true
     format_listener:
-        prefer_extension: true
+        prefer_extension:     true
     body_listener:
         decoders:
-            json: fos_rest.decoder.json
-            xml: fos_rest.decoder.xml
+            json:             fos_rest.decoder.json
+            xml:              fos_rest.decoder.xml
     routing_loader:
-        default_format: json
+        default_format:       json
 
 fos_js_routing:
     routes_to_expose:         [oro_*]
@@ -121,13 +122,12 @@ be_simple_soap:
             resource_type:    yml
 
 stof_doctrine_extensions:
+    default_locale: en
+    translation_fallback: true
     orm:
         default:
             translatable:     true
             tree:             true
-            loggable:         true
-    class:
-        loggable:             Oro\Bundle\DataAuditBundle\EventListener\LoggableListener
 
 services:
     cache:
@@ -149,6 +149,9 @@ liip_imagine:
             filters:
                 thumbnail:    { size: [58, 58], mode: outbound }
                 strip:        ~
+genemu_form:
+    select2: ~
+    autocomplete: ~
 
 oro_search:
     engine:                   orm

app/config/config_dev.yml

@@ -18,6 +18,9 @@ monolog:
         firephp:
             type:  firephp
             level: info
+        chromephp:
+            type:  chromephp
+            level: info
 
 #swiftmailer:
 #    delivery_address: [email protected]

app/config/routing.yml

@@ -11,6 +11,10 @@ oro_ui:
     resource: "@OroUIBundle/Resources/config/routing.yml"
     prefix:   /ui
 
+oro_form:
+    resource: "@OroFormBundle/Resources/config/routing.yml"
+    prefix:   /
+
 oro_user:
     resource: "@OroUserBundle/Resources/config/routing.yml"
 

app/config/soap.yml

@@ -1,6 +1,6 @@
 classes:
   - Oro\Bundle\SearchBundle\Controller\Api\SoapController
-  - Oro\Bundle\UserBundle\Controller\Api\Soap\ProfileController
+  - Oro\Bundle\UserBundle\Controller\Api\Soap\UserController
   - Oro\Bundle\UserBundle\Controller\Api\Soap\RoleController
   - Oro\Bundle\UserBundle\Controller\Api\Soap\GroupController
   - Oro\Bundle\UserBundle\Controller\Api\Soap\AclController