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

CHANGELOG.md

@@ -1,3 +1,14 @@
+CHANGELOG for 1.0.0-beta1
+===================
+This changelog references the relevant changes (new features, changes and bugs) done in 1.0.0-beta1 versions.
+
+* 1.0.0-beta1 (2013-09-30)
+ * New ACL implementation
+ * Emails synchronization via IMAP
+ * Custom entities and fields in usage
+ * Managing relations between entities
+ * Grid views
+
 CHANGELOG for 1.0.0-alpha6
 ===================
 This changelog references the relevant changes (new features, changes and bugs) done in 1.0.0-alpha6 versions.

README.md

@@ -11,33 +11,39 @@ Installation
 
 ### Using Composer
 
-[As both Symfony 2 and OroCRM use [Composer][1] to manage their dependencies, this is the recommended way to install OroCRM.]
+[As both Symfony 2 and Oro Platform use [Composer][2] to manage their dependencies, this is the recommended way to install Oro Platform.]
 
 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 http://github.com/orocrm/platform-application.git Platform Application project with
+- Clone https://github.com/orocrm/platform-application.git Platform Application project with
 
-    git clone http://github.com/orocrm/platform-application.git
+    git clone https://github.com/orocrm/platform-application.git
+
+- Make sure that you have installed Java
 
 - 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 Platform Application 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".
+- Create the database (default name is "bap_standard")
 
-[1]:  http://getcomposer.org/
+- 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".
 
 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/

UPGRADE.md

@@ -1,7 +1,7 @@
-UPGRADE FROM 1.0.0-alpha versions
+UPGRADE to any 1.0.0-alpha and beta version
 =======================
 
 ### General
 
-  * Upgrade to any 1.0.0-alpha is not supported and full reinstall is required
+  * Upgrade to 1.0.0-alpha or beta is not supported and full reinstall with drop database, clear cache folders is required
 

app/AppKernel.php

@@ -17,8 +17,7 @@ public function registerBundles()
             new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
             new Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle(),
             new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
-            new JMS\AopBundle\JMSAopBundle(),
-            new JMS\DiExtraBundle\JMSDiExtraBundle($this),
+
             //new JMS\SecurityExtraBundle\JMSSecurityExtraBundle(),
             new JMS\JobQueueBundle\JMSJobQueueBundle(),
             new JMS\SerializerBundle\JMSSerializerBundle($this),
@@ -37,37 +36,7 @@ public function registerBundles()
             new A2lix\TranslationFormBundle\A2lixTranslationFormBundle(),
             new JDare\ClankBundle\JDareClankBundle(),
             new Lexik\Bundle\MaintenanceBundle\LexikMaintenanceBundle(),
-
-            // 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(),
-            new Oro\Bundle\UserBundle\OroUserBundle(),
-            new Oro\Bundle\MeasureBundle\OroMeasureBundle(),
-            new Oro\Bundle\SegmentationTreeBundle\OroSegmentationTreeBundle(),
-            new Oro\Bundle\NavigationBundle\OroNavigationBundle(),
-            new Oro\Bundle\ConfigBundle\OroConfigBundle(),
-            new Oro\Bundle\FilterBundle\OroFilterBundle(),
-            new Oro\Bundle\GridBundle\OroGridBundle(),
-            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\OrganizationBundle\OroOrganizationBundle(),
-            new Oro\Bundle\NotificationBundle\OroNotificationBundle($this),
-            new Oro\Bundle\TranslationBundle\OroTranslationBundle(),
-            new Oro\Bundle\EmailBundle\OroEmailBundle(),
-            new Oro\Bundle\EntityBundle\OroEntityBundle(),
-            new Oro\Bundle\EntityConfigBundle\OroEntityConfigBundle(),
-            new Oro\Bundle\EntityExtendBundle\OroEntityExtendBundle(),
-            new Oro\Bundle\CronBundle\OroCronBundle(),
-            new Oro\Bundle\WorkflowBundle\OroWorkflowBundle(),
-            new Oro\Bundle\SyncBundle\OroSyncBundle(),
-            new Oro\Bundle\PlatformBundle\OroPlatformBundle(),
+            new Sylius\Bundle\FlowBundle\SyliusFlowBundle(),
 
         );
 
@@ -81,6 +50,9 @@ public function registerBundles()
             $bundles[] = new Oro\Bundle\TestFrameworkBundle\OroTestFrameworkBundle();
         }
 
