franck
|
271e6c64f0
|
Before merging coupon
|
2013-09-05 10:00:17 +02:00 |
|
franck
|
d3a287333e
|
Fixed TheliaLoop Smarty plugin (lopp imbrication was broken)
|
2013-09-04 19:02:26 +02:00 |
|
franck
|
6387182026
|
Merge branch 'master' of https://github.com/thelia/thelia
Conflicts:
core/lib/Thelia/Core/Template/Loop/Config.php
core/lib/Thelia/Core/Template/Loop/Product.php
core/lib/Thelia/Tools/URL.php
|
2013-09-04 17:34:23 +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
|
fce528c41f
|
Added AdminUtilities Smarty plugin, optimized templates
|
2013-09-03 15:43:05 +02:00 |
|
franck
|
e4c23adba6
|
Smarty inheritance in admin template.
|
2013-09-03 11:26:03 +02:00 |
|
franck
|
3191a928ab
|
Completed mailing templates management
|
2013-09-02 16:21:49 +02:00 |
|
franck
|
e1cc7162ae
|
Added get/setLangId() method in session
|
2013-09-02 02:04:36 +02:00 |
|
franck
|
beab17a18d
|
Refactored VariableXxxxx.php as ConfigXxxx.php
|
2013-09-02 01:37:12 +02:00 |
|
franck
|
1558f6af5f
|
Added name duplication check when creating a variable
|
2013-09-02 01:25:11 +02:00 |
|
franck
|
5670855dd6
|
Completed the backoffice variable management
|
2013-09-02 00:17:27 +02:00 |
|
franck
|
6d5d0f6606
|
Fixed getUrl()
|
2013-08-31 15:52:42 +02:00 |
|
franck
|
6aa2f80444
|
Intriducec BaseI18nLoop, started variable config management
|
2013-08-31 11:38:00 +02:00 |
|
franck
|
6867eae9b7
|
Fixed customer front controller, events, addec admion config.
|
2013-08-30 19:46:12 +02:00 |
|
franck
|
cce270fdcc
|
Factorized ModelCriterialTools calls in loops
|
2013-08-28 19:47:31 +02:00 |
|
franck
|
0361cd1ff2
|
Removed InternalEvent, simplified SecurityContext
|
2013-08-28 17:52:32 +02:00 |
|
Etienne Roudeix
|
86b11096ba
|
Merge branch 'master' into loops
Conflicts:
core/lib/Thelia/Core/Template/Loop/Category.php
core/lib/Thelia/Core/Template/Loop/FeatureValue.php
core/lib/Thelia/Core/Template/Loop/Folder.php
core/lib/Thelia/Core/Template/Loop/Product.php
core/lib/Thelia/Core/Template/Smarty/Plugins/TheliaLoop.php
install/faker.php
|
2013-08-21 09:19:56 +02:00 |
|
Manuel Raynaud
|
6371deb4cb
|
cs fixer
|
2013-08-13 11:02:29 +02:00 |
|
Manuel Raynaud
|
086f73aeca
|
change class controller inheritance
|
2013-08-12 16:59:15 +02:00 |
|
Manuel Raynaud
|
071a4c17bc
|
create specific controller for front and back office
|
2013-08-12 16:56:18 +02:00 |
|
Manuel Raynaud
|
7c6763ea59
|
create controller for front office
|
2013-08-12 15:27:19 +02:00 |
|