Commit Graph

2607 Commits

Author SHA1 Message Date
touffies
ba48bc985e Add SEO tab for a product 2013-12-09 14:46:07 +01:00
touffies
945921048e Add new SEO form 2013-12-09 14:46:07 +01:00
touffies
0d5cfd29e0 Add new fields (meta_title, meta_description and meta_keyword) under I18N Product 2013-12-09 14:46:06 +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
Michaël Espeche
990cda786d Add of hook module to content and folder edition page. 2013-12-09 10:36:09 +01:00
Etienne Roudeix
cc4fce9add Merge branch 'master' of github.com:thelia/thelia into cleanmaster 2013-12-09 10:29:49 +01:00
Manuel Raynaud
9885c67ade add some phpdoc in TheliaEvents class 2013-12-09 09:45:06 +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
gmorel
c773e2fd4e Merge remote-tracking branch 'origin/french_translation' into french_translation 2013-12-06 17:22:33 +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
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