Skip to content

Commit f3f6c91

Browse files
committed
Merge branch 'origin/master' into public/master
* origin/master: Updated submodule references BB-1016: Invalid title for 403 error page in dev mode on frontend Frozen akeneo/batch-bundle at version 0.4.2 because 0.4.3 fails installation BAP-8872: Create Doctrine ORM DataCollector. Remove overriden TWIG templates for Symfony data collectors BAP-8740: Update nelmio/api-doc-bundle to the version 2.9.0 CRM-3948: MailChimp does not work on PostgreSQL BAP-8672: After upgrade to Symfony 2.7 'session.handler.pdo' not work. BAP-8750: Page resize does not work with Welcome page BAP-8751: Upgrade Twig to 1.20.0 version CRM-3783: Add check for ['HTTPS'] !== 'off'
2 parents b9d6ddc + 9ab4bc6 commit f3f6c91

File tree

16 files changed

+13
-1528
lines changed

16 files changed

+13
-1528
lines changed

app/Resources/DoctrineBundle/views/Collector/db.html.twig

-296
This file was deleted.

app/Resources/SecurityBundle/views/Collector/security.html.twig

-87
This file was deleted.

app/Resources/SwiftmailerBundle/views/Collector/swiftmailer.html.twig

-98
This file was deleted.

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

+3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
{% extends status_code == 403 ? 'OroUIBundle:Default:index.html.twig' : 'TwigBundle::layout.html.twig' %}
22

3+
{% set pageTitle = status_code ~ ' ' ~ status_text ~ ' - ' ~ exception.message %}
4+
{% oro_title_set({titleTemplate : pageTitle, force : true}) %}
5+
36
{% block head_script %}
47
{% endblock %}
58

0 commit comments

Comments
 (0)