Commit Graph

1002 Commits

Author SHA1 Message Date
Etienne Roudeix
b3ac365b45 Revert "Merge branch 'cleanmaster' into modules"
This reverts commit d0ff5260f7, reversing
changes made to 67d0101dbe.
2013-12-20 11:16:42 +01:00
Etienne Roudeix
d0ff5260f7 Merge branch 'cleanmaster' into modules
Conflicts:
	core/lib/Thelia/Core/Template/Assets/AssetManagerInterface.php
	core/lib/Thelia/Core/Template/Assets/AsseticAssetManager.php
	core/lib/Thelia/Core/Template/Loop/Template.php
	core/lib/Thelia/Core/Template/Smarty/Assets/SmartyAssetsManager.php
	core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
	core/lib/Thelia/Core/Template/TemplateDefinition.php
	core/lib/Thelia/Core/Template/TemplateHelper.php
	core/lib/Thelia/Core/Thelia.php
2013-12-20 11:16:35 +01:00
Etienne Roudeix
67d0101dbe use TaxEngine::getDeliveryCountry in delivery loop 2013-12-20 11:14:04 +01:00
Etienne Roudeix
4cb8ba704b refacto getTaxCountry which is actually getDeliveryCountry 2013-12-20 11:13:08 +01:00
Etienne Roudeix
63ba1ceeda make it magic last stand 2013-12-20 11:12:03 +01:00
Franck Allimant
2979ca0092 Fixed template loop 2013-12-20 01:40:45 +01:00
Franck Allimant
3a2ad352cc Refactored templates processing 2013-12-20 00:49:08 +01:00
Etienne Roudeix
5773922314 show coupon codes in back office 2013-12-19 14:50:45 +01:00
Etienne Roudeix
d7c1ecf09a coupon management in order and cart process 2013-12-19 14:17:22 +01:00
Etienne Roudeix
c981102d3a Merge branch 'master' of github.com:thelia/thelia into cleanmaster 2013-12-18 17:47:23 +01:00
Etienne Roudeix
1ba60103f3 coupon in orders + model review : backquote use 2013-12-18 17:46:42 +01:00
Manuel Raynaud
2f4158d1f6 fix cs 2013-12-18 10:04:13 +01:00
Manuel Raynaud
0c24a8afc0 Merge branch 'master' into modules
Conflicts:
	templates/backOffice/default/product-edit.html
2013-12-17 10:48:59 +01:00
Manuel Raynaud
db2ad120b2 fix test suite reimplementing url updating trest 2013-12-16 17:29:25 +01:00
Manuel Raynaud
d6ba2b3d65 Merge branch 'master' into frontend 2013-12-16 15:45:04 +01:00
Etienne Roudeix
65f43b5eff Merge branch 'cleanmaster' into modules 2013-12-16 14:33:15 +01:00
Etienne Roudeix
315ed1fb09 fix #144 2013-12-16 14:31:51 +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
Manuel Raynaud
f4c5f23d00 Change AdminLog logging request behavior, fixing issue #145 2013-12-14 14:16:45 +01:00
Etienne Roudeix
297f197fed Merge branch 'cleanmaster' into modules 2013-12-12 15:45:45 +01:00
Etienne Roudeix
93537b8d71 in progress : reorder image 2013-12-12 15:30:10 +01:00
Etienne Roudeix
02b9d2e509 Merge branch 'cleanmaster' into modules 2013-12-10 15:57:37 +01:00
Manuel Raynaud
462b2bec5e Merge branch 'master' into frontend
Conflicts:
	templates/backOffice/default/folder-edit.html
2013-12-09 16:15:58 +01:00
gmorel
5c602bc2cb Translation replace tab by 4 spaces 2013-12-09 15:19:15 +01:00
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
Franck Allimant
8c864021f5 Added sorting and position ùmanagement to modules. 2013-12-06 18:59:46 +01:00
Franck Allimant
e96088080d Merge branch 'master' into modules 2013-12-06 17:16:14 +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
Franck Allimant
3e4bc0378c Fixxed assets URLs (on Windows, DS is \ !) 2013-12-02 18:07:11 +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
Etienne Roudeix
fcde523b73 we are moving forward : no more "make it magic" 2013-11-28 17:12:33 +01:00
Etienne Roudeix
bc9da10d8c change asset origin param name by source 2013-11-28 12:02:53 +01:00
Etienne Roudeix
247ed6aa2a Merge branch 'master' into modules
Conflicts:
	core/lib/Thelia/Core/Template/Assets/AsseticAssetManager.php
	core/lib/Thelia/Core/Template/Smarty/SmartyParser.php
2013-11-28 10:34:57 +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