Commit Graph

1850 Commits

Author SHA1 Message Date
Etienne Roudeix
297f197fed Merge branch 'cleanmaster' into modules 2013-12-12 15:45:45 +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
Etienne Roudeix
ff828bf1ba test rewritten url reassignment 2013-12-11 13:10:03 +01:00
Etienne Roudeix
6acb1924d8 test url reassignment 2013-12-11 13:07:02 +01:00
Etienne Roudeix
02b9d2e509 Merge branch 'cleanmaster' into modules 2013-12-10 15:57:37 +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
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
5c602bc2cb Translation replace tab by 4 spaces 2013-12-09 15:19:15 +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
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
f4a2744d19 url management in backoffice 2013-12-09 11:28:13 +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
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
Etienne Roudeix
14e7181d06 rewritten url update 2013-12-06 16:35:14 +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
Franck Allimant
c2292b75d4 Fixed issue #123. Introduced NumberFormat::formatStandardNumber() 2013-12-05 18:46:35 +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
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
3e4bc0378c Fixxed assets URLs (on Windows, DS is \ !) 2013-12-02 18:07:11 +01:00
Etienne Roudeix
9b165483d9 fix tax engine instance 2013-12-02 13:16:14 +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
81fa5a291c fix tax rules issue 2013-11-28 15:31:09 +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