Merge branch 1.0.0-alpha3

CHANGELOG.md

@@ -0,0 +1,17 @@
+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
+ * Many-to-many relation between Contacts and Accounts
+ * Added ability to sort Contacts and Accounts by Phone and Email in a Grid
+ * Localized countries and regions
+ * Enhanced data change log with ability to save changes for collections
+ * Removed dependency on lib ICU
+

README.md

@@ -1,61 +1,61 @@
-OroCRM Application
-========================
-
-Welcome to OroCRM an Open Source Client Relationship Management (CRM) tool.
-
-This document contains information on how to download, install, and start
-using OroCRM. For a more detailed explanation, see the [Installation]
-chapter.
-
-Important Note: this application is not production ready and is intendant for evaluation and development only!
-
-Requirements
-------------
-
-OroCRM requires Symfony 2, Doctrine 2 and PHP 5.3.3 or above.
-
-Installation instructions:
--------------------------
-
-
-### Using Composer
-
-[As both Symfony 2 and OroCRM use [Composer][2] to manage their dependencies, this is the recommended way to install OroCRM.]
-
-If you don't have Composer yet, download it following the instructions on
-http://getcomposer.org/ or just run the following command:
-
-    curl -s https://getcomposer.org/installer | php
-
-- Clone https://github.com/orocrm/crm-application.git OroCRM project with
-
-    git clone https://github.com/orocrm/crm-application.git
-
-- Go to app/config folder and create parameters.yml using parameters.dist.yml as example. Update database name and credentials
-- Install OroCRM dependencies with composer. If installation process seems too slow you can use "--prefer-dist" option.
-
-    php composer.phar install
-
-- Initialize application with install 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".
-
-Checking your System Configuration
--------------------------------------
-
-Before starting to code, make sure that your local system is properly
-configured for a Symfony application.
-
-Execute the `check.php` script from the command line:
-
-    php app/check.php
-
-Access the `config.php` script from a browser:
-
-    http://your_domain/path/to/symfony/app/web/config.php
-
-If you get any warnings or recommendations, fix them before moving on.
-
-
-[1]:  http://symfony.com/doc/2.1/book/installation.html
+OroCRM Application
+========================
+
+Welcome to OroCRM an Open Source Client Relationship Management (CRM) tool.
+
+This document contains information on how to download, install, and start
+using OroCRM. For a more detailed explanation, see the [Installation]
+chapter.
+
+Important Note: this application is not production ready and is intendant for evaluation and development only!
+
+Requirements
+------------
+
+OroCRM requires Symfony 2, Doctrine 2 and PHP 5.3.3 or above.
+
+Installation instructions:
+-------------------------
+
+
+### Using Composer
+
+[As both Symfony 2 and OroCRM use [Composer][2] to manage their dependencies, this is the recommended way to install OroCRM.]
+
+If you don't have Composer yet, download it following the instructions on
+http://getcomposer.org/ or just run the following command:
+
+    curl -s https://getcomposer.org/installer | php
+
+- Clone https://github.com/orocrm/crm-application.git OroCRM project with
+
+    git clone https://github.com/orocrm/crm-application.git
+
+- Go to app/config folder and create parameters.yml using parameters.dist.yml as example. Update database name and credentials
+- Install OroCRM dependencies with composer. If installation process seems too slow you can use "--prefer-dist" option.
+
+    php composer.phar install
+
+- Initialize application with install 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".
+
+Checking your System Configuration
+-------------------------------------
+
+Before starting to code, make sure that your local system is properly
+configured for a Symfony application.
+
+Execute the `check.php` script from the command line:
+
+    php app/check.php
+
+Access the `config.php` script from a browser:
+
+    http://your_domain/path/to/symfony/app/web/config.php
+
+If you get any warnings or recommendations, fix them before moving on.
+
+
+[1]:  http://symfony.com/doc/2.1/book/installation.html
 [2]:  http://getcomposer.org/

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(),

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

@@ -1,5 +1,5 @@
 {% extends 'OroUIBundle:Default:index.html.twig' %}
-{% 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 hash_nav %}{% endblock %}
 {% block bodyClass %}error-page{% endblock %}
 {% block header %}

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() }}

app/cache/.gitignore

@@ -0,0 +1,5 @@
+/dev
+/prod
+/test
+/devjs
+/perf

app/config/config.yml

@@ -124,13 +124,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:
@@ -153,6 +152,10 @@ liip_imagine:
                 thumbnail:    { size: [58, 58], mode: outbound }
                 strip:        ~
 
+genemu_form:
+    select2: ~
+    autocomplete: ~
+
 oro_search:
     engine:                   orm
     realtime_update:          true

app/config/routing.yml

@@ -18,6 +18,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

app/logs/.gitignore

@@ -0,0 +1,2 @@
+/*.log
+/*.png