+        // BAP bundles
+        $bundles = array_merge($bundles, Oro\Bundle\PlatformBundle\OroPlatformBundle::registeredBundles($this));
+
         return $bundles;
     }
 

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

@@ -1,21 +1,48 @@
 {% extends 'OroUIBundle:Default:index.html.twig' %}
-{% block hash_nav %}{% endblock %}
 {% 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 %}
+    {% if app.user is not null %}
+        {{ parent() }}
+    {% else %}
+        <header class="navbar" id="oroplatform-header">
+            <div class="navbar-inner">
+                <div class="container">
+                    {% placeholder header_logo %}
+                </div>
+            </div>
+        </header>
+    {% endif %}
 {% endblock %}
 
 {% block before_content %}
 {% endblock %}
 
 {% block scripts_before %}
+    {% if app.user is not null %}
+        {{ parent() }}
+    {% endif %}
 {% endblock %}
 
 {% block content %}
-<div class="pagination-centered popup-box-errors">
-        <h1><span>{{ status_code }}</span> {{ status_text }}</h1>
-        <div class="popup-content">
-            <p>Something went wrong. Place text here about how this may be resolved, or where you can find full error log. Lorem Ipsum is simply dummy text of the printing and typesetting industry.</p>
+    <div class="popup-frame">
+        <div class="popup-holder">
+            <div class="pagination-centered popup-box-errors">
+                <h1><span>{{ status_code }}</span> {{ status_text }}</h1>
+                <div class="popup-content">
+                    <p>
+                        {% if status_code == 404 %}
+                            {{ 'The page you requested could not be found. Please make sure the path you used is correct'|trans }}
+                        {% elseif status_code == 403 %}
+                            {{ "You don't have permission to access this page"|trans }}
+                        {% else %}
+                            {{ 'The System is currently under maintenance and should be available in a few minutes'|trans }}
+                        {% endif %}
+                    </p>
+                </div>
+            </div>
         </div>
     </div>
 {% endblock %}
@@ -24,4 +51,4 @@
 {% block head_script %}
     {{ parent() }}
     <script type="text/javascript">require(['oroui/js/init-errors'])</script>
-{% endblock %}
+{% endblock %}

app/Resources/views/Default/index.html.twig

@@ -5,8 +5,7 @@
     <h1>{{ 'Welcome to The Oro Platform!'|trans }}</h1>
     We can't wait to see what you will create with our Platform...
 </div>
