1199 Commits

Author	SHA1	Message	Date
gmorel	430e18e4e2	Working : Add a link on documents	2013-09-24 12:25:19 +02:00
gmorel	0c769a3398	Working : fix url document + refactor : naming conventions	2013-09-24 12:24:40 +02:00
gmorel	17e312ca23	Working : refactor : naming conventions	2013-09-24 12:13:25 +02:00
gmorel	466113bc12	Working : upload : fix unit test	2013-09-24 11:11:50 +02:00
gmorel	084f66589a	WIP : upload documents : add action, ctrl, event	2013-09-24 10:54:52 +02:00
gmorel	9ee8b2b75f	WIP : upload document : add forms	2013-09-23 18:13:12 +02:00
gmorel	ce7a9eccfc	Working : upload image : fix return URL to images tab	2013-09-23 17:28:11 +02:00
gmorel	3cb7289848	Merge branches 'catalog' and 'upload_management' of https://github.com/thelia/thelia into catalog ... # By franck # Via franck * 'catalog' of https://github.com/thelia/thelia: Impemented combination creation # By Manuel Raynaud (29) and others # Via gmorel (6) and others * 'upload_management' of https://github.com/thelia/thelia: (52 commits) Working : Upload image : Fix upload validation - Image format allowed - manual-reverse order on image loop Upload allow only for images Hide upload zone during upload Working : Upload image : Fix unit tests Working : Upload image : set product image form loaded via ajax, fix category, folder, content WIP : Upload image : set product image form loaded via ajax Setting tinymce Update uploader view Update image edit view Working : Upload management : on content Working : Upload management : on folder, category, product cache dataccessfunctions Working : Upload management : fix e.preventDefault in chrome and safari Working : Image management set on Category fire event on insert content in createmethod fix issue, default foler is set on content creation allow to create new content update default param of content model create content listener for crud management dispatch event in pre/post crud method for content model ... Conflicts: templates/admin/default/product-edit.html	2013-09-23 17:10:03 +02:00
franck	645ff15fcf	Impemented combination creation	2013-09-23 17:03:36 +02:00
gmorel	9da50760b5	Working : Upload image : Fix upload validation	2013-09-23 16:52:50 +02:00
gmorel	e39511e3dc	Working : Upload image : Fix unit tests	2013-09-23 14:55:36 +02:00
gmorel	4f78af4f3b	WIP : Upload image : set product image form loaded via ajax	2013-09-23 12:42:02 +02:00
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
gmorel	b02feefc33	Merge branch 'master' of https://github.com/thelia/thelia into upload_management ... # By Manuel Raynaud (14) and Etienne Roudeix (1) # Via Etienne Roudeix * 'master' of https://github.com/thelia/thelia: cache dataccessfunctions fire event on insert content in createmethod fix issue, default foler is set on content creation allow to create new content update default param of content model create content listener for crud management dispatch event in pre/post crud method for content model display content modification page create contentUpdateEvent create contentCreateEvent create ContentEvent create contentModificationForm create content controller change folder_id parm by parent in list folder view use placeholder in folder update route	2013-09-23 11:55:24 +02:00
franck	e7974a21a7	Finished combination creation GUI	2013-09-23 11:41:14 +02:00
Etienne Roudeix	d015c8c3b8	cache dataccessfunctions	2013-09-23 11:24:30 +02:00
franck	8781721512	Started price tab	2013-09-23 00:57:03 +02:00
franck	22f3f49f79	Finished product multiple categories attachment	2013-09-22 22:14:39 +02:00
gmorel	b91a11536b	Working : Image management set on Category	2013-09-22 20:50:42 +02:00
Manuel Raynaud	ac435b8f87	fire event on insert content in createmethod	2013-09-21 17:04:05 +02:00
Manuel Raynaud	04e0da56e7	fix issue, default foler is set on content creation	2013-09-21 16:58:38 +02:00
franck	72a2cdfd75	Ajaxified product modification tabs	2013-09-21 16:51:51 +02:00
Manuel Raynaud	4e3768e0e9	allow to create new content	2013-09-21 16:38:22 +02:00
Manuel Raynaud	1da66ece29	update default param of content model	2013-09-21 16:07:25 +02:00
Manuel Raynaud	f44b7daf8c	create content listener for crud management	2013-09-21 15:32:27 +02:00
Manuel Raynaud	7680fb42cc	dispatch event in pre/post crud method for content model	2013-09-21 15:24:44 +02:00
Manuel Raynaud	849c7dd20b	display content modification page	2013-09-21 15:20:06 +02:00
gmorel	cf7e6d6952	Merge branch 'master' of https://github.com/thelia/thelia into upload_management ... # By Manuel Raynaud (60) and others # Via Manuel Raynaud (16) and others * 'master' of https://github.com/thelia/thelia: (113 commits) implement process for changing folder position allow possibility to change folder visibility allow to create folder add dispatcher before/after for folder crud management icreate folder delete event process folder update action create folder events display info in folders edition template push model re-add home link in menu comment dev menu in layout translate some missing string fixes order integration order process change some informations in layou fix query in Thelia\Model\Folder::countAllContents allow to order products on category page Add default language & editing language default field Vertical align middle tables Fixed translations ... Conflicts: core/lib/Thelia/Tools/I18n.php templates/admin/default/category-edit.html	2013-09-21 14:44:57 +02:00
Manuel Raynaud	4ec55e5aca	create contentUpdateEvent	2013-09-21 14:40:35 +02:00
Manuel Raynaud	09abedeb9f	create contentCreateEvent	2013-09-21 14:37:20 +02:00
Manuel Raynaud	444cee8e82	create ContentEvent	2013-09-21 14:35:01 +02:00
Manuel Raynaud	423860932f	create contentModificationForm	2013-09-21 14:32:01 +02:00
franck	bb9e1d6999	Finished product features management	2013-09-21 14:14:56 +02:00
Manuel Raynaud	52efd79fb5	create content controller	2013-09-21 14:10:08 +02:00
Manuel Raynaud	bb796f08b6	change folder_id parm by parent in list folder view	2013-09-21 13:55:12 +02:00
Manuel Raynaud	962081c17d	use placeholder in folder update route	2013-09-21 13:42:00 +02:00
franck	e3644cd6cc	Aded feature_template and category_template position management	2013-09-21 11:46:09 +02:00
franck	f6530f0bfc	Finished product feature values	2013-09-20 23:10:31 +02:00
Manuel Raynaud	cc2a3914a9	implement process for changing folder position	2013-09-20 20:38:39 +02:00
Manuel Raynaud	abac607534	allow possibility to change folder visibility	2013-09-20 20:23:49 +02:00
Manuel Raynaud	a8dddc9c26	allow to create folder	2013-09-20 20:07:59 +02:00
Manuel Raynaud	aa39d6300c	add dispatcher before/after for folder crud management	2013-09-20 19:57:25 +02:00
Manuel Raynaud	56197a739e	icreate folder delete event	2013-09-20 19:49:12 +02:00
Manuel Raynaud	6a1df0240e	process folder update action	2013-09-20 19:34:36 +02:00
Manuel Raynaud	00f7c491b2	create folder events	2013-09-20 19:00:41 +02:00
Manuel Raynaud	8a37636aa6	display info in folders edition template	2013-09-20 18:39:12 +02:00
Manuel Raynaud	805b38ab9a	Merge branch 'master' into content ... Conflicts: core/lib/Thelia/Core/Event/TheliaEvents.php templates/admin/default/folders.html	2013-09-20 17:41:38 +02:00
franck	1cf8c87d1a	Fixed product update process	2013-09-20 17:17:44 +02:00
Etienne Roudeix	b7af3ebaa3	push model	2013-09-20 17:02:19 +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