Commit Graph

23 Commits

Author SHA1 Message Date
gmorel
19782f6852 Merge branch 'catalog' of https://github.com/thelia/thelia into upload_management
# By franck
# Via franck
* 'catalog' of https://github.com/thelia/thelia:
  Finished combination creation GUI
  Put curresncy selector in toolbar
  Started price tab
  Finished product multiple categories attachment
  Ajaxified product modification tabs
  Finished product features management
  Aded feature_template and category_template position management
  Finished product feature values
  Fixed product update process
  Added missing files
  Working catalog branch

Conflicts:
	core/lib/Thelia/Action/BaseAction.php
	install/insert.sql
	local/config/schema.xml
	templates/admin/default/folders.html
	templates/admin/default/product-edit.html
2013-09-23 12:27:36 +02:00
franck
22f3f49f79 Finished product multiple categories attachment 2013-09-22 22:14:39 +02:00
gmorel
ced7b5e6dc WIP : Upload management (upload+save+delete done) need to finish integration and add all image fields 2013-09-20 16:51:34 +02:00
Manuel Raynaud
70d93d1daa fix cs 2013-09-11 08:27:40 +02:00
franck
5670855dd6 Completed the backoffice variable management 2013-09-02 00:17:27 +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
franck
47bc545019 Added image processing actgion and loop 2013-08-15 11:44:46 +02:00
Manuel Raynaud
078b1e0d57 apply cs-fixer 2013-08-14 09:29:04 +02:00
Manuel Raynaud
541fe7f75d fix issue on adding item action 2013-08-13 09:53:49 +02:00
Manuel Raynaud
b377ebe6e8 refactor action process to controller process 2013-08-12 16:42:23 +02:00
Manuel Raynaud
bb2676a719 retrieve context value in BaseAction 2013-08-12 14:58:28 +02:00
Manuel Raynaud
b4c4898374 change context by Class and service context 2013-08-12 14:49:43 +02:00
Manuel Raynaud
d213278fe3 Merge branch 'master' into actions
Conflicts:
	core/lib/Thelia/Action/BaseAction.php
	core/lib/Thelia/Action/Category.php
	core/lib/Thelia/Action/Customer.php
2013-08-09 16:46:56 +02:00
Manuel Raynaud
31743fd987 apply php-cs-fiwer on Action directory 2013-08-09 10:38:58 +02:00
franck
c46a708346 Categories ordrering in the catalog 2013-08-09 10:18:08 +02:00
franck
81a5664653 Using now BaseAction methods in Cartp.php 2013-08-08 11:43:27 +02:00
franck
4e83466bc0 Form processing is now factorized in BaseAction 2013-08-08 11:13:46 +02:00
Manuel Raynaud
69f80d29f5 create an abstract class for base action method 2013-08-07 10:42:19 +02:00
Manuel Raynaud
e0aeb8a643 change action implementation 2013-04-16 14:41:03 +02:00
Manuel Raynaud
106818510f start creating new Parser
create new listener for checking view parameter
throw 404 status page if resource not found
2013-02-13 19:01:51 +01:00
Manuel Raynaud
1a1ddbefbd début génération documentation via apiGen 2013-02-08 17:51:16 +01:00
Manuel Raynaud
b952888b14 start to implement action controller. 2013-02-07 17:40:27 +01:00