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
|
1ba60103f3
|
coupon in orders + model review : backquote use
|
2013-12-18 17:46:42 +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
|
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
|
32d0aa15a6
|
PaymentModuleInterface::pay method force $order parameter
|
2013-12-16 12:38:41 +01:00 |
|
touffies
|
0684ec2b42
|
Rename meta_keyword to meta_keywords
Add SEO to folder
|
2013-12-09 14:52:46 +01:00 |
|
touffies
|
0d5cfd29e0
|
Add new fields (meta_title, meta_description and meta_keyword) under I18N Product
|
2013-12-09 14:46:06 +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 |
|
Franck Allimant
|
33e0a854f2
|
Implemented mail messages templates and layouts
|
2013-11-27 21:21:07 +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
|
2aefb87db7
|
Finished log configuration. All loggers are currentrly working
|
2013-11-01 16:15:19 +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 |
|
Etienne Roudeix
|
434092a33b
|
admin login is now unique
|
2013-10-30 14:45:50 +01:00 |
|
Etienne Roudeix
|
082f9aff8d
|
admin logs
|
2013-10-29 12:22:34 +01:00 |
|
Franck Allimant
|
db6d5692eb
|
Merge branch 'catalog'
Conflicts:
local/config/schema.xml
|
2013-10-24 16:47:53 +02:00 |
|
Franck Allimant
|
b9410bba59
|
Implemented prices conversion management
|
2013-10-24 12:34:44 +02:00 |
|
Etienne Roudeix
|
fb4e15ae77
|
fix issue #47
|
2013-10-24 10:36:06 +02:00 |
|
Franck Allimant
|
5bf51dd47e
|
Merge branch 'catalog'
Conflicts:
core/lib/Thelia/Config/Resources/config.xml
core/lib/Thelia/Config/Resources/routing/admin.xml
core/lib/Thelia/Core/Template/Loop/Country.php
core/lib/Thelia/Core/Template/Smarty/Plugins/Form.php
core/lib/Thelia/Model/Country.php
core/lib/Thelia/Model/Profile.php
core/lib/Thelia/Model/ProfileQuery.php
install/insert.sql
install/thelia.sql
local/config/schema.xml
|
2013-10-24 00:16:33 +02:00 |
|
Franck Allimant
|
0bd57b0a5a
|
Worked on catalog
|
2013-10-23 23:41:39 +02:00 |
|
Etienne Roudeix
|
44a5909c81
|
permission resource
|
2013-10-22 19:51:01 +02:00 |
|