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
|
aa66067f0e
|
fix bad product assignation in feature_value loop
|
2013-12-14 13:50:55 +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
|
65df33d0b7
|
Merge branch 'master' of github.com:thelia/thelia into cleanmaster
|
2013-12-12 15:45:16 +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 |
|
Manuel Raynaud
|
129ae36182
|
Merge pull request #141 from Boyquotes/master
Translate front in FR
|
2013-12-11 11:44:13 -08: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 |
|
Nicolas Villa
|
2d781931aa
|
Traduction front
|
2013-12-10 10:17:54 +01:00 |
|
gmorel
|
2f37f339ee
|
Adding translation for Backoffice
|
2013-12-09 15:19:15 +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 |
|
gmorel
|
d658351343
|
Fix typo
|
2013-12-09 15:19:15 +01:00 |
|
gmorel
|
ae88efd282
|
Adding translation for Backoffice
|
2013-12-09 15:19:15 +01:00 |
|
gmorel
|
a064489fe4
|
Adding translation for Backoffice
|
2013-12-09 15:19:15 +01:00 |
|
gmorel
|
502a171c0d
|
Adding translation for Backoffice
|
2013-12-09 15:19:15 +01:00 |
|
gmorel
|
d769f51186
|
Fix typo
|
2013-12-09 15:19:14 +01:00 |
|
gmorel
|
8ba353dd6c
|
Adding translation for Backoffice
|
2013-12-09 15:19:14 +01:00 |
|
gmorel
|
0d69d226f3
|
Adding translation for Backoffice
|
2013-12-09 15:19:14 +01:00 |
|
gmorel
|
80d1656762
|
Adding translation for Backoffice
|
2013-12-09 15:19:14 +01:00 |
|
Michaël Espeche
|
990cda786d
|
Add of hook module to content and folder edition page.
|
2013-12-09 10:36:09 +01:00 |
|
Manuel Raynaud
|
10c662d24d
|
Merge pull request #134 from gmorel/french_translation
Adding some French translation for backoffice
|
2013-12-08 01:36:58 -08:00 |
|
Franck Allimant
|
592b306b9e
|
Fixed nt,-group css rule which caused garbage in top bar buttons
|
2013-12-07 09:58:01 +01:00 |
|
Franck Allimant
|
8c864021f5
|
Added sorting and position ùmanagement to modules.
|
2013-12-06 18:59:46 +01:00 |
|
gmorel
|
40c47affec
|
Adding translation for Backoffice
|
2013-12-06 17:22:07 +01:00 |
|
gmorel
|
3f8e1dc89b
|
Adding translation for Backoffice
|
2013-12-06 17:22:07 +01:00 |
|
Franck Allimant
|
e96088080d
|
Merge branch 'master' into modules
|
2013-12-06 17:16:14 +01:00 |
|
Manuel Raynaud
|
71d9524291
|
fix wrong integration in product template
|
2013-12-06 16:00:15 +01:00 |
|
Franck Allimant
|
52c7c6c9f7
|
Added translation of email templates
|
2013-12-06 10:44:06 +01:00 |
|
gmorel
|
e53588e8f0
|
Adding translation for Backoffice
|
2013-12-05 18:24:47 +01:00 |
|
gmorel
|
e7d22f9c0a
|
Adding translation for Backoffice
|
2013-12-05 18:20:10 +01:00 |
|
Franck Allimant
|
82119a171f
|
Merge branch 'master' of https://github.com/thelia/thelia
|
2013-12-05 13:03:01 +01:00 |
|