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 |
|
Manuel Raynaud
|
412e5e9253
|
comment missing js file
|
2013-12-14 15:19:34 +01:00 |
|
Etienne Roudeix
|
297f197fed
|
Merge branch 'cleanmaster' into modules
|
2013-12-12 15:45:45 +01:00 |
|
Etienne Roudeix
|
93537b8d71
|
in progress : reorder image
|
2013-12-12 15:30:10 +01:00 |
|
Franck Allimant
|
e96088080d
|
Merge branch 'master' into modules
|
2013-12-06 17:16:14 +01:00 |
|
Franck Allimant
|
1416265053
|
Fixed improper translations
|
2013-12-05 11:05:08 +01:00 |
|
Manuel Raynaud
|
00378218f9
|
Merge branch 'master' of github.com:thelia/thelia
|
2013-12-03 17:57:21 +01:00 |
|
Manuel Raynaud
|
02aa280934
|
add module_include block in product-edit page
|
2013-12-03 17:55:42 +01:00 |
|
gmorel
|
dc648fef62
|
Merge master
|
2013-11-27 20:24:38 +01:00 |
|
Etienne Roudeix
|
25192cf366
|
change template subdirs
|
2013-11-13 10:24:14 +01:00 |
|