Skip to content

Commit 7b0cd86

Browse files
rgrebenchukrgrebenchuk
committed
Merge remote-tracking branch 'remotes/dev/release' to master
2 parents 2e27831 + e866c94 commit 7b0cd86

24 files changed

+172
-134
lines changed

‎CHANGELOG.md

+11
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
CHANGELOG for 1.0.0-beta1
2+
===================
3+
This changelog references the relevant changes (new features, changes and bugs) done in 1.0.0-beta1 versions.
4+
5+
* 1.0.0-beta1 (2013-09-30)
6+
* New ACL implementation
7+
* Emails synchronization via IMAP
8+
* Custom entities and fields in usage
9+
* Managing relations between entities
10+
* Grid views
11+
112
CHANGELOG for 1.0.0-alpha6
213
===================
314
This changelog references the relevant changes (new features, changes and bugs) done in 1.0.0-alpha6 versions.

‎README.md

+13-7
Original file line numberDiff line numberDiff line change
@@ -11,33 +11,39 @@ Installation
1111

1212
### Using Composer
1313

14-
[As both Symfony 2 and OroCRM use [Composer][1] to manage their dependencies, this is the recommended way to install OroCRM.]
14+
[As both Symfony 2 and Oro Platform use [Composer][2] to manage their dependencies, this is the recommended way to install Oro Platform.]
1515

1616
If you don't have Composer yet, download it following the instructions on
1717
http://getcomposer.org/ or just run the following command:
1818

1919
curl -s https://getcomposer.org/installer | php
2020

21-
- Clone http://github.com/orocrm/platform-application.git Platform Application project with
21+
- Clone https://github.com/orocrm/platform-application.git Platform Application project with
2222

23-
git clone http://github.com/orocrm/platform-application.git
23+
git clone https://github.com/orocrm/platform-application.git
24+
25+
- Make sure that you have installed Java
2426

2527
- Go to app/config folder and create parameters.yml using parameters.yml.dist as example. Update database name and credentials
2628
Alternatively parameters.yml can be created automatically on the next step when run composer install command,
2729
you will be able to customize all the values interactively.
30+
2831
- Install Platform Application dependencies with composer. If installation process seems too slow you can use "--prefer-dist" option.
2932

3033
php composer.phar install
3134

32-
- Initialize application with install script (for Linux and Mac OS install.sh, for Windows install.bat)
33-
34-
After installation you can login as application administrator using user name "admin" and password "admin".
35+
- Create the database (default name is "bap_standard")
3536

36-
[1]: http://getcomposer.org/
37+
- Open the BAP URL and initialize application with Install Wizard
38+
Alternatively with script (for Linux and Mac OS install.sh, for Windows install.bat)
39+
After installation you can login as application administrator using user name "admin" and password "admin".
3740

3841
Instant messaging between the browser and the web server
3942
--------------------------------------------------------
4043
To use this feature you need to configure parameters.yml websocket parameters and run server with console command
4144

