Commit Graph

22 Commits

Author SHA1 Message Date
Manuel Raynaud
85d80d1d77 fix minor bug 2014-05-09 10:55:50 +02:00
Manuel Raynaud
5e65bf0b8a change license header 2014-04-18 09:36:41 +02:00
Manuel Raynaud
2532a3bb4b fix cs 2014-04-10 12:06:43 +02:00
Manuel Raynaud
caf22404f5 Merge pull request #279 from roadster31/labels
Labels
2014-04-10 12:04:36 +02:00
Manuel Raynaud
ad58b27b00 change behavior for default currency delection. Fix #275 2014-04-04 16:05:28 +02:00
Franck Allimant
3508397731 Fixed updateRates() method 2014-04-04 12:04:42 +02:00
Franck Allimant
89653f452b Removes container from all Thelia actions, but Modules (#198) 2014-01-31 20:06:42 +01:00
Manuel Raynaud
1b2c1d53ac remove some unused variables 2014-01-22 15:50:40 +01:00
Manuel Raynaud
7bf5ee31c9 Merge branch 'refactor_action'
Conflicts:
	core/lib/Thelia/Action/Product.php
	core/lib/Thelia/Controller/Admin/CategoryController.php
	core/lib/Thelia/Controller/Admin/ProductController.php
	core/lib/Thelia/Controller/Admin/TemplateController.php
2013-09-30 10:26:59 +02:00
Manuel Raynaud
10022e5a4a refactor currency events 2013-09-30 10:11:55 +02:00
franck
22f3f49f79 Finished product multiple categories attachment 2013-09-22 22:14:39 +02:00
franck
2f41d4db6f Started category management 2013-09-16 18:58:45 +02:00
franck
3f82421879 Finished admin controllers refactoriing 2013-09-12 13:39:47 +02:00
franck
c85ec2a9e3 Created AbstractCrudController, and refactored existing controllers 2013-09-12 13:02:40 +02:00
Manuel Raynaud
70d93d1daa fix cs 2013-09-11 08:27:40 +02:00
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