TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:thelia/thelia

Browse Source
This commit is contained in:
Manuel Raynaud
2013-11-04 09:28:36 +01:00
parent d7012af3e2 f3cba323c6
commit b65044c1be
64 changed files with 2396 additions and 1453 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/lib/Thelia/Config/Resources/config.xml
View File

@@ -55,8 +55,6 @@
<argument >%kernel.debug%</argument>
</service>
<service id="http_kernel" class="Thelia\Core\TheliaHttpKernel">
<argument type="service" id="event_dispatcher" />
<argument type="service" id="service_container" />

2
core/lib/Thelia/Config/Resources/form.xml
View File

@@ -120,6 +120,8 @@
<form name="thelia.lang.create" class="Thelia\Form\Lang\LangCreateForm"/>
<form name="thelia.lang.defaultBehavior" class="Thelia\Form\Lang\LangDefaultBehaviorForm"/>
<form name="thelia.lang.url" class="Thelia\Form\Lang\LangUrlForm"/>
<form name="thelia.system-logs.configuration" class="Thelia\Form\SystemLogConfigurationForm"/>
</forms>
</config>

2
core/lib/Thelia/Config/Resources/loop.xml
View File

@@ -48,7 +48,7 @@
<loop class="Thelia\Core\Template\Loop\Coupon" name="coupon"/>
<loop class="Thelia\Core\Template\Loop\Message" name="message"/>
<loop class="Thelia\Core\Template\Loop\Delivery" name="delivery"/>
<loop class="Thelia\Core\Template\Loop\Template" name="template"/> <!-- This is product templates ;-) -->
<loop class="Thelia\Core\Template\Loop\ProductTemplate" name="product-template"/> <!-- This is product templates ;-) -->
<loop class="Thelia\Core\Template\Loop\Tax" name="tax"/>
<loop class="Thelia\Core\Template\Loop\TaxRule" name="tax-rule"/>
<loop class="Thelia\Core\Template\Loop\TaxRuleCountry" name="tax-rule-country"/>

10
core/lib/Thelia/Config/Resources/routing/admin.xml
View File

@@ -516,6 +516,16 @@
<default key="_controller">Thelia\Controller\Admin\ConfigController::deleteAction</default>
</route>
<!-- Routes to the SystemLog controller -->
<route id="admin.configuration.system-logs.default" path="/admin/configuration/system-logs">
<default key="_controller">Thelia\Controller\Admin\SystemLogController::defaultAction</default>
</route>
<route id="admin.configuration.system-logs.save" path="/admin/configuration/system-logs/save">
<default key="_controller">Thelia\Controller\Admin\SystemLogController::saveAction</default>
</route>
<!-- Routes to the Messages controller -->
<route id="admin.configuration.messages.default" path="/admin/configuration/messages">