Merge branch 'release'

.gitignore

@@ -17,4 +17,5 @@ build/
 /web/uploads/users/*
 /web/media/cache
 /app/config/parameters.yml
+/app/config/parameters_test.yml
 *~

CHANGELOG.md

@@ -1,3 +1,8 @@
+CHANGELOG for 1.0.0-alpha4
+===================
+* 1.0.0-alpha4 (2013-07-31)
+ * Address Types Management. Added ability to set different type for addresses in Contact address book
+
 CHANGELOG for 1.0.0-alpha3
 ===================
 

README.md

@@ -7,7 +7,7 @@ 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!
+Important Note: this application is not production ready and is intended for evaluation and development only!
 
 Requirements
 ------------
@@ -27,11 +27,13 @@ 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
+- Clone http://github.com/orocrm/crm-application.git OroCRM project with
 
-    git clone https://github.com/orocrm/crm-application.git
+    git clone http://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
+- Go to app/config folder and create parameters.yml using parameters.yml.dist as example. Update database name and credentials.
+  Alternatively parameters.yml can be created automatically on the next step when run composer install command,
+  you will be able to customize all the values interactively.
 - Install OroCRM dependencies with composer. If installation process seems too slow you can use "--prefer-dist" option.
 
     php composer.phar install
@@ -58,4 +60,4 @@ 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/
+[2]:  http://getcomposer.org/

app/AppKernel.php

@@ -34,6 +34,7 @@ public function registerBundles()
             new Bazinga\ExposeTranslationBundle\BazingaExposeTranslationBundle(),
             new APY\JsFormValidationBundle\APYJsFormValidationBundle(),
             new Genemu\Bundle\FormBundle\GenemuFormBundle(),
+            new A2lix\TranslationFormBundle\A2lixTranslationFormBundle(),
 
             // BAP bundles
             new Oro\Bundle\FlexibleEntityBundle\OroFlexibleEntityBundle(),
@@ -53,15 +54,24 @@ public function registerBundles()
             new Oro\Bundle\WindowsBundle\OroWindowsBundle(),
             new Oro\Bundle\AddressBundle\OroAddressBundle(),
             new Oro\Bundle\DataAuditBundle\OroDataAuditBundle(),
+            new Oro\Bundle\TagBundle\OroTagBundle(),
+            new Oro\Bundle\AsseticBundle\OroAsseticBundle(),
+            new Oro\Bundle\TranslationBundle\OroTranslationBundle(),
+            new Oro\Bundle\OrganizationBundle\OroOrganizationBundle(),
+            new Oro\Bundle\NotificationBundle\OroNotificationBundle($this),
+            new Oro\Bundle\EmailBundle\OroEmailBundle(),
+            new Oro\Bundle\EntityBundle\OroEntityBundle(),
+            new Oro\Bundle\EntityConfigBundle\OroEntityConfigBundle(),
+            new Oro\Bundle\EntityExtendBundle\OroEntityExtendBundle(),
+            new Oro\Bundle\ImapBundle\OroImapBundle(),
 
             // CRM bundles
             new OroCRM\Bundle\AccountBundle\OroCRMAccountBundle(),
             new OroCRM\Bundle\ContactBundle\OroCRMContactBundle(),
-            new OroCRM\Bundle\DashboardBundle\OroCRMDashboardBundle(),
-
+            new OroCRM\Bundle\DashboardBundle\OroCRMDashboardBundle()
         );
 
-        if (in_array($this->getEnvironment(), array('dev', 'devjs', 'test'))) {
+        if (in_array($this->getEnvironment(), array('dev', 'test'))) {
             $bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle();
             $bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle();
             $bundles[] = new Sensio\Bundle\GeneratorBundle\SensioGeneratorBundle();

app/SymfonyRequirements.php

@@ -16,7 +16,7 @@
  *
  * ************** CAUTION **************
  *
- * DO NOT EDIT THIS FILE as it will be overriden by Composer as part of
+ * DO NOT EDIT THIS FILE as it will be overridden by Composer as part of
  * the installation/update process. The original file resides in the
  * SensioDistributionBundle.
  *
@@ -307,7 +307,7 @@ public function getFailedRequirements()
     }
 
     /**
-     * Returns all optional recommmendations.
+     * Returns all optional recommendations.
      *
      * @return array Array of Requirement instances
      */
@@ -475,11 +475,19 @@ function_exists('simplexml_import_dom'),
         );
 
         if (function_exists('apc_store') && ini_get('apc.enabled')) {
-            $this->addRequirement(
-                version_compare(phpversion('apc'), '3.0.17', '>='),
-                'APC version must be at least 3.0.17',
-                'Upgrade your <strong>APC</strong> extension (3.0.17+).'
-            );
+            if (version_compare($installedPhpVersion, '5.4.0', '>=')) {
+                $this->addRequirement(
+                    version_compare(phpversion('apc'), '3.1.13', '>='),
+                    'APC version must be at least 3.1.13 when using PHP 5.4',
+                    'Upgrade your <strong>APC</strong> extension (3.1.13+).'
+                );
+            } else {
+                $this->addRequirement(
+                    version_compare(phpversion('apc'), '3.0.17', '>='),
+                    'APC version must be at least 3.0.17',
+                    'Upgrade your <strong>APC</strong> extension (3.0.17+).'
+                );
+            }
         }
 
         $this->addPhpIniRequirement('detect_unicode', false);
