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

2774 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Franck Allimant
9ff72f119f Merge branch 'modules' of https://github.com/thelia/thelia into modules 2013-12-20 14:31:06 +01:00
Franck Allimant
afea985549 Merge branch 'modules' of https://github.com/thelia/thelia into modules 
Conflicts:
	core/lib/Thelia/Core/Template/Assets/AssetManagerInterface.php
	core/lib/Thelia/Core/Template/Assets/AsseticAssetManager.php
	core/lib/Thelia/Core/Template/Loop/Template.php
	core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
	core/lib/Thelia/Core/Template/TemplateDefinition.php
	core/lib/Thelia/Model/Base/CartItem.php
	core/lib/Thelia/Model/Base/CartItemQuery.php
	core/lib/Thelia/Model/Base/CouponOrder.php
	core/lib/Thelia/Model/Base/Order.php
	core/lib/Thelia/Model/Base/OrderCouponQuery.php
	core/lib/Thelia/Model/Base/OrderQuery.php
 2013-12-20 14:30:50 +01:00
Etienne Roudeix
22efc21bfe dynamic delivery modules on delivery front template 2013-12-20 12:14:20 +01:00
Franck Allimant
882cf554d1 Finished merging modules with master 2013-12-20 11:47:34 +01:00
Franck Allimant
9092e39296 Merge branch 'master' into modules 
Conflicts:
	core/lib/Thelia/Core/Template/Assets/AssetManagerInterface.php
	core/lib/Thelia/Core/Template/Assets/AsseticAssetManager.php
	core/lib/Thelia/Core/Template/Loop/Template.php
	core/lib/Thelia/Core/Template/Smarty/Assets/SmartyAssetsManager.php
	core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
	core/lib/Thelia/Core/Template/TemplateDefinition.php
	core/lib/Thelia/Core/Template/TemplateHelper.php
	core/lib/Thelia/Core/Thelia.php
 2013-12-20 11:32:01 +01:00
Etienne Roudeix
b3ac365b45 Revert "Merge branch 'cleanmaster' into modules" 
This reverts commit d0ff5260f7, reversing
changes made to 67d0101dbe.
 2013-12-20 11:16:42 +01:00
Etienne Roudeix
d0ff5260f7 Merge branch 'cleanmaster' into modules 
Conflicts:
	core/lib/Thelia/Core/Template/Assets/AssetManagerInterface.php
	core/lib/Thelia/Core/Template/Assets/AsseticAssetManager.php
	core/lib/Thelia/Core/Template/Loop/Template.php
	core/lib/Thelia/Core/Template/Smarty/Assets/SmartyAssetsManager.php
	core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
	core/lib/Thelia/Core/Template/TemplateDefinition.php
	core/lib/Thelia/Core/Template/TemplateHelper.php
	core/lib/Thelia/Core/Thelia.php
 2013-12-20 11:16:35 +01:00
Etienne Roudeix
67d0101dbe use TaxEngine::getDeliveryCountry in delivery loop 2013-12-20 11:14:04 +01:00
Etienne Roudeix
4cb8ba704b refacto getTaxCountry which is actually getDeliveryCountry 2013-12-20 11:13:08 +01:00
Etienne Roudeix
63ba1ceeda make it magic last stand 2013-12-20 11:12:03 +01:00
Manuel Raynaud
5f8a6a1a5e change loop in shipping zone template using module insteadof delivery 2013-12-20 09:25:37 +01:00
Franck Allimant
2979ca0092 Fixed template loop 2013-12-20 01:40:45 +01:00
Franck Allimant
3a2ad352cc Refactored templates processing 2013-12-20 00:49:08 +01:00
Manuel Raynaud
4610128134 complete readme file 2013-12-19 16:31:50 +01:00
Manuel Raynaud
e2d7d44798 Merge branch 'master' of github.com:thelia/thelia 2013-12-19 16:04:10 +01:00
Manuel Raynaud
bd1bac1f0d change email address of core contributors 2013-12-19 16:03:39 +01:00
Etienne Roudeix
f434924e48 fix getPosition folder test 2013-12-19 15:46:03 +01:00
Etienne Roudeix
8c121dd455 add coupon tests 2013-12-19 15:37:15 +01:00
Etienne Roudeix
5773922314 show coupon codes in back office 2013-12-19 14:50:45 +01:00
Etienne Roudeix
d7c1ecf09a coupon management in order and cart process 2013-12-19 14:17:22 +01:00
Etienne Roudeix
c981102d3a Merge branch 'master' of github.com:thelia/thelia into cleanmaster 2013-12-18 17:47:23 +01:00
Etienne Roudeix
1ba60103f3 coupon in orders + model review : backquote use 2013-12-18 17:46:42 +01:00
Manuel Raynaud
a6a2c43345 don't remove session order before calling payment method 2013-12-18 17:04:48 +01:00
Manuel Raynaud
2f4158d1f6 fix cs 2013-12-18 10:04:13 +01:00
Manuel Raynaud
d0e5d189d2 change memory_limit value, 128 MB is enough 2013-12-18 09:39:23 +01:00
Manuel Raynaud
e7a564b2df use composer create-project instead of git 2013-12-17 14:47:31 +01:00
Manuel Raynaud
ade8ac6f2a add documentation URL in readme 2013-12-17 14:46:36 +01:00
Manuel Raynaud
0c24a8afc0 Merge branch 'master' into modules 
Conflicts:
	templates/backOffice/default/product-edit.html
 2013-12-17 10:48:59 +01:00
