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

89 Commits

Author SHA1 Message Date
Franck Allimant
73680d3d01 Fixed TaxEngine usage. 2014-01-23 12:06:14 +01:00
Manuel Raynaud
1974d3e3c3 fix psr 2014-01-22 12:52:36 +01:00
Manuel Raynaud
d345069707 fix directory separator in tinymce module. Fix #172 2014-01-17 16:33:26 +01:00
Manuel Raynaud
4e1521775f alloow possibility to specify a ref for a customer 2014-01-17 11:15:55 +01:00
Franck Allimant
842299bee8 Fixed typo 2014-01-16 11:31:18 +01:00
Manuel Raynaud
55d0fd2ae2 configure upload dir for tonymce module 2014-01-14 11:20:12 +01:00
Manuel Raynaud
d73eaad981 move tinymce to resources folder 2014-01-14 10:36:37 +01:00
Manuel Raynaud
79dafd109e create tinymce module 2014-01-13 18:07:23 +01:00
Etienne Roudeix
99038e688a Revert "Revert "Merge branch 'cleanmaster' into modules"" 
This reverts commit b3ac365b45.

Conflicts:
	Readme.md
	core/lib/Thelia/Controller/Admin/AbstractCrudController.php
	core/lib/Thelia/Core/Template/Assets/AssetManagerInterface.php
	core/lib/Thelia/Core/Template/Assets/AsseticAssetManager.php
	core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
	core/lib/Thelia/Core/Template/TemplateDefinition.php
	core/lib/Thelia/Model/Base/Coupon.php
	core/lib/Thelia/Model/Base/CouponQuery.php
	core/lib/Thelia/Model/Base/CouponVersion.php
	core/lib/Thelia/Model/Base/CouponVersionQuery.php
	core/lib/Thelia/Model/Base/OrderCouponQuery.php
 2014-01-06 11:25:25 +01:00
Etienne Roudeix
22efc21bfe dynamic delivery modules on delivery front template 2013-12-20 12:14:20 +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
d7c1ecf09a coupon management in order and cart process 2013-12-19 14:17:22 +01:00
Etienne Roudeix
65f43b5eff Merge branch 'cleanmaster' into modules 2013-12-16 14:33:15 +01:00
Etienne Roudeix
32d0aa15a6 PaymentModuleInterface::pay method force $order parameter 2013-12-16 12:38:41 +01:00
Franck Allimant
8c864021f5 Added sorting and position ùmanagement to modules. 2013-12-06 18:59:46 +01:00
Franck Allimant
ceb1357dd7 Renamed backoffice to backOffice 2013-12-02 19:05:02 +01:00
Etienne Roudeix
bc9da10d8c change asset origin param name by source 2013-11-28 12:02:53 +01:00
Etienne Roudeix
b0371312e2 assets in modules 2013-11-28 11:47:21 +01:00
Etienne Roudeix
247ed6aa2a Merge branch 'master' into modules 
Conflicts:
	core/lib/Thelia/Core/Template/Assets/AsseticAssetManager.php
	core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
 2013-11-28 10:34:57 +01:00
Etienne Roudeix
7e83896f96 Merge branch 'master' of github.com:thelia/thelia 2013-11-28 10:30:28 +01:00
Etienne Roudeix
4c754376e7 assets in module 2013-11-28 10:30:08 +01:00
touffies
fd0301022d Merge branch 'backoffice' into frontend 2013-11-25 10:24:29 +01:00
Etienne Roudeix
b9790efeee Merge branch 'master' into modules 2013-11-25 10:05:01 +01:00
Etienne Roudeix
6b95d34f5a Merge branch 'master' of github.com:thelia/thelia 2013-11-25 10:04:44 +01:00
Etienne Roudeix
2bc1bbed64 asset tests 2013-11-25 10:03:48 +01:00
touffies
85d9c112d3 Replace company_name and contact_email by store_name & store_email 2013-11-22 17:40:04 +01:00
Manuel Raynaud
a85baf6994 remove specific code testing esi integration 2013-11-22 09:43:24 +01:00
Manuel Raynaud
a436adf438 add new route for testing esi tag 2013-11-20 14:45:40 +01:00
Etienne Roudeix
0cc48ecdb7 Merge branch 'master' of github.com:thelia/thelia 2013-11-18 11:32:36 +01:00
Etienne Roudeix
b03bac18d6 assets in modules 2013-11-18 11:32:17 +01:00
Manuel Raynaud
9446b33ee7 load custom router from Front module 2013-11-18 10:51:46 +01:00
OpenStudio
89e0bf8867 move front controller classes to Front module 2013-11-18 10:51:46 +01:00
Manuel Raynaud
597da57252 start Front module 2013-11-18 10:51:46 +01:00
Etienne Roudeix
a4935a556c fix modules bug 2013-11-15 16:35:29 +01:00
Etienne Roudeix
b2bb8791f9 colissimo 2013-11-14 13:55:44 +01:00
Etienne Roudeix
fa127ed4f0 colissimo module 2013-11-14 11:53:29 +01:00
Etienne Roudeix
48409c29a9 Colissimo in progress 2013-11-14 11:21:34 +01:00
Etienne Roudeix
e8b4a4ac74 Colissimo proces 2013-11-14 09:22:56 +01:00
Etienne Roudeix
299b192018 Colissimo module + countires areas 2013-11-14 09:13:28 +01:00
Etienne Roudeix
77760e7d3f module template inclusion 2013-11-13 14:48:35 +01:00
Etienne Roudeix
2da2a2d6c1 admin for colissimo 2013-11-13 10:08:43 +01:00
Etienne Roudeix
422a80fcce module modification 2013-11-08 11:26:06 +01:00
Franck Allimant
3b9f94cec8 Using now templates instead of hard code in AdminUtilities smarty plugin 2013-10-31 12:16:14 +01:00
Franck Allimant
a295fee0d3 Changed ModulesAdmin dir into AdminIncludes - Updated debug bar module 2013-10-31 11:36:56 +01:00
Manuel Raynaud
78cba61cd5 finish admin update password command line 2013-10-30 15:35:11 +01:00
Manuel Raynaud
9d794e229d Merge branch 'master' into module_management 
Conflicts:
	core/lib/Thelia/Core/Template/Loop/TaxRuleCountry.php
	core/lib/Thelia/Core/Template/Smarty/Plugins/Form.php
 2013-10-21 09:19:08 +02:00
Manuel Raynaud
d354ed96ad don't use alternative Logger in debugbar if debug is disabled 2013-10-18 15:59:49 +02:00
Manuel Raynaud
e602884ce0 end module activation 2013-10-18 10:06:42 +02:00
Manuel Raynaud
6d791f5bf7 process module toggle activation 2013-10-17 18:50:00 +02:00