Commit Graph

74 Commits

Author SHA1 Message Date
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
Manuel Raynaud
1b0de7144a end updating module list 2013-10-17 17:20:29 +02:00
Manuel Raynaud
1b865d71a3 crowl all module descriptor file for discovering new modules 2013-10-17 15:36:11 +02:00
Manuel Raynaud
a9d5554b7c create method for validating module file descriptor 2013-10-17 15:06:13 +02:00
Manuel Raynaud
c9dbb610c1 start validating module.xml file 2013-10-17 11:32:29 +02:00
Manuel Raynaud
fc0cac2cb9 fix usage of ProfilerConnectionWrapper 2013-09-30 15:35:46 +02:00
gmorel
b91a11536b Working : Image management set on Category 2013-09-22 20:50:42 +02:00
Etienne Roudeix
61191b9d32 fixes order integration 2013-09-20 16:31:19 +02:00
Etienne Roudeix
8541499302 order process 2013-09-20 16:25:46 +02:00
Etienne Roudeix
ec7d4471dc payment process 2013-09-19 15:59:16 +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
16d0985718 payment modules 2013-09-18 17:06:08 +02:00
Etienne Roudeix
b8c2bdc8df cheque module 2013-09-18 16:23:10 +02:00
Etienne Roudeix
45106f24bd module image 2013-09-18 15:58:58 +02:00
Etienne Roudeix
9b37bbb862 module image 2013-09-18 11:20:29 +02:00