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 |
|
Manuel Raynaud
|
43b89ab39f
|
Merge pull request #148 from DirtyF/patch-1
add phpbrew as a solution to handle PHP on Mac OSX
|
2013-12-14 12:50:13 -08:00 |
|
DirtyF
|
8e663964c1
|
add phpbrew as a solution to handle PHP on Mac OSX
|
2013-12-14 20:24:22 +01:00 |
|
Manuel Raynaud
|
4b67462416
|
Merge pull request #147 from cordoval/update-translation
update profil translation
|
2013-12-14 08:23:37 -08: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
|
463cb12c08
|
Merge pull request #146 from thelia/adminLog
Change AdminLog logging request behavior, fixing issue #145
|
2013-12-14 05:20:46 -08:00 |
|
Manuel Raynaud
|
f4c5f23d00
|
Change AdminLog logging request behavior, fixing issue #145
|
2013-12-14 14:16:45 +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
|
76cd704f80
|
review tests
|
2013-12-12 15:56:13 +01:00 |
|
Etienne Roudeix
|
162f364df6
|
reveiw test
|
2013-12-12 15:55:52 +01:00 |
|
Etienne Roudeix
|
d1a1e14c0a
|
fix test
|
2013-12-12 15:54:52 +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
|
ff828bf1ba
|
test rewritten url reassignment
|
2013-12-11 13:10:03 +01:00 |
|
Etienne Roudeix
|
6acb1924d8
|
test url reassignment
|
2013-12-11 13:07:02 +01:00 |
|
Etienne Roudeix
|
02b9d2e509
|
Merge branch 'cleanmaster' into modules
|
2013-12-10 15:57:37 +01:00 |
|
Etienne Roudeix
|
63f48b79da
|
fix rewrinting tests
|
2013-12-10 15:56:59 +01:00 |
|
Etienne Roudeix
|
f9d4fe1e5c
|
Merge branch 'master' of github.com:thelia/thelia into cleanmaster
|
2013-12-10 15:55:07 +01:00 |
|
Etienne Roudeix
|
83cac71895
|
fix urls in loops
|
2013-12-10 15:48:22 +01:00 |
|
Manuel Raynaud
|
c31edf6842
|
Merge pull request #142 from gmorel/back_office_french_translation
Fix typo : attributes = déclinaisons
|
2013-12-10 04:58:33 -08: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 |
|
Manuel Raynaud
|
4c9eff379a
|
Merge pull request #138 from gmorel/french_translation
Adding some French translation for backoffice
|
2013-12-09 06:39:21 -08:00 |
|
Etienne Roudeix
|
95d327f976
|
fix tests
|
2013-12-09 15:31:27 +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
|
5c602bc2cb
|
Translation replace tab by 4 spaces
|
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 |
|