@@ -546,6 +554,12 @@ function_exists('simplexml_import_dom'),
             'Your project might not work properly due to the PHP bug #61453 ("Cannot dump definitions which have method calls"). Install PHP 5.4.1 or newer.'
         );
 
+        $this->addRecommendation(
+            version_compare($installedPhpVersion, '5.4.11', '>='),
+            'When using the logout handler from the Symfony Security Component, you should have at least PHP 5.4.11 due to PHP bug #63379 (as a workaround, you can also set invalidate_session to false in the security logout handler configuration)',
+            'Install PHP 5.4.11 or newer if your project the logout handler from the Symfony Security Component.'
+        );
+
         if (null !== $pcreVersion) {
             $this->addRecommendation(
                 $pcreVersion >= 8.0,
@@ -622,11 +636,15 @@ class_exists('Locale'),
         }
 
         $accelerator =
-            (function_exists('apc_store') && ini_get('apc.enabled'))
+            (extension_loaded('eaccelerator') && ini_get('eaccelerator.enable'))
+            ||
+            (extension_loaded('apc') && ini_get('apc.enabled'))
+            ||
+            (extension_loaded('Zend OPcache') && ini_get('opcache.enable'))
             ||
-            function_exists('eaccelerator_put') && ini_get('eaccelerator.enable')
+            (extension_loaded('xcache') && ini_get('xcache.cacher'))
             ||
-            function_exists('xcache_set')
+            (extension_loaded('wincache') && ini_get('wincache.ocenabled'))
         ;
 
         $this->addRecommendation(

app/check.php

@@ -25,8 +25,13 @@
 
 echo_title('Mandatory requirements');
 
+$checkPassed = true;
 foreach ($symfonyRequirements->getRequirements() as $req) {
+    /** @var $req Requirement */
     echo_requirement($req);
+    if (!$req->isFulfilled()) {
+        $checkPassed = false;
+    }
 }
 
 echo_title('Optional recommendations');
@@ -35,6 +40,8 @@
     echo_requirement($req);
 }
 
+exit($checkPassed ? 0 : 1);
+
 /**
  * Prints a Requirement instance
  */

app/config/config.yml

@@ -14,11 +14,13 @@ framework:
     validation:      { enable_annotations: true }
     templating:      { engines: ['twig', 'php'] } #assets_version: SomeVersionScheme
     default_locale:  "%locale%"
-    trust_proxy_headers: false # Deprecated in 2.0; will be removed in 2.3 (used trusted_proxies instead)
     trusted_proxies: ~
     session:
         cookie_lifetime:      43200
         name:                 BAPID
+    fragments:
+        enabled: true
+        path: /_fragment # used for controller action in template
 
 # Twig Configuration
 twig:
@@ -30,6 +32,12 @@ twig:
         bap:
             layout:           ::base.html.twig  # default layout across all Oro bundles
             start_route:      oro_default
+    form:
+        resources:
+            - 'OroUIBundle:Form:fields.html.twig'
+            - 'OroFormBundle:Form:fields.html.twig'
+            - 'OroTranslationBundle:Form:fields.html.twig'
+            - 'OroAddressBundle:Include:fields.html.twig'
 
 # Assetic Configuration
 assetic:
@@ -46,6 +54,8 @@ assetic:
         - OroWindowsBundle
         - OroCRMAccountBundle
         - OroCRMContactBundle
+        - OroAsseticBundle
+        - OroEntityExtendBundle
     #java: /usr/bin/java
     filters:
         cssrewrite: ~
@@ -132,7 +142,8 @@ stof_doctrine_extensions:
             tree:             true
 
 services:
-    cache:
+    oro.cache.abstract:
+        abstract: true
         class:                Doctrine\Common\Cache\PhpFileCache
         arguments:            [%kernel.cache_dir%]
     twig.extension.intl:
@@ -171,3 +182,31 @@ oro_user:
     settings:
         name_format:
           value:              %%last%%, %%first%%
+
+oro_translation:
+    js_translation:
+        # order of domains reflects messages fallback
+        domains: [jsmessages, validators]
+
+oro_assetic:
+    uncompress_js: ~
+    uncompress_css: ~
+
+jms_di_extra:
+    doctrine_integration: false
+
+oro_entity_extend:
+    backend:        Dynamic
+    backup:         "%kernel.root_dir%/entities/Backup/"
+
+a2lix_translation_form:
+    locales: [en, fr]
+    default_required: true
+    templating: "OroUIBundle:Form:translateable.html.twig"
+    use_aop: false
+    default_class:
+        service: "A2lix\TranslationFormBundle\TranslationForm\DefaultTranslationForm"
+        listener: "A2lix\TranslationFormBundle\Form\EventListener\DefaultTranslationsSubscriber"
+        types:
+             translations: "A2lix\TranslationFormBundle\Form\Type\TranslationsType"
+             translationsFields: "A2lix\TranslationFormBundle\Form\Type\TranslationsFieldsType"

app/config/config_test.yml

@@ -9,6 +9,8 @@ framework:
         storage_id: session.storage.mock_file
     csrf_protection: true
     router:   { resource: "%kernel.root_dir%/config/routing_test.yml" }
+    profiler:
+            enabled: false
 
 services:
     twig.extension.debug:

app/config/routing.yml

@@ -6,13 +6,10 @@ orocrm_account:
     resource: "@OroCRMAccountBundle/Resources/config/routing.yml"
 
 oro_default:
-    pattern:  /{_locale}
+    pattern:  /
     defaults:
         template:    OroCRMDashboardBundle:Default:index.html.twig
-        _locale:     %locale%
         _controller: FrameworkBundle:Template:template
-    requirements:
-        _locale:  en|fr|de
 
 oro_ui:
     resource: "@OroUIBundle/Resources/config/routing.yml"
@@ -22,6 +19,10 @@ oro_form:
     resource: "@OroFormBundle/Resources/config/routing.yml"
     prefix:   /
 
+oro_notification:
+    resource: "@OroNotificationBundle/Resources/config/routing.yml"
+    prefix:   /
+
 oro_user:
     resource: "@OroUserBundle/Resources/config/routing.yml"
 
@@ -50,6 +51,22 @@ oro_config:
 oro_dataaudit:
     resource: "@OroDataAuditBundle/Resources/config/routing.yml"
 
+oro_address:
+    resource: "@OroAddressBundle/Resources/config/routing.yml"
+    prefix:   /
+
+oro_tag:
+    resource: "@OroTagBundle/Resources/config/routing.yml"
+    prefix:   /
+
+oro_email:
+    resource: "@OroEmailBundle/Resources/config/routing.yml"
+    prefix:   /
+
+oro_organization:
+    resource: "@OroOrganizationBundle/Resources/config/routing.yml"
+    prefix:   /
+
 nelmio_api_doc:
     resource: "@NelmioApiDocBundle/Resources/config/routing.yml"
     prefix:   /api/doc
@@ -61,12 +78,18 @@ _imagine:
     resource: .
     type:     imagine
 
-oro_address:
-    resource: "@OroAddressBundle/Resources/config/routing.yml"
-    prefix:   /
-
-_bazinga_exposetranslation:
-    resource: "@BazingaExposeTranslationBundle/Resources/config/routing/routing.yml"
+oro_translation_bundle:
+    resource: "@OroTranslationBundle/Resources/config/routing.yml"
 
 _apy_jsformvalidation:
     resource: "@APYJsFormValidationBundle/Resources/config/routing/routing.yml"
+
+oro_assets:
+    resource: .
+    type: oro_assetic
+
+oro_entity_config:
+    resource: "@OroEntityConfigBundle/Resources/config/routing.yml"
+
+oro_entity_extend:
+    resource: "@OroEntityExtendBundle/Resources/config/routing.yml"

app/config/soap.yml

@@ -5,6 +5,11 @@ classes:
   - Oro\Bundle\UserBundle\Controller\Api\Soap\GroupController
   - Oro\Bundle\UserBundle\Controller\Api\Soap\AclController
   - Oro\Bundle\AddressBundle\Controller\Api\Soap\AddressController
+  - Oro\Bundle\AddressBundle\Controller\Api\Soap\AddressTypeController
+  - Oro\Bundle\AddressBundle\Controller\Api\Soap\CountryController
+  - Oro\Bundle\AddressBundle\Controller\Api\Soap\RegionController
+  - Oro\Bundle\DataAuditBundle\Controller\Api\Soap\AuditController
   - OroCRM\Bundle\AccountBundle\Controller\Api\Soap\AccountController
   - OroCRM\Bundle\ContactBundle\Controller\Api\Soap\ContactController
   - OroCRM\Bundle\ContactBundle\Controller\Api\Soap\ContactGroupController
+  - Oro\Bundle\OrganizationBundle\Controller\Api\Soap\BusinessUnitController

app/entities/Backup/.gitignore

@@ -0,0 +1 @@
+/*.sql

app/entities/Extend/.gitignore

@@ -0,0 +1,2 @@
+/*.php
+/*.yml

app/entities/Extend/Entity/Dynamic/.gitignore

@@ -0,0 +1,2 @@
+/*.php
+/*.yml

app/entities/Extend/Entity/EAV/.gitignore

@@ -0,0 +1,2 @@
+/*.php
+/*.yml

app/entities/Extend/Proxy/.gitignore

@@ -0,0 +1,2 @@
+/*.php
+/*.yml