4245
```bash
4346
app/console clank:server
47+
48+
[1]: http://symfony.com/doc/2.3/book/installation.html
49+
[2]: http://getcomposer.org/

‎UPGRADE.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
UPGRADE FROM 1.0.0-alpha versions
1+
UPGRADE to any 1.0.0-alpha and beta version
22
=======================
33

44
### General
55

6-
* Upgrade to any 1.0.0-alpha is not supported and full reinstall is required
6+
* Upgrade to 1.0.0-alpha or beta is not supported and full reinstall with drop database, clear cache folders is required
77

‎app/AppKernel.php

+5-33
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ public function registerBundles()
1717
new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
1818
new Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle(),
1919
new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
20-
new JMS\AopBundle\JMSAopBundle(),
21-
new JMS\DiExtraBundle\JMSDiExtraBundle($this),
20+
2221
//new JMS\SecurityExtraBundle\JMSSecurityExtraBundle(),
2322
new JMS\JobQueueBundle\JMSJobQueueBundle(),
2423
new JMS\SerializerBundle\JMSSerializerBundle($this),
@@ -37,37 +36,7 @@ public function registerBundles()
3736
new A2lix\TranslationFormBundle\A2lixTranslationFormBundle(),
3837
new JDare\ClankBundle\JDareClankBundle(),
3938
new Lexik\Bundle\MaintenanceBundle\LexikMaintenanceBundle(),
40-
41-
// BAP bundles
42-
new Oro\Bundle\FlexibleEntityBundle\OroFlexibleEntityBundle(),
43-
new Oro\Bundle\UIBundle\OroUIBundle(),
44-
new Oro\Bundle\FormBundle\OroFormBundle(),
45-
new Oro\Bundle\JsFormValidationBundle\OroJsFormValidationBundle(),
46-
new Oro\Bundle\SoapBundle\OroSoapBundle(),
47-
new Oro\Bundle\SearchBundle\OroSearchBundle(),
48-
new Oro\Bundle\UserBundle\OroUserBundle(),
49-
new Oro\Bundle\MeasureBundle\OroMeasureBundle(),
50-
new Oro\Bundle\SegmentationTreeBundle\OroSegmentationTreeBundle(),
51-
new Oro\Bundle\NavigationBundle\OroNavigationBundle(),
52-
new Oro\Bundle\ConfigBundle\OroConfigBundle(),
53-
new Oro\Bundle\FilterBundle\OroFilterBundle(),
54-
new Oro\Bundle\GridBundle\OroGridBundle(),
55-
new Oro\Bundle\WindowsBundle\OroWindowsBundle(),
56-
new Oro\Bundle\AddressBundle\OroAddressBundle(),
57-
new Oro\Bundle\DataAuditBundle\OroDataAuditBundle(),
58-
new Oro\Bundle\TagBundle\OroTagBundle(),
59-
new Oro\Bundle\AsseticBundle\OroAsseticBundle(),
60-
new Oro\Bundle\OrganizationBundle\OroOrganizationBundle(),
61-
new Oro\Bundle\NotificationBundle\OroNotificationBundle($this),
62-
new Oro\Bundle\TranslationBundle\OroTranslationBundle(),
63-
new Oro\Bundle\EmailBundle\OroEmailBundle(),
64-
new Oro\Bundle\EntityBundle\OroEntityBundle(),
65-
new Oro\Bundle\EntityConfigBundle\OroEntityConfigBundle(),
66-
new Oro\Bundle\EntityExtendBundle\OroEntityExtendBundle(),
67-
new Oro\Bundle\CronBundle\OroCronBundle(),
68-
new Oro\Bundle\WorkflowBundle\OroWorkflowBundle(),
69-
new Oro\Bundle\SyncBundle\OroSyncBundle(),
70-
new Oro\Bundle\PlatformBundle\OroPlatformBundle(),
39+
new Sylius\Bundle\FlowBundle\SyliusFlowBundle(),
7140

7241
);
7342

@@ -81,6 +50,9 @@ public function registerBundles()
8150
$bundles[] = new Oro\Bundle\TestFrameworkBundle\OroTestFrameworkBundle();
8251
}
8352

53+
// BAP bundles
54+
$bundles = array_merge($bundles, Oro\Bundle\PlatformBundle\OroPlatformBundle::registeredBundles($this));
55+
8456
return $bundles;
8557
}
8658

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

+33-6
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,48 @@
11
{% extends 'OroUIBundle:Default:index.html.twig' %}
2-
{% block hash_nav %}{% endblock %}
32
{% oro_title_set({titleTemplate : "%code% - %status%" , params: {'%code%': status_code, '%status%' :status_text }, force : true}) %}
3+
{% block hash_nav %}{% endblock %}
44
{% block bodyClass %}error-page{% endblock %}
5+
56
{% block header %}
7+
{% if app.user is not null %}
8+
{{ parent() }}
9+
{% else %}
10+
<header class="navbar" id="oroplatform-header">
11+
<div class="navbar-inner">
12+
<div class="container">
13+
{% placeholder header_logo %}
14+
</div>
15+
</div>
16+
</header>
17+
{% endif %}
618
{% endblock %}
719

820
{% block before_content %}
921
{% endblock %}
1022

1123
{% block scripts_before %}
24+
{% if app.user is not null %}
25+
{{ parent() }}
26+
{% endif %}
1227
{% endblock %}
1328

1429
{% block content %}
15-
<div class="pagination-centered popup-box-errors">
16-
<h1><span>{{ status_code }}</span> {{ status_text }}</h1>
17-
<div class="popup-content">
18-
<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>
30+
<div class="popup-frame">
31+
<div class="popup-holder">
32+
<div class="pagination-centered popup-box-errors">
33+
<h1><span>{{ status_code }}</span> {{ status_text }}</h1>
34+
<div class="popup-content">
35+
<p>
36+
{% if status_code == 404 %}
37+
{{ 'The page you requested could not be found. Please make sure the path you used is correct'|trans }}
38+
{% elseif status_code == 403 %}
39+
{{ "You don't have permission to access this page"|trans }}
40+
{% else %}
41+
{{ 'The System is currently under maintenance and should be available in a few minutes'|trans }}
42+
{% endif %}
43+
</p>
44+
</div>
45+
</div>
1946
</div>
2047
</div>
2148
{% endblock %}
@@ -24,4 +51,4 @@
2451
{% block head_script %}
2552
{{ parent() }}
2653
<script type="text/javascript">require(['oroui/js/init-errors'])</script>
27-
{% endblock %}
54+
{% endblock %}

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

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

‎app/SymfonyRequirements.php

+2
Original file line numberDiff line numberDiff line change
@@ -648,6 +648,8 @@ class_exists('Locale'),
648648
||
649649
(extension_loaded('apc') && ini_get('apc.enabled'))
650650
||
651+
(extension_loaded('Zend Optimizer+') && ini_get('zend_optimizerplus.enable'))
652+
||
651653
(extension_loaded('Zend OPcache') && ini_get('opcache.enable'))
652654
||
653655
(extension_loaded('xcache') && ini_get('xcache.cacher'))

‎app/cache/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@
33
/test
44
/devjs
55
/perf
6+
/sessions

‎app/config/config.yml

+30-30
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,17 @@ framework:
1313
csrf_protection: true
1414
validation: { enable_annotations: true }
1515
templating: { engines: ['twig', 'php'] } #assets_version: SomeVersionScheme
16-
default_locale: "%locale%"
17-
trusted_proxies: ~
16+
default_locale: "%locale%"
17+
trusted_proxies: ~
1818
session:
19-
cookie_lifetime: 43200
2019
name: BAPID
21-
handler_id: session.handler.pdo
20+
handler_id: %session_handler%
21+
save_path: %kernel.root_dir%/cache/sessions
2222
fragments:
23-
enabled: true
24-
path: /_fragment # used for controller action in template
23+
enabled: true
24+
path: /_fragment # used for controller action in template
2525
serializer:
26-
enabled: true
26+
enabled: true
2727

2828
# Twig Configuration
2929
twig:
@@ -44,6 +44,7 @@ twig:
4444
- 'OroTranslationBundle:Form:fields.html.twig'
4545
- 'OroAddressBundle:Include:fields.html.twig'
4646
- 'OroOrganizationBundle:Form:fields.html.twig'
47+
- 'OroSecurityBundle:Form:fields.html.twig'
4748

4849
# Assetic Configuration
4950
assetic:
@@ -60,7 +61,9 @@ assetic:
6061
- OroWindowsBundle
6162
- OroSegmentationTreeBundle
6263
- OroEntityExtendBundle
64+
- OroSecurityBundle
6365
- JDareClankBundle
66+
6467
#java: /usr/bin/java
6568
filters:
6669
cssrewrite: ~
@@ -78,32 +81,35 @@ doctrine:
7881
default_connection: default
7982
connections:
8083
default:
81-
driver: "%database_driver%"
84+
driver: pdo_mysql
8285
host: "%database_host%"
8386
port: "%database_port%"
8487
dbname: "%database_name%"
8588
user: "%database_user%"
8689
password: "%database_password%"
8790
charset: UTF8
8891
report_source:
89-
driver: "%database_driver_rs%"
90-
host: "%database_host_rs%"
91-
port: "%database_port_rs%"
92-
dbname: "%database_name_rs%"
93-
user: "%database_user_rs%"
94-
password: "%database_password_rs%"
92+
driver: pdo_mysql
93+
host: "%database_host%"
94+
port: "%database_port%"
95+
dbname: "%database_name%"
96+
user: "%database_user%"
97+
password: "%database_password%"
9598
charset: UTF8
9699
report_target:
97-
driver: "%database_driver_rt%"
98-
host: "%database_host_rt%"
99-
port: "%database_port_rt%"
100-
dbname: "%database_name_rt%"
101-
user: "%database_user_rt%"
102-
password: "%database_password_rt%"
100+
driver: pdo_mysql
101+
host: "%database_host%"
102+
port: "%database_port%"
103+
dbname: "%database_name%"
104+
user: "%database_user%"
105+
password: "%database_password%"
103106
charset: UTF8
107+
types:
108+
datetime: Oro\Bundle\LocaleBundle\DoctrineExtensions\DBAL\Types\UTCDateTimeType
104109
orm:
105110
auto_generate_proxy_classes: "%kernel.debug%"
106111
auto_mapping: true
112+
class_metadata_factory_name: Oro\Bundle\EntityExtendBundle\Mapping\ExtendClassMetadataFactory
107113
resolve_target_entities:
108114
Symfony\Component\Security\Core\User\UserInterface: Oro\Bundle\UserBundle\Entity\User
109115

@@ -211,13 +217,13 @@ clank:
211217
service: "oro_wamp.db_ping"
212218
time: 60000 # the time in milliseconds between the "tick" function being called
213219

214-
jms_di_extra:
215-
doctrine_integration: false
216-
217220
a2lix_translation_form:
218221
locales: [en, fr]
219222
templating: "OroUIBundle:Form:translateable.html.twig"
220223

224+
apy_js_form_validation:
225+
check_modes: [submit]
226+
221227
lexik_maintenance:
222228
authorized:
223229
path: "maintenance|.*\.js" # "maintenance" is only for demo purposes, remove in production!
@@ -241,16 +247,10 @@ oro_ui:
241247
application_title:
242248
value: "Oro Business Application Platform"
243249

244-
oro_user:
245-
settings:
246-
name_format:
247-
value: %%last%%, %%first%%
248-
249250
oro_translation:
250251
js_translation:
251252
# order of domains reflects messages fallback
252253
domains: [jsmessages, validators]
253254

254255
oro_entity_extend:
255-
backend: Dynamic
256-
backup: "%kernel.root_dir%/entities/Backup/"
256+
backup: "%kernel.root_dir%/entities/Extend/Backup/"

‎app/config/parameters.yml.dist

+5-19
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,11 @@
11
parameters:
2-
database_driver: pdo_mysql
32
database_host: 127.0.0.1
43
database_port: ~
54
database_name: bap_standard
65
database_user: root
7-
database_password: root
6+
database_password: ~
87

9-
# report source connection
10-
database_driver_rs: %database_driver%
11-
database_host_rs: %database_host%
12-
database_port_rs: %database_port%
13-
database_name_rs: %database_name%
14-
database_user_rs: %database_user%
15-
database_password_rs: %database_password%
16-
17-
# report target connection
18-
database_driver_rt: %database_driver%
19-
database_host_rt: %database_host%
20-
database_port_rt: %database_port%
21-
database_name_rt: %database_name%
22-
database_user_rt: %database_user%
23-
database_password_rt: %database_password%
24-
25-
mailer_transport: smtp
8+
mailer_transport: mail
269
mailer_host: 127.0.0.1
2710
mailer_user: ~
2811
mailer_password: ~
@@ -31,5 +14,8 @@ parameters:
3114
websocket_host: "127.0.0.1"
3215
websocket_port: 8080
3316

17+
session_handler: ~
18+
3419
locale: en
3520
secret: ThisTokenIsNotSoSecretChangeIt
21+
installed: ~

0 commit comments

Comments
 (0)