Commit Graph

967 Commits

Author SHA1 Message Date
touffies
d476672150 Add SEO Meta to CATEGORY/PRODUCT/FOLDER/CONTENT 2013-12-09 15:00:51 +01:00
touffies
083f3bfa8c Move URL to SeoForm (SEO tab) 2013-12-09 14:52:44 +01:00
touffies
6447385605 Add Action + Event to manage SEO information 2013-12-09 14:51:51 +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
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
Manuel Raynaud
9885c67ade add some phpdoc in TheliaEvents class 2013-12-09 09:45:06 +01:00
Manuel Raynaud
06c875455f remove unused constant events 2013-12-06 11:27:32 +01:00
Franck Allimant
52c7c6c9f7 Added translation of email templates 2013-12-06 10:44:06 +01:00
Franck Allimant
5dfe8584ae Removed forgotten echo 2013-12-05 18:08:36 +01:00
Franck Allimant
5857c07ef0 Fixed issue 118 2013-12-05 15:57:56 +01:00
gmorel
d18b9a237f Merge branch 'master' of git://github.com/thelia/thelia into french_translation
* 'master' of git://github.com/thelia/thelia: (23 commits)
  Coupon : Add unit test for coupon removing X Amount & X Percent
  Coupon : Add unit test for coupon removing X Amount & X Percent
  Coupon : Add unit test for coupon removing X Amount & X Percent
  Coupon : Add unit test for coupon removing X Amount & X Percent
  Coupon : Add unit test for coupon removing X Amount & X Percent
  Coupon : Fix namespace issues
  Coupon : Fix namespace issues
  Coupon : Adding unit tests
  Coupon : Adding unit tests
  Coupon : Adding unit tests
  Coupon : Adding unit tests
  Coupon : buildCouponFromModel becomes public
  Coupon : Add ability to know usage left after decremental
  Coupon : Bug fix when coupon max usage was not correctly decremented
  Coupon : spelling
  Coupon : rename
  Coupon : Fix the error if a given coupon leads to an unknown service id
  Coupon not found by the factory now just return false
  Fix generated unit test stub files
  Refactor removing Manager notion
  ...
2013-11-28 21:29:22 +01:00
gmorel
ffc699fa7f Merge branch 'master' of git://github.com/thelia/thelia
* 'master' of git://github.com/thelia/thelia:
  fix typo
  Implemented mail messages templates and layouts
  Email template + test email
  add REF to product_sale_element loop and fix product tempalte
  Correct link "Go to admin page" alike thelia is installed in the root of virtual host or in a subdirectory
  Add correct url(subdiretory included) in config page
  Use getUriForPath() instead getSchemeAndHttpHost() for proper redirection for cases where Thelia is installed in a subdirectory
2013-11-28 20:58:24 +01:00
gmorel
94e2d7881d Merge branch 'master' of git://github.com/thelia/thelia into french_translation
* 'master' of git://github.com/thelia/thelia:
  fix typo
  Implemented mail messages templates and layouts
  Email template + test email
2013-11-27 22:22:26 +01:00
Franck Allimant
33e0a854f2 Implemented mail messages templates and layouts 2013-11-27 21:21:07 +01:00
gmorel
e7038c9369 Spelling rewritten with 2 t 2013-11-27 20:37:40 +01:00
gmorel
612bd1adae Translation : Fix bug preventing to see error message 2013-11-27 20:11:54 +01:00
gmorel
59932078fc Merge branch 'master' of git://github.com/thelia/thelia into french_translation
* 'master' of git://github.com/thelia/thelia:
  add REF to product_sale_element loop and fix product tempalte
  Correct link "Go to admin page" alike thelia is installed in the root of virtual host or in a subdirectory
  Add correct url(subdiretory included) in config page
  Use getUriForPath() instead getSchemeAndHttpHost() for proper redirection for cases where Thelia is installed in a subdirectory
  Check if store_country has a value
  Fixed double '/' in generated assets URLs
  Add validation for Store configuration
  Use Store contact information
  Call the wrong AdminResources in saveAction
  Action buttons smaller
  Replace company_name and contact_email by store_name & store_email
  Add a new admin page to manage the basic store configurations
  Add routing for Store Configuration
  Add argument Title on Content Loop & Folder Loop
2013-11-27 19:16:17 +01:00
Manuel Raynaud
b3d3d61602 add REF to product_sale_element loop and fix product tempalte 2013-11-27 10:07:58 +01:00
gmorel
67a38bca20 Merge branch 'master' of git://github.com/thelia/thelia
* 'master' of git://github.com/thelia/thelia:
  Check if store_country has a value
  Fixed double '/' in generated assets URLs
  Add validation for Store configuration
  Use Store contact information
  Call the wrong AdminResources in saveAction
  Action buttons smaller
  Replace company_name and contact_email by store_name & store_email
  Add a new admin page to manage the basic store configurations
  Add routing for Store Configuration
  Add argument Title on Content Loop & Folder Loop
