Franck Allimant
e96088080d
Merge branch 'master' into modules
2013-12-06 17:16:14 +01:00
Etienne Roudeix
14e7181d06
rewritten url update
2013-12-06 16:35:14 +01:00
Manuel Raynaud
a3570b4e16
Merge branch 'master' of github.com:thelia/thelia
2013-12-06 16:00:37 +01:00
Manuel Raynaud
71d9524291
fix wrong integration in product template
2013-12-06 16:00:15 +01:00
gmorel
2e1a6a3136
Adding translation for Backoffice
2013-12-06 14:34:33 +01:00
Franck Allimant
0fcbb409e3
Factorized URL desactivation in UrlRewritingTrait::markRewritenUrlObsolete()
2013-12-06 12:26:39 +01:00
Etienne Roudeix
c703f25f73
Merge branch 'master' of github.com:thelia/thelia into cleanmaster
2013-12-06 11:51:10 +01:00
Etienne Roudeix
926ff410d1
fix #128
2013-12-06 11:50:29 +01:00
Manuel Raynaud
06c875455f
remove unused constant events
2013-12-06 11:27:32 +01:00
Etienne Roudeix
d06e0a14cf
Merge branch 'master' of github.com:thelia/thelia into cleanmaster
2013-12-06 11:20:53 +01:00
Etienne Roudeix
a9a2a256fa
fix updatePositionDownTest
2013-12-06 11:20:15 +01:00
Franck Allimant
5b0307b5b3
Merge branch 'master' of https://github.com/thelia/thelia
2013-12-06 10:44:39 +01:00
Franck Allimant
52c7c6c9f7
Added translation of email templates
2013-12-06 10:44:06 +01:00
Etienne Roudeix
0c5683ef25
fix close #131
2013-12-06 10:37:08 +01:00
gmorel
8de2259bcb
Adding translation for Backoffice
2013-12-06 10:09:09 +01:00
gmorel
4663a8635c
Merge branch 'master' of https://github.com/thelia/thelia into french_translation
...
# By Franck Allimant
# Via Franck Allimant (2) and Manuel Raynaud (1)
* 'master' of https://github.com/thelia/thelia :
Fixed issue #123 . Introduced NumberFormat::formatStandardNumber()
2013-12-06 09:50:47 +01:00
Franck Allimant
0c107fbebf
Merge branch 'master' of https://github.com/thelia/thelia
2013-12-05 18:50:13 +01:00
Franck Allimant
c2292b75d4
Fixed issue #123 . Introduced NumberFormat::formatStandardNumber()
2013-12-05 18:46:35 +01:00
Manuel Raynaud
84ebd9ee67
Merge pull request #129 from gmorel/french_translation
...
Adding some French translation for backoffice
2013-12-05 09:29:37 -08:00
gmorel
e53588e8f0
Adding translation for Backoffice
2013-12-05 18:24:47 +01:00
gmorel
8ccc6cbc9b
Merge branch 'master' of https://github.com/thelia/thelia into french_translation
...
# By Franck Allimant
# Via Franck Allimant
* 'master' of https://github.com/thelia/thelia :
Removed forgotten echo
2013-12-05 18:20:36 +01:00
gmorel
e7d22f9c0a
Adding translation for Backoffice
2013-12-05 18:20:10 +01:00
Franck Allimant
5dfe8584ae
Removed forgotten echo
2013-12-05 18:08:36 +01:00
gmorel
7bcd04dd38
Merge branch 'master' of https://github.com/thelia/thelia into french_translation
...
# By Franck Allimant (6) and stephaniepinet (1)
# Via Franck Allimant (2) and Manuel Raynaud (1)
* 'master' of https://github.com/thelia/thelia :
Fixed issue 118
Changed direct accesses to verifyStok by calls to checkAvailableStock
Fixed exception when log file could not be renamed
Added checkAvailableStock(), changed getPassedUrlView() to getObsoleteRewrittenUrlView()
Fixed button wrapping when in tight spaces (e.g, tables)
Added config variable titles
Update CHANGELOG.txt
2013-12-05 17:26:19 +01:00
Franck Allimant
5857c07ef0
Fixed issue 118
2013-12-05 15:57:56 +01:00
Franck Allimant
82119a171f
Merge branch 'master' of https://github.com/thelia/thelia
2013-12-05 13:03:01 +01:00
Franck Allimant
de0542b33c
Changed direct accesses to verifyStok by calls to checkAvailableStock
2013-12-05 13:02:13 +01:00
Franck Allimant
8e56fcc651
Fixed exception when log file could not be renamed
2013-12-05 13:01:43 +01:00
Franck Allimant
0a7b8f05d0
Added checkAvailableStock(), changed getPassedUrlView() to
...
getObsoleteRewrittenUrlView()
2013-12-05 13:01:09 +01:00
Franck Allimant
97a8d6d3bf
Fixed button wrapping when in tight spaces (e.g, tables)
2013-12-05 12:57:47 +01:00
Franck Allimant
e262bbc9ea
Added config variable titles
2013-12-05 12:57:28 +01:00
Franck Allimant
1416265053
Fixed improper translations
2013-12-05 11:05:08 +01:00
Manuel Raynaud
0cf7b42696
Merge pull request #127 from stephaniepinet/patch-1
...
Update CHANGELOG.txt
2013-12-05 02:03:57 -08:00
stephaniepinet
cf980aeb89
Update CHANGELOG.txt
2013-12-05 11:01:50 +01:00
gmorel
2a667b4261
Merge branch 'master' of https://github.com/thelia/thelia into french_translation
...
# By Manuel Raynaud (1) and Nicolas Villa (1)
# Via Manuel Raynaud
* 'master' of https://github.com/thelia/thelia :
add module_include block in product-edit page
Fixed some translations
2013-12-05 10:46:53 +01:00
Manuel Raynaud
4ca72eb879
Merge pull request #126 from gmorel/french_translation
...
Adding some French translation for backoffice
2013-12-05 00:11:12 -08:00
gmorel
db0b9e3d99
Adding translation for Backoffice
2013-12-04 17:02:25 +01:00
gmorel
70b3f26c8c
Merge remote-tracking branch 'origin/french_translation' into french_translation
2013-12-04 14:43:01 +01:00
gmorel
f462733599
Merge
2013-12-04 14:42:16 +01:00
gmorel
4b034b2a61
Translation : more fre_FR added
2013-12-04 14:42:15 +01:00
gmorel
0f081aee23
Translation : some fre_FR added
2013-12-04 14:42:15 +01:00
gmorel
15d3e99ce7
Translation : some fre_FR added
2013-12-04 14:42:15 +01:00
gmorel
67ff253999
Translation : some fre_FR added
2013-12-04 14:42:15 +01:00
gmorel
31228e36c4
Translation : some fre_FR added
2013-12-04 14:42:15 +01:00
gmorel
c7fa9fd61c
Spelling rewritten with 2 t
2013-12-04 14:42:15 +01:00
gmorel
985c05a4a8
Merge master
2013-12-04 14:42:15 +01:00
gmorel
6f7f53dce4
Translation : Fix bug preventing to see error message
2013-12-04 14:42:15 +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
Franck Allimant
ceb1357dd7
Renamed backoffice to backOffice
2013-12-02 19:05:02 +01:00
