TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,681 Commits 1 Branch 0 Tags
321368bb3ed2bf8aceb243aaa15e577cabd64e30
Commit Graph

1287 Commits

Author SHA1 Message Date
Manuel Raynaud
321368bb3e test updating up and down folder position 2013-10-01 14:39:59 +02:00
Manuel Raynaud
de98b5e9e3 test folder toggle visibility 2013-10-01 14:02:28 +02:00
Manuel Raynaud
98c3177de2 test folder removal 2013-10-01 13:52:51 +02:00
Manuel Raynaud
19e5758150 start testing folder crud 2013-10-01 11:29:47 +02:00
Manuel Raynaud
34ec2364e3 finish contentFolder removing process 2013-10-01 10:24:09 +02:00
Manuel Raynaud
02322f8f11 create removeAdditionalFolder controller, event and listener 2013-10-01 10:08:48 +02:00
Manuel Raynaud
dfda04ddd2 create contentAddFolder process 2013-10-01 09:51:07 +02:00
Manuel Raynaud
cd5c89a33b display good content_folder on content_edit admin template 2013-09-30 18:10:05 +02:00
Manuel Raynaud
e6e95b2516 fix some use statement 2013-09-30 16:31:28 +02:00
Manuel Raynaud
197f2d48c2 allow to change content's default folder 2013-09-30 16:14:06 +02:00
Manuel Raynaud
fc0cac2cb9 fix usage of ProfilerConnectionWrapper 2013-09-30 15:35:46 +02:00
Manuel Raynaud
f25922c60a fix breadcrumb for content/folder part 2013-09-30 15:13:04 +02:00
Manuel Raynaud
d7e9752d63 create breadcrumb and FolderPath loop 2013-09-30 15:00:51 +02:00
Manuel Raynaud
84847b8765 fix form_enctype smarty function 2013-09-30 13:07:15 +02:00
Manuel Raynaud
d37e28af19 rename order* file template 2013-09-30 11:12:15 +02:00
Manuel Raynaud
c65ec67bdf fix cs 2013-09-30 10:35:34 +02:00
Manuel Raynaud
43b5a129f7 refactor order and image events 2013-09-30 10:34:08 +02:00
Manuel Raynaud
6d5f34767d refactor document events 2013-09-30 10:32:48 +02: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
6c5e348b46 refactor missing product event 2013-09-30 10:18:02 +02:00
Manuel Raynaud
01dbe9f5d2 refactor feature events 2013-09-30 10:16:57 +02:00
Manuel Raynaud
1c2532fe6a refactor cart events 2013-09-30 10:15:22 +02:00
Manuel Raynaud
10022e5a4a refactor currency events 2013-09-30 10:11:55 +02:00
Manuel Raynaud
3ed76d237a refactor config events 2013-09-30 10:10:44 +02:00
Manuel Raynaud
cf4d3b87fd refactor category events 2013-09-30 10:09:43 +02:00
Manuel Raynaud
0ce4b25e72 refactor customer events 2013-09-30 10:07:01 +02:00
Manuel Raynaud
b023c33cc7 refactor address and attribute events 2013-09-30 10:03:14 +02:00
Manuel Raynaud
efb5a7a54d refactor message events 2013-09-30 10:01:06 +02:00
Manuel Raynaud
80071b6dd1 refactor template events 2013-09-30 09:59:39 +02:00
Etienne Roudeix
a647bfd016 Merge branch 'master' into tax 
Conflicts:
	local/config/schema.xml
 2013-09-27 13:35:39 +02:00
Etienne Roudeix
7b3e7ece4d Merge branch 'master' into tax 2013-09-27 11:06:16 +02:00
gmorel
1766951389 Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By gmorel (24) and others
# Via gmorel (12) and others
* 'master' of https://github.com/thelia/thelia: (43 commits)
  Working : upload file/image : fix sanitizeFileName
  Working : images : enhance display
  Working : Fix : Unit test
  Working : Fix : Unit test
  Working : Fix : Image Management + Document Management
  Working : FileManager :Add some more unit tests
  Working : Add a link on documents
  Working : fix url document + refactor : naming conventions
  Working : refactor : naming conventions
  Working : upload : fix unit test
  WIP : upload documents : add action, ctrl, event
  Finished product combination basic function
  WIP : upload document : add forms
  Working : upload image : fix return URL to images tab
  Working : upload image : fix fallback and delete links on refresh
  Formatted combination table
  Impemented combination creation
  Working : Upload image : Fix upload validation
  - Image format allowed - manual-reverse order on image loop
  Upload allow only for images
  ...