Manuel Raynaud
e5576864cd Merge branch 'frontend' 2013-12-17 10:22:17 +01:00
Manuel Raynaud
d6b524e39a add a new entry point in each pages in bo for js include 2013-12-17 10:21:18 +01:00
Manuel Raynaud
c39492d6ce Merge pull request #139 from thelia/frontend 
SEO - META TITLE / DESCRIPTION AND KEYWORDS
 2013-12-17 00:36:01 -08:00
Manuel Raynaud
db2ad120b2 fix test suite reimplementing url updating trest 2013-12-16 17:29:25 +01:00
Manuel Raynaud
0e9ac181e5 fix missing current_id parameter in content-edit.html template 2013-12-16 17:09:48 +01:00
Manuel Raynaud
1a0d543990 fix missing id in folder-edit.html template 2013-12-16 17:06:15 +01:00
Manuel Raynaud
10ecec2fa1 setUrl was not call in seo event generation 2013-12-16 16:39:14 +01:00
Manuel Raynaud
49c6b5b05a remove novalidate paramter on seo form 2013-12-16 16:26:26 +01:00
Manuel Raynaud
b9192e551c fix missing general form on seo form error 2013-12-16 16:22:14 +01:00
Manuel Raynaud
30eab4f416 fix object identifier presence 2013-12-16 15:53:02 +01:00
Manuel Raynaud
d6ba2b3d65 Merge branch 'master' into frontend 2013-12-16 15:45:04 +01:00
Etienne Roudeix
65f43b5eff Merge branch 'cleanmaster' into modules 2013-12-16 14:33:15 +01:00
Etienne Roudeix
315ed1fb09 fix #144 2013-12-16 14:31:51 +01:00
Etienne Roudeix
32d0aa15a6 PaymentModuleInterface::pay method force $order parameter 2013-12-16 12:38:41 +01:00
Etienne Roudeix
029c97c47f new checking in folder tests 2013-12-16 11:38:57 +01:00
Etienne Roudeix
977bbb55fa Merge branch 'cleanmaster' into modules 2013-12-16 11:32:54 +01:00
Etienne Roudeix
86f1e06e42 document repositioning after delation 2013-12-16 11:32:05 +01:00
Etienne Roudeix
c5e69ebbb9 Merge branch 'cleanmaster' into modules 2013-12-16 10:56:40 +01:00
Etienne Roudeix
583cbe95b6 document positioning 2013-12-16 10:55:18 +01:00
Etienne Roudeix
536c88b4f8 Merge branch 'cleanmaster' into modules 
Conflicts:
	core/lib/Thelia/Tests/Action/RewrittenUrlTestTrait.php
 2013-12-16 09:57:35 +01:00
Etienne Roudeix
0e30ce2760 add jquery ui in assets 2013-12-16 09:40:13 +01:00
Etienne Roudeix
d4f721fa33 Merge branch 'master' of github.com:thelia/thelia into cleanmaster 2013-12-16 09:11:21 +01:00