franck
|
271e6c64f0
|
Before merging coupon
|
2013-09-05 10:00:17 +02:00 |
|
franck
|
02a1b5c655
|
Event harmonization with MRA
|
2013-09-04 15:45:46 +02:00 |
|
Manuel Raynaud
|
8b2007f94d
|
Merge branch 'actions'
Conflicts:
core/lib/Thelia/Action/Currency.php
core/lib/Thelia/Core/Event/TheliaEvents.php
|
2013-09-04 10:53:32 +02:00 |
|
Manuel Raynaud
|
d23190303c
|
refactor name for updating actions
|
2013-09-04 10:48:59 +02:00 |
|
franck
|
26da884dae
|
Fixed minor bug in Currencies
|
2013-09-03 19:32:57 +02:00 |
|
franck
|
ec32aa9eb5
|
Merge branch 'master' of https://github.com/thelia/thelia
Conflicts:
core/lib/Thelia/Controller/BaseController.php
|
2013-09-03 19:03:27 +02:00 |
|
franck
|
e4c23adba6
|
Smarty inheritance in admin template.
|
2013-09-03 11:26:03 +02:00 |
|