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

1881 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Manuel Raynaud
906c97ca62 revert hange in folder admin template 2013-09-30 14:24:33 +02:00
Manuel Raynaud
84847b8765 fix form_enctype smarty function 2013-09-30 13:07:15 +02:00
Manuel Raynaud
bf0a6bf622 update propel version 2013-09-30 11:14:30 +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
mespeche
ed335847ce No options extend 2013-09-30 10:23:39 +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
mespeche
2a6c50c865 Merge branch 'views-management' of https://github.com/thelia/thelia into views-management 
Conflicts:
	templates/admin/default/tax-rule-edit.html
 2013-09-30 10:14:11 +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
Manuel Raynaud
2928d0d3c0 update import using propel collection in all save methods 2013-09-30 09:31:34 +02:00
Manuel Raynaud
0878659368 update import using isDefault parameter on productSaleElements 2013-09-30 09:25:48 +02:00
mespeche
43238103c7 Start selectbox in modal to choose country 2013-09-30 09:17:59 +02:00
touffies
cbf0d19dcd Refonte du code javascript pour mieux gérer le drag and drop, maintenant il faudrait ajouter un peu de css. 2013-09-27 17:23:08 +02:00
Etienne Roudeix
f9bffe9025 fix template 2013-09-27 15:23:35 +02:00
Etienne Roudeix
61d9e89f2e schema fix 2013-09-27 13:38:23 +02:00
Etienne Roudeix
a647bfd016 Merge branch 'master' into tax 
Conflicts:
	local/config/schema.xml
 2013-09-27 13:35:39 +02:00
Manuel Raynaud
fbcd6b0cd2 update readme 2013-09-27 13:32:57 +02:00
Manuel Raynaud
4735c232db Merge pull request #2 from thelia/coupon 
Coupon
 2013-09-27 04:21:50 -07:00
touffies
bce83ea5c0 Test commit with coda 2013-09-27 12:32:16 +02:00
touffies
a82d671d4a Change dragging 
containment
 2013-09-27 11:59:35 +02:00
Etienne Roudeix
7b3e7ece4d Merge branch 'master' into tax 2013-09-27 11:06:16 +02:00
Etienne Roudeix
ab6e34cf00 Merge branch 'template' 2013-09-27 11:04:52 +02:00
Etienne Roudeix
f60670c412 translations intl 2013-09-27 11:04:14 +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
gmorel
116c8c31b4 Merge branch 'master' of https://github.com/thelia/thelia 
# By Manuel Raynaud (80) and others
# Via Manuel Raynaud (16) and others
* 'master' of https://github.com/thelia/thelia: (179 commits)
  Working : images : enhance display
  fix missing } in password template
  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
  remove smarty cache
  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
  ...
 2013-09-27 10:20:02 +02:00
Etienne Roudeix
7e3cbb6818 fix tests (or not ?) 2013-09-27 10:03:56 +02:00
Etienne Roudeix
0c2a0f8053 call reset_install script in travis 2013-09-27 09:50:28 +02:00
Etienne Roudeix
4bdc06e216 try to fix test 2013-09-27 09:30:22 +02:00
macuser
6840ad362e Taxe Rules : Modification du javascript Drag & Drop pour ordonner les éléments. 2013-09-27 01:38:26 +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
fbf7ee1625 WIP : coupon refactor + fix 2013-09-26 17:47:50 +02:00
gmorel
73fde64f5b WIP : coupon refactor + fix 2013-09-26 17:47:41 +02:00
gmorel
0cdd960cb1 Working : images : enhance display 2013-09-26 15:26:45 +02:00
mespeche
be4c6380e7 Setting taxe rule drag and drop functionnal with sortable rule group 2013-09-26 15:24:31 +02:00