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

17 Commits

Author SHA1 Message Date
gmorel
8f9b86ff6a Merge branch 'master' of https://github.com/thelia/thelia into coupon 
* 'master' of https://github.com/thelia/thelia: (121 commits)
  set cartItem in cart add and update events
  need to unescape breadcrumb strings after been in array
  update readme file
  update insert.sql with new release version
  change changelog file format
  Prevent product and content création at catalog root
  dynamic delivery modules on delivery front template
  complete changelog
  Finished merging modules with master
  Revert "Merge branch 'cleanmaster' into modules"
  use TaxEngine::getDeliveryCountry in delivery loop
  refacto getTaxCountry which is actually getDeliveryCountry
  make it magic last stand
  change loop in shipping zone template using module insteadof delivery
  Fixed template loop
  Refactored templates processing
  complete readme file
  change email address of core contributors
  fix getPosition folder test
  add coupon tests
  ...

Conflicts:
	core/lib/Thelia/Controller/Admin/ProductController.php
 2013-12-25 14:14:20 +01:00
gmorel
69d255f782 new branch coupon 2013-12-25 14:12:54 +01:00
Etienne Roudeix
63f48b79da fix rewrinting tests 2013-12-10 15:56:59 +01:00
Manuel Raynaud
c65ec67bdf fix cs 2013-09-30 10:35:34 +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
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
Etienne Roudeix
e81b894816 fix tests 2013-09-12 10:58:12 +02:00
Manuel Raynaud
70d93d1daa fix cs 2013-09-11 08:27:40 +02:00
Etienne Roudeix
04d8990990 unit testing for tax engine calculator 2013-09-09 17:43:58 +02:00
franck
6387182026 Merge branch 'master' of https://github.com/thelia/thelia 
Conflicts:
	core/lib/Thelia/Core/Template/Loop/Config.php
	core/lib/Thelia/Core/Template/Loop/Product.php
	core/lib/Thelia/Tools/URL.php
 2013-09-04 17:34:23 +02:00
Etienne Roudeix
9a537b69d3 test rewriting exception 2013-09-04 08:16:25 +02:00
Etienne Roudeix
43ff0b7297 rewriting 2013-09-03 16:51:41 +02:00
Etienne Roudeix
4ba16dc290 sid : rewriting 2013-08-30 09:13:54 +02:00