Commit Graph

2564 Commits

Author SHA1 Message Date
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
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
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
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
Manuel Raynaud
4e42d0adda Merge pull request #121 from gmorel/french_translation
French translation
2013-11-29 00:17:57 -08:00
Manuel Raynaud
049a267ee2 Merge pull request #122 from Boyquotes/master
Fixed some translations
2013-11-29 00:17:03 -08:00
Nicolas Villa
0902a195cb Fixed some translations 2013-11-29 06:38:13 +01:00
gmorel
a801f9bfb8 Merge 2013-11-28 22:32:39 +01:00
gmorel
4909ecd78e Translation : more fre_FR added 2013-11-28 22:27:48 +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
Manuel Raynaud
6c609e8836 Merge pull request #106 from gmorel/master
Condition Module - adding/refactor unit tests
2013-11-28 12:27:31 -08: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
gmorel
ff18babbf9 Translation : some fre_FR added 2013-11-27 22:20:31 +01:00
gmorel
3140a8d9c8 Translation : some fre_FR added 2013-11-27 22:06:12 +01:00
gmorel
24e91e9ad6 Translation : some fre_FR added 2013-11-27 21:27:50 +01:00
Manuel Raynaud
b3a3cb2e8f Merge pull request #114 from thelia/email
Email
2013-11-27 12:25:21 -08:00
Manuel Raynaud
476e3062e5 fix typo 2013-11-27 21:21:07 +01:00
Franck Allimant
33e0a854f2 Implemented mail messages templates and layouts 2013-11-27 21:21:07 +01:00
touffies
e675be4cff Email template + test email 2013-11-27 21:19:27 +01:00
gmorel
7284c485fe Translation : some fre_FR added 2013-11-27 21:15:33 +01:00
gmorel
e7038c9369 Spelling rewritten with 2 t 2013-11-27 20:37:40 +01:00
gmorel
dc648fef62 Merge master 2013-11-27 20:24:38 +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
1cd07603d3 Merge pull request #113 from Boyquotes/master
Correct link during the installation process and config url website
2013-11-27 01:10:10 -08:00
Manuel Raynaud
b3d3d61602 add REF to product_sale_element loop and fix product tempalte 2013-11-27 10:07:58 +01:00
Nicolas Villa
74b391efee Correct link "Go to admin page" alike thelia is installed in the root of virtual host or in a subdirectory 2013-11-26 18:09:48 +01:00
Nicolas Villa
657cd95f3b Add correct url(subdiretory included) in config page 2013-11-26 18:09:23 +01:00