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 |
|
Manuel Raynaud
|
5f8a6a1a5e
|
change loop in shipping zone template using module insteadof delivery
|
2013-12-20 09:25:37 +01:00 |
|
Etienne Roudeix
|
5773922314
|
show coupon codes in back office
|
2013-12-19 14:50:45 +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
|
0c24a8afc0
|
Merge branch 'master' into modules
Conflicts:
templates/backOffice/default/product-edit.html
|
2013-12-17 10:48:59 +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
|
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
|
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
|
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 |
|
Etienne Roudeix
|
3d55a6ded6
|
add jquery ui (ooops)
|
2013-12-16 09:10:35 +01:00 |
|
Luis Cordova
|
06fa5fa1e5
|
update profil translation
|
2013-12-14 17:18:44 +01:00 |
|
Manuel Raynaud
|
412e5e9253
|
comment missing js file
|
2013-12-14 15:19:34 +01:00 |
|
Manuel Raynaud
|
48e31b1145
|
fix link in admin footer
|
2013-12-14 13:27:09 +01:00 |
|
Etienne Roudeix
|
297f197fed
|
Merge branch 'cleanmaster' into modules
|
2013-12-12 15:45:45 +01:00 |
|
Etienne Roudeix
|
c9e052188c
|
images are positionable
|
2013-12-12 15:41:35 +01:00 |
|
Etienne Roudeix
|
93537b8d71
|
in progress : reorder image
|
2013-12-12 15:30:10 +01:00 |
|
touffies
|
bc992811d4
|
Add new method redirectToListTemplateById
|
2013-12-11 21:02:12 +01:00 |
|
touffies
|
890f52da54
|
Add hidden field category_id
|
2013-12-11 20:56:04 +01:00 |
|
touffies
|
7eca83889a
|
Merge branch 'master' into frontend
|
2013-12-11 18:54:50 +01:00 |
|
touffies
|
eae8ffe764
|
Merge branch 'frontend' of https://github.com/thelia/thelia into frontend
|
2013-12-11 18:53:42 +01:00 |
|
touffies
|
f1530fa6f9
|
Display error message if exist (INCLUDE notifications.html)
|
2013-12-11 18:53:17 +01:00 |
|
touffies
|
28e70787ab
|
Define close_url
|
2013-12-11 18:47:30 +01:00 |
|
touffies
|
b46a8fd1f2
|
Define close_url variable
|
2013-12-11 18:43:43 +01:00 |
|
touffies
|
01850c7d17
|
- Define close_url
- Use notifications.html
|
2013-12-11 18:33:03 +01:00 |
|
touffies
|
8c20202778
|
Add dismissable
|
2013-12-11 18:13:28 +01:00 |
|
Etienne Roudeix
|
02b9d2e509
|
Merge branch 'cleanmaster' into modules
|
2013-12-10 15:57:37 +01:00 |
|
gmorel
|
60cb9cd52b
|
Fix typo : attributes = déclinaisons
|
2013-12-10 11:00:55 +01:00 |
|
touffies
|
f51d540950
|
Wrong Form Action for SEO
|
2013-12-09 16:45:06 +01:00 |
|
Manuel Raynaud
|
eca8b01fb6
|
revert last conflic
|
2013-12-09 16:18:59 +01:00 |
|
Manuel Raynaud
|
462b2bec5e
|
Merge branch 'master' into frontend
Conflicts:
templates/backOffice/default/folder-edit.html
|
2013-12-09 16:15:58 +01:00 |
|
gmorel
|
80eb4b7bd0
|
Adding translation for Backoffice
|
2013-12-09 15:19:15 +01:00 |
|
gmorel
|
c110e4e812
|
Adding translation for Backoffice
|
2013-12-09 15:19:15 +01:00 |
|
gmorel
|
601aaf311d
|
Adding translation for Backoffice
|
2013-12-09 15:19:15 +01:00 |
|
gmorel
|
b8b6887fea
|
Fix typo
|
2013-12-09 15:19:15 +01:00 |
|
gmorel
|
f31ed34ee3
|
Fix typo
|
2013-12-09 15:19:15 +01:00 |
|
gmorel
|
fcb626e784
|
Fix typo
|
2013-12-09 15:19:15 +01:00 |
|
gmorel
|
7f33c86d75
|
Adding translation for Backoffice
|
2013-12-09 15:19:15 +01:00 |
|
gmorel
|
83356ab867
|
Fix typo
|
2013-12-09 15:19:15 +01:00 |
|
gmorel
|
5f833f256f
|
Adding translation for Backoffice
|
2013-12-09 15:19:15 +01:00 |
|