TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,744 Commits 1 Branch 0 Tags
7f59c8a9549cd770b90f5ff27e91d96ac5fd0406
Commit Graph

728 Commits

Author SHA1 Message Date
Kahn
7f59c8a954 Merge branch 'master' of https://github.com/thelia/thelia into coupon 
* 'master' of https://github.com/thelia/thelia:
  fix issue concerning absoluteUrl
  do not display some information about template file
  escape view parameter
 2013-10-10 22:12:42 +02:00
Manuel Raynaud
d8ec745fea fix issue concerning absoluteUrl 2013-10-09 12:44:49 +02:00
Manuel Raynaud
5d0eb4e61e do not display some information about template file 2013-10-09 10:34:35 +02:00
Manuel Raynaud
d866ffaaf5 escape view parameter 2013-10-09 09:05:48 +02:00
Kahn
5aa6ce12a9 Merge branch 'master' of https://github.com/thelia/thelia into coupon 
* 'master' of https://github.com/thelia/thelia: (102 commits)
  add higher priority to module routing
  update smarty version
  select default country in front register form
  add modal error id changing default country failed
  enabled change default country
  fiw module generator class name issue
  complete javascript for changing default country
  validate country removal
  validate country creation
  implement abstract method from AbstractCrudController in Country Controller
  create country action class
  add pre/post CRUD method in Country model
  create coutry events
  finish customer address update
  complete readme
  update .gitignore file
  add specifig php.ini file for travis
  try to fix travis conf
  remove unused directory
  check session directory permission in install process
  ...
 2013-10-08 23:22:53 +02:00
Manuel Raynaud
e8fd822795 add higher priority to module routing 2013-10-08 13:22:06 +02:00
Manuel Raynaud
43467681fd enabled change default country 2013-10-08 10:16:18 +02:00
Manuel Raynaud
0f1dee978c implement abstract method from AbstractCrudController in Country 
Controller
 2013-10-07 11:34:29 +02:00
Manuel Raynaud
51a307527c create coutry events 2013-10-07 10:50:44 +02:00
Manuel Raynaud
860a96cef5 put dedicated controller for address mangamenent 2013-10-03 16:31:15 +02:00
Manuel Raynaud
eeab96bde6 redirect to customer update template after removing address 2013-10-03 16:10:28 +02:00
Manuel Raynaud
fa45df3275 allow to delete customer address 2013-10-03 15:53:30 +02:00
Manuel Raynaud
e902e331d1 add compass to assteic filters 2013-10-03 13:54:39 +02:00
Manuel Raynaud
abaf8e922c ifix asseticHelper sass filter 2013-10-03 12:40:51 +02:00
Manuel Raynaud
6e29325d19 create purchase order pdf 2013-10-03 10:45:21 +02:00
Manuel Raynaud
df08809a48 implement pdf invoice generation workflow 2013-10-02 16:33:43 +02:00
Manuel Raynaud
0116cb2891 start pdf generation workflow 2013-10-02 15:21:18 +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
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
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
gmorel
a74cf0aa85 WIP : Coupon : Fix condition edition 2013-09-27 15:57:56 +02:00
gmorel
5abe350b65 WIP : Coupon : Fix condition selection JS + Dependency Injection register 2013-09-27 14:52:38 +02:00
Etienne Roudeix
a647bfd016 Merge branch 'master' into tax 
Conflicts:
	local/config/schema.xml
 2013-09-27 13:35:39 +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
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
Etienne Roudeix
49da6b1a3b Merge branch 'master' into tax 2013-09-26 14:18:44 +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
Manuel Raynaud
3a7a76afe0 move folders action class to Folder directory 2013-09-25 17:53:38 +02:00