Commit Graph

198 Commits

Author SHA1 Message Date
Etienne Roudeix
7b3e7ece4d Merge branch 'master' into tax 2013-09-27 11:06:16 +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
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
gmorel
cef3787d68 Working : Fix : Unit test 2013-09-24 19:06:10 +02:00
gmorel
87016ddddb Working : Fix : Unit test 2013-09-24 18:54:38 +02:00
Etienne Roudeix
7bd511c420 order admin 2013-09-24 17:04:32 +02:00
gmorel
71888e68aa Working : FileManager :Add some more unit tests 2013-09-24 14:50:42 +02:00
gmorel
430e18e4e2 Working : Add a link on documents 2013-09-24 12:25:19 +02:00
gmorel
466113bc12 Working : upload : fix unit test 2013-09-24 11:11:50 +02:00
Etienne Roudeix
2de820f576 order tests 2013-09-23 15:00:13 +02:00
gmorel
e39511e3dc Working : Upload image : Fix unit tests 2013-09-23 14:55:36 +02:00
Etienne Roudeix
5bbf693e0f action order tests 2013-09-23 14:44:52 +02:00
Etienne Roudeix
194073fa42 order action test 2013-09-23 11:12:41 +02:00
gmorel
b91a11536b Working : Image management set on Category 2013-09-22 20:50:42 +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
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
Etienne Roudeix
8541499302 order process 2013-09-20 16:25:46 +02:00
Manuel Raynaud
65558e74e3 clean code in test suites 2013-09-19 15:50:47 +02:00
Etienne Roudeix
66536d0b31 Merge branch 'master' into template
Conflicts:
	core/lib/Thelia/Core/Template/Loop/Product.php
2013-09-18 20:03:13 +02:00
Etienne Roudeix
891ebcd491 fix tests, edit reset_install.sh, manage payment modules, change debugbar namespace to theliadebugbar 2013-09-18 19:51:01 +02:00
Etienne Roudeix
45106f24bd module image 2013-09-18 15:58:58 +02:00
Manuel Raynaud
8e8b55a208 refactor product rewriting test case 2013-09-18 14:33:54 +02:00
Manuel Raynaud
7c53eeea2f create base class for testing rewriting method on each object 2013-09-18 14:32:49 +02:00
Manuel Raynaud
fd74703658 create test rewritten url for category 2013-09-18 12:24:36 +02:00
Manuel Raynaud
e638a927c0 add more test for rewriten url 2013-09-18 12:03:02 +02:00
Etienne Roudeix
bb246b3205 fix test 2013-09-18 08:55:12 +02:00
franck
48e2be57c6 Fixed some unit tests 2013-09-18 01:24:37 +02:00
Manuel Raynaud
f068539e79 add covers annotation in ProductRewriteTest 2013-09-17 20:16:51 +02:00
Manuel Raynaud
da7f9e07c4 create test for UrlRewritingTrait 2013-09-17 20:15:28 +02:00
franck
d097851522 Added documents action and loop 2013-09-17 01:07:42 +02:00
gmorel
c49bfa4b25 Working : Coupon : Fix unit tests @todo refactor 2013-09-16 11:26:37 +02:00
gmorel
970d6b6ff7 Merge branch 'master' of https://github.com/thelia/thelia into coupon
# By franck (6) and others
# Via franck (3) and others
* 'master' of https://github.com/thelia/thelia:
  Implemented "Remember Me" feature on admin. Started template management
  Added Templates events
  First version of installation wizard
  tax engine retriever
  allow address removal from front
  Insert pagination inside tfoot
  allow update customer address in front tempalte
  allow to create a new address
  allow to make an address as default on update action
  Finished attributes management
  Fixed action column alignment
  Fixed duplication parameter check regexp
  absoluteUrl prevetn duplicate parameters in generated URL
2013-09-16 10:01:34 +02:00
Etienne Roudeix
ac40705c80 Merge branch 'master' into tax 2013-09-13 14:02:39 +02:00
Etienne Roudeix
ecc419fbdf tax engine retriever 2013-09-13 13:59:16 +02:00
gmorel
58ef39769c Merge branch 'master' of https://github.com/thelia/thelia into coupon
# By Etienne Roudeix (1) and Manuel Raynaud (1)
# Via Manuel Raynaud (2) and Etienne Roudeix (1)
* 'master' of https://github.com/thelia/thelia:
  fix test suite
  fix current url bug + fix empty loop pagination exception
2013-09-12 17:55:16 +02:00
Manuel Raynaud
bad8a0439d fix test suite 2013-09-12 17:28:02 +02:00
gmorel
2e7e31285e WIP : Coupon event dispatcher + action 2013-09-12 17:21:49 +02:00
Manuel Raynaud
d6e1f99b35 Merge branch 'template'
Conflicts:
	templates/admin/default/customer-edit.html
2013-09-12 15:44:23 +02:00
Etienne Roudeix
b698d1aada loop tests 2013-09-12 11:35:27 +02:00
Etienne Roudeix
f75b6e876c test product loop limit 2013-09-12 11:28:32 +02:00
Etienne Roudeix
e81b894816 fix tests 2013-09-12 10:58:12 +02:00
Etienne Roudeix
d61f3a6a1e product loop test 2013-09-12 10:48:27 +02:00
Manuel Raynaud
6b9db1a162 create test for customer creation 2013-09-12 09:23:50 +02:00
Etienne Roudeix
c35de47f10 fix taxengine tests 2013-09-11 20:18:34 +02:00
Etienne Roudeix
25756ef9dd tax engine 2013-09-11 16:56:16 +02:00
Manuel Raynaud
70d93d1daa fix cs 2013-09-11 08:27:40 +02:00