Commit Graph

2644 Commits

Author SHA1 Message Date
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
162f364df6 reveiw test 2013-12-12 15:55:52 +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
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
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
Etienne Roudeix
28d2add37d fix tests 2013-12-09 15:02:09 +01:00
Etienne Roudeix
79e4193791 Merge branch 'master' of github.com:thelia/thelia into cleanmaster 2013-12-09 13:02:04 +01:00
Etienne Roudeix
090b201fea test rewriting 2013-12-09 13:01:39 +01:00
Manuel Raynaud
80a17e6438 Merge pull request #135 from gmorel/french_translation
Translation : Ordering existing translations by keys
2013-12-09 03:22:07 -08:00
Manuel Raynaud
c88d9ccf6f Merge pull request #137 from thelia/adminInclude
display admin hook if in debug mode and specific parameter in url
2013-12-09 03:19:57 -08:00
Franck Allimant
bf64cd117e Translation : Ordering existing translations by keys. This should ease the merge process when conflicts occur
Fixed issue #123. Introduced NumberFormat::formatStandardNumber()

Adding translation for Backoffice

Adding translation for Backoffice

fix close #131

fix updatePositionDownTest

Translation : Ordering existing translations by keys. This should ease the merge process when conflicts occur

Translation : Ordering existing translations by keys, This should ease the merge process when conflicts occur

Translation : Ordering existing translations by keys, This should ease the merge process when conflicts occur
2013-12-09 12:14:15 +01:00
Manuel Raynaud
8944446776 display admin hook if in debug mode and specific parameter in url 2013-12-09 12:12:20 +01:00
Etienne Roudeix
1e8fee99cb Merge branch 'master' of github.com:thelia/thelia into cleanmaster 2013-12-09 11:28:47 +01:00
Etienne Roudeix
f4a2744d19 url management in backoffice 2013-12-09 11:28:13 +01:00
Manuel Raynaud
adc7773f96 Merge pull request #136 from mespeche/master
Adding hook module to content and folder edition page.
2013-12-09 01:44:57 -08:00
Manuel Raynaud
706becf574 complete readme file 2013-12-09 10:42:54 +01:00