-    <div class="version-container">
-        {# TODO Replace hardcoded version with data from backend #}
-        <strong>Version:</strong> 1.0.0-alpha6
-    </div>
+<div class="version-container">
+    Version: {{ constant('Oro\\Bundle\\PlatformBundle\\OroPlatformBundle::VERSION') }}
+</div>
 {% endblock content %}

app/SymfonyRequirements.php

@@ -648,6 +648,8 @@ class_exists('Locale'),
             ||
             (extension_loaded('apc') && ini_get('apc.enabled'))
             ||
+            (extension_loaded('Zend Optimizer+') && ini_get('zend_optimizerplus.enable'))
+            ||
             (extension_loaded('Zend OPcache') && ini_get('opcache.enable'))
             ||
             (extension_loaded('xcache') && ini_get('xcache.cacher'))

app/cache/.gitignore

@@ -3,3 +3,4 @@
 /test
 /devjs
 /perf
+/sessions

app/config/config.yml

@@ -13,17 +13,17 @@ framework:
     csrf_protection: true
     validation:      { enable_annotations: true }
     templating:      { engines: ['twig', 'php'] } #assets_version: SomeVersionScheme
-    default_locale:  "%locale%"
-    trusted_proxies: ~
+    default_locale:           "%locale%"
+    trusted_proxies:          ~
     session:
-        cookie_lifetime:      43200
         name:                 BAPID
-        handler_id:           session.handler.pdo
+        handler_id:           %session_handler%
+        save_path:            %kernel.root_dir%/cache/sessions
     fragments:
-        enabled: true
-        path: /_fragment # used for controller action in template
+        enabled:              true
+        path:                 /_fragment # used for controller action in template
     serializer:
-        enabled: true
+        enabled:              true
 
 # Twig Configuration
 twig:
@@ -44,6 +44,7 @@ twig:
             - 'OroTranslationBundle:Form:fields.html.twig'
             - 'OroAddressBundle:Include:fields.html.twig'
             - 'OroOrganizationBundle:Form:fields.html.twig'
+            - 'OroSecurityBundle:Form:fields.html.twig'
 
 # Assetic Configuration
 assetic:
@@ -60,7 +61,9 @@ assetic:
         - OroWindowsBundle
         - OroSegmentationTreeBundle
         - OroEntityExtendBundle
+        - OroSecurityBundle
         - JDareClankBundle
+
     #java: /usr/bin/java
     filters:
         cssrewrite: ~
@@ -78,32 +81,35 @@ doctrine:
         default_connection:   default
         connections:
             default:
-                driver:       "%database_driver%"
+                driver:       pdo_mysql
                 host:         "%database_host%"
                 port:         "%database_port%"
                 dbname:       "%database_name%"
                 user:         "%database_user%"
                 password:     "%database_password%"
                 charset:      UTF8
             report_source:
-                driver:       "%database_driver_rs%"
-                host:         "%database_host_rs%"
-                port:         "%database_port_rs%"
-                dbname:       "%database_name_rs%"
-                user:         "%database_user_rs%"
-                password:     "%database_password_rs%"
+                driver:       pdo_mysql
+                host:         "%database_host%"
+                port:         "%database_port%"
+                dbname:       "%database_name%"
+                user:         "%database_user%"
+                password:     "%database_password%"
                 charset:      UTF8
             report_target:
-                driver:       "%database_driver_rt%"
-                host:         "%database_host_rt%"
-                port:         "%database_port_rt%"
-                dbname:       "%database_name_rt%"
-                user:         "%database_user_rt%"
-                password:     "%database_password_rt%"
+                driver:       pdo_mysql
+                host:         "%database_host%"
+                port:         "%database_port%"
+                dbname:       "%database_name%"
+                user:         "%database_user%"
+                password:     "%database_password%"
                 charset:      UTF8
+        types:
+            datetime: Oro\Bundle\LocaleBundle\DoctrineExtensions\DBAL\Types\UTCDateTimeType                
     orm:
         auto_generate_proxy_classes: "%kernel.debug%"
         auto_mapping:         true
+        class_metadata_factory_name: Oro\Bundle\EntityExtendBundle\Mapping\ExtendClassMetadataFactory
         resolve_target_entities:
             Symfony\Component\Security\Core\User\UserInterface: Oro\Bundle\UserBundle\Entity\User
 
@@ -211,13 +217,13 @@ clank:
             service:          "oro_wamp.db_ping"
             time:             60000                           # the time in milliseconds between the "tick" function being called
 
-jms_di_extra:
-    doctrine_integration: false
-
 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!
@@ -241,16 +247,10 @@ oro_ui:
         application_title:
             value:            "Oro Business Application Platform"
 
-oro_user:
-    settings:
-        name_format:
-          value:              %%last%%, %%first%%
-
 oro_translation:
     js_translation:
         # order of domains reflects messages fallback
         domains:              [jsmessages, validators]
 
 oro_entity_extend:
-    backend:                  Dynamic
-    backup:                   "%kernel.root_dir%/entities/Backup/"
+    backup:         "%kernel.root_dir%/entities/Extend/Backup/"

app/config/parameters.yml.dist

@@ -1,28 +1,11 @@
 parameters:
-    database_driver:        pdo_mysql
     database_host:          127.0.0.1
     database_port:          ~
     database_name:          bap_standard
     database_user:          root
-    database_password:      root
+    database_password:      ~
 
-    # report source connection
-    database_driver_rs:     %database_driver%
-    database_host_rs:       %database_host%
-    database_port_rs:       %database_port%
-    database_name_rs:       %database_name%
-    database_user_rs:       %database_user%
-    database_password_rs:   %database_password%
-
-    # report target connection
-    database_driver_rt:     %database_driver%
-    database_host_rt:       %database_host%
-    database_port_rt:       %database_port%
-    database_name_rt:       %database_name%
-    database_user_rt:       %database_user%
-    database_password_rt:   %database_password%
-
-    mailer_transport:       smtp
+    mailer_transport:       mail
     mailer_host:            127.0.0.1
     mailer_user:            ~
     mailer_password:        ~
@@ -31,5 +14,8 @@ parameters:
     websocket_host:         "127.0.0.1"
     websocket_port:         8080
 
+    session_handler:        ~
+
     locale:                 en
     secret:                 ThisTokenIsNotSoSecretChangeIt
+    installed:              ~