TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
3f7300bdee8f3dbee33ef6a40d52bb1adf08fbfd
sterivein/core/lib/Thelia/Controller/Admin
History
Franck Allimant 5bf51dd47e Merge branch 'catalog' 
Conflicts:
	core/lib/Thelia/Config/Resources/config.xml
	core/lib/Thelia/Config/Resources/routing/admin.xml
	core/lib/Thelia/Core/Template/Loop/Country.php
	core/lib/Thelia/Core/Template/Smarty/Plugins/Form.php
	core/lib/Thelia/Model/Country.php
	core/lib/Thelia/Model/Profile.php
	core/lib/Thelia/Model/ProfileQuery.php
	install/insert.sql
	install/thelia.sql
	local/config/schema.xml
2013-10-24 00:16:33 +02:00
..
AbstractCrudController.php
permission management
2013-10-22 11:09:24 +02:00
AddressController.php
permission management
2013-10-22 11:09:24 +02:00
AdminController.php
fix cs
2013-09-30 10:35:34 +02:00
AdministratorController.php
administrators management
2013-10-23 16:31:37 +02:00
AreaController.php
permission management
2013-10-22 11:09:24 +02:00
AttributeAvController.php
permission management
2013-10-22 11:09:24 +02:00
AttributeController.php
permission management
2013-10-22 11:09:24 +02:00
BaseAdminController.php
finish language creation process
2013-10-23 12:38:32 +02:00
CategoryController.php
permission management
2013-10-22 11:09:24 +02:00
ConfigController.php
permission management
2013-10-22 11:09:24 +02:00
ContentController.php
permission management
2013-10-22 11:09:24 +02:00
CountryController.php
change http code status on different context
2013-10-23 12:38:32 +02:00
CouponController.php
Working adding decrementation when coupon is consumed
2013-10-22 23:04:08 +02:00
CurrencyController.php
permission management
2013-10-22 11:09:24 +02:00
CustomerController.php
permission management
2013-10-22 11:09:24 +02:00
FeatureAvController.php
permission management
2013-10-22 11:09:24 +02:00
FeatureController.php
permission management
2013-10-22 11:09:24 +02:00
FileController.php
permission management
2013-10-22 11:09:24 +02:00
FolderController.php
fix minor admin bugs
2013-10-23 19:23:29 +02:00
LangController.php
manage lanf <=> url assignment
2013-10-23 19:04:49 +02:00
LanguageController.php
permission management
2013-10-22 11:09:24 +02:00
MailingSystemController.php
permission management
2013-10-22 11:09:24 +02:00
MessageController.php
permission management
2013-10-22 11:09:24 +02:00
ModuleController.php
permission management
2013-10-22 11:09:24 +02:00
OrderController.php
permission management
2013-10-22 11:09:24 +02:00
ProductController.php
Merge branch 'catalog'
2013-10-24 00:16:33 +02:00
ProfileController.php
fix tagged_form_field
2013-10-23 18:00:04 +02:00
SessionController.php
fix cs
2013-09-30 10:35:34 +02:00
ShippingZoneController.php
permission management
2013-10-22 11:09:24 +02:00
TaxController.php
permission management
2013-10-22 11:09:24 +02:00
TaxRuleController.php
permission management
2013-10-22 11:09:24 +02:00
TemplateController.php
permission management
2013-10-22 11:09:24 +02:00
TestController.php
Worked on catalog
2013-10-23 23:47:44 +02:00