Conflicts:
	core/lib/Thelia/Model/Base/AttributeTemplate.php
	core/lib/Thelia/Model/Base/AttributeTemplateQuery.php
	core/lib/Thelia/Model/Map/AttributeTemplateTableMap.php
	install/faker.php
	install/thelia.sql
	local/config/schema.xml
	templates/admin/default/assets/js/coupon.js
	tests/functionnal/casperjs/exe/00_parameters.js
	tests/functionnal/casperjs/exe/31_coupons_rule.js
 2013-09-27 10:39:52 +02:00
gmorel
9d02aa75a8 Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By gmorel (24) and others
# Via gmorel (12) and others
* 'master' of https://github.com/thelia/thelia: (43 commits)
  Working : upload file/image : fix sanitizeFileName
  Working : images : enhance display
  Working : Fix : Unit test
  Working : Fix : Unit test
  Working : Fix : Image Management + Document Management
  Working : FileManager :Add some more unit tests
  Working : Add a link on documents
  Working : fix url document + refactor : naming conventions
  Working : refactor : naming conventions
  Working : upload : fix unit test
  WIP : upload documents : add action, ctrl, event
  Finished product combination basic function
  WIP : upload document : add forms
  Working : upload image : fix return URL to images tab
  Working : upload image : fix fallback and delete links on refresh
  Formatted combination table
  Impemented combination creation
  Working : Upload image : Fix upload validation
  - Image format allowed - manual-reverse order on image loop
  Upload allow only for images
  ...

Conflicts:
	core/lib/Thelia/Model/Base/AttributeTemplate.php
	core/lib/Thelia/Model/Base/AttributeTemplateQuery.php
	core/lib/Thelia/Model/Map/AttributeTemplateTableMap.php
	install/faker.php
	install/thelia.sql
	local/config/schema.xml
	templates/admin/default/assets/js/coupon.js
	tests/functionnal/casperjs/exe/00_parameters.js
	tests/functionnal/casperjs/exe/31_coupons_rule.js
 2013-09-27 10:37:09 +02:00
Etienne Roudeix
622e1ca3b6 Merge branch 'master' into tax 
Conflicts:
	core/lib/Thelia/Core/Template/Loop/FeatureValue.php
	core/lib/Thelia/Model/Base/AttributeTemplate.php
	core/lib/Thelia/Model/Base/AttributeTemplateQuery.php
	core/lib/Thelia/Model/Map/AttributeTemplateTableMap.php
	install/thelia.sql
	local/config/schema.xml
 2013-09-27 10:29:51 +02:00
gmorel
c8e56625ad Working : upload file/image : fix sanitizeFileName 2013-09-27 10:21:49 +02:00
Etienne Roudeix
4bdc06e216 try to fix test 2013-09-27 09:30:22 +02:00
franck
62ce7db882 Merge branch 'catalog' 2013-09-26 19:07:06 +02:00
gmorel
dde8501790 WIP : coupon refactor + fix 2013-09-26 18:18:45 +02:00
gmorel
a1f898ff3b Merge branch 'master' of https://github.com/thelia/thelia into coupon 
# By Manuel Raynaud
# Via Manuel Raynaud
* 'master' of https://github.com/thelia/thelia:
  fix missing } in password template
  remove smarty cache
 2013-09-26 17:48:06 +02:00
gmorel
73fde64f5b WIP : coupon refactor + fix 2013-09-26 17:47:41 +02:00
Etienne Roudeix
49da6b1a3b Merge branch 'master' into tax 2013-09-26 14:18:44 +02:00
Etienne Roudeix
97c461fa2c order address changes tests 2013-09-26 14:17:26 +02:00
Etienne Roudeix
f5492ed2f9 tests for order update actions 2013-09-26 13:25:25 +02:00
Etienne Roudeix
34ef5cf524 edit order form 2013-09-26 13:07:51 +02:00
Etienne Roudeix
5e0f9cedf5 fix tests 2013-09-26 10:43:09 +02:00
gmorel
4d3335f589 WIP : Condition : Fix unit text 2013-09-25 18:15:48 +02:00
Manuel Raynaud
3a7a76afe0 move folders action class to Folder directory 2013-09-25 17:53:38 +02:00
Manuel Raynaud
a8a8ecb38c refactor product events, moving to Prduct folder 2013-09-25 17:50:29 +02:00
gmorel
965a505864 WIP : Condition : Fix unit text 2013-09-25 17:47:42 +02:00
gmorel
0da90c4a99 WIP : Condition : Fix unit text 2013-09-25 17:22:36 +02:00