2013-11-25 22:43:04 +01:00
Manuel Raynaud
31ec431673 Merge pull request #111 from thelia/frontend
Frontend
2013-11-25 03:04:31 -08:00
Franck Allimant
c587cc3813 Fixed double '/' in generated assets URLs 2013-11-25 11:37:52 +01:00
touffies
fd0301022d Merge branch 'backoffice' into frontend 2013-11-25 10:24:29 +01:00
touffies
743f894a4c Merge branch 'frontend' of https://github.com/thelia/thelia into frontend 2013-11-25 10:20:15 +01:00
gmorel
19aa1c798d Coupon : Fix namespace issues 2013-11-24 22:27:26 +01:00
gmorel
ffbd53fceb Coupon : Fix namespace issues 2013-11-24 22:05:58 +01:00
gmorel
90b5fbde05 Refactor removing Manager notion 2013-11-23 20:18:04 +01:00
gmorel
95c4113ca8 Merge branch 'master' of git://github.com/thelia/thelia
* 'master' of git://github.com/thelia/thelia:
  undo removing Response::prepare call
  HttpCache can not be activated as default
  remove specific code testing esi integration
  create smarty tag for smarty renderer
  remove Thelia ResponseListener
  add new route for testing esi tag
  tweak httpFoundation cache part for compatibility with Thelia\HttpFoundation part
  add httpcache into index_dev.php file
  start using symfony 2 reverse proxy
  update wiki url in composer file
  create smarty tag for smarty renderer
  remove Thelia ResponseListener
  add new route for testing esi tag
  Added some translations in the Customer Creation Form
  tweak httpFoundation cache part for compatibility with Thelia\HttpFoundation part
  add httpcache into index_dev.php file
  start using symfony 2 reverse proxy
2013-11-23 01:36:12 +01:00
touffies
29ae2d26fe Add a new admin page to manage the basic store configurations 2013-11-22 17:38:21 +01:00
Manuel Raynaud
a85baf6994 remove specific code testing esi integration 2013-11-22 09:43:24 +01:00
Manuel Raynaud
4109de0d9c create smarty tag for smarty renderer 2013-11-20 14:45:40 +01:00
Manuel Raynaud
b9f7837686 remove Thelia ResponseListener 2013-11-20 14:45:40 +01:00
Manuel Raynaud
a436adf438 add new route for testing esi tag 2013-11-20 14:45:40 +01:00
Manuel Raynaud
64c5991838 tweak httpFoundation cache part for compatibility with
Thelia\HttpFoundation part
2013-11-20 14:45:40 +01:00
Manuel Raynaud
16af55ae77 start using symfony 2 reverse proxy 2013-11-20 14:43:14 +01:00
badsuricate
21c29f453f Merge branch 'frontend' of github.com:thelia/thelia into frontend 2013-11-19 14:48:17 +01:00
badsuricate
bba78020fc Add argument Title on Content Loop & Folder Loop 2013-11-19 14:44:00 +01:00
gmorel
968bddbcf9 Fix Coupon/Condition refactor 2013-11-19 13:15:23 +01:00
Etienne Roudeix
8b8bae5bd7 fix module template inclusion 2013-11-15 16:51:13 +01:00
Etienne Roudeix
a4935a556c fix modules bug 2013-11-15 16:35:29 +01:00
Etienne Roudeix
87b25b922e configure button in module page 2013-11-15 12:19:06 +01:00
Etienne Roudeix
8cd32aa5dd Merge branch 'modules' 2013-11-14 12:04:20 +01:00
Etienne Roudeix
ff57fe3a5c colissimo module 2013-11-14 12:03:28 +01:00
Etienne Roudeix
48409c29a9 Colissimo in progress 2013-11-14 11:21:34 +01:00
Franck Allimant
d42e77d475 Merge branch 'master' of https://github.com/thelia/thelia 2013-11-13 16:31:03 +01:00
Franck Allimant
29ab422438 Fixed typos 2013-11-13 16:30:43 +01:00
Manuel Raynaud
c5d6157cd5 change translation template baseDir 2013-11-13 16:27:36 +01:00
Etienne Roudeix
77760e7d3f module template inclusion 2013-11-13 14:48:35 +01:00
Etienne Roudeix
25192cf366 change template subdirs 2013-11-13 10:24:14 +01:00
Manuel Raynaud
cbe5ba27cf change developmentMode by debugMode in assetManager 2013-11-12 12:41:01 +01:00