Commit Graph

73 Commits

Author SHA1 Message Date
tDidierjean 8bf1b23239 // revert previous commit
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7573 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-08 16:12:27 +00:00
tDidierjean f085f81d23 // cancel commit
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7572 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-08 15:43:24 +00:00
rMalie c0d49e1455 // Fix bug on static property call on dynamic class (don't work on php < 5.3)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7569 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-08 15:20:16 +00:00
rMalie 3c50152c94 // Some fix + multistore for import tools
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7546 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-07 12:18:27 +00:00
rMalie c0e8f46e8e // Fix stats queries
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7537 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-06 16:17:27 +00:00
aFolletete 442a0d6100 // CHANGELOG
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7536 b9a71923-0436-4b27-9f14-aed3839534dd
1.5.0.0
2011-07-06 15:18:49 +00:00
rMalie 3d9b61023c // Generate .htaccess in adminShopUrl
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7534 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-06 14:35:19 +00:00
rMalie 8ed089decf git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7532 b9a71923-0436-4b27-9f14-aed3839534dd 2011-07-06 13:54:12 +00:00
rGaillard d218264667 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7531 b9a71923-0436-4b27-9f14-aed3839534dd 2011-07-06 13:52:30 +00:00
rMalie 874478118f // blocklayered fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7529 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-06 13:27:41 +00:00
rGaillard 3dde6382a5 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7528 b9a71923-0436-4b27-9f14-aed3839534dd 2011-07-06 13:26:34 +00:00
rGaillard cca6578076 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7527 b9a71923-0436-4b27-9f14-aed3839534dd 2011-07-06 13:07:38 +00:00
rGaillard 6a9a0f89a3 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7526 b9a71923-0436-4b27-9f14-aed3839534dd 2011-07-06 12:54:42 +00:00
rGaillard 0433d8b7f4 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7525 b9a71923-0436-4b27-9f14-aed3839534dd 2011-07-06 12:45:27 +00:00
rGaillard 8a59d0dc41 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7524 b9a71923-0436-4b27-9f14-aed3839534dd 2011-07-06 10:54:11 +00:00
rGaillard ba9cdcf295 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7523 b9a71923-0436-4b27-9f14-aed3839534dd 2011-07-06 10:11:35 +00:00
rGaillard 69f2f09dc5 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7522 b9a71923-0436-4b27-9f14-aed3839534dd 2011-07-06 10:10:43 +00:00
mMarinetti 9ff675b1e2 // added keywords properties for tpl and js, needed for alpha
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7074 b9a71923-0436-4b27-9f14-aed3839534dd
2011-06-15 18:28:34 +00:00
fBrignoli 053047e743 // dispatcher :)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7070 b9a71923-0436-4b27-9f14-aed3839534dd
2011-06-15 16:38:56 +00:00
fBrignoli 4a210f98d9 [+] Dispatcher
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7069 b9a71923-0436-4b27-9f14-aed3839534dd
2011-06-15 16:32:06 +00:00
gBrunier fbe279894a [-] MO : Not correct display of "date_add" for the discounts
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6148 b9a71923-0436-4b27-9f14-aed3839534dd
2011-05-03 08:53:37 +00:00
mMarinetti 1499e8bf94 [-] BO : Fixed #PSCFI-1736 - in AdminTranslations.php, only theme directory are parsed (and not files)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6147 b9a71923-0436-4b27-9f14-aed3839534dd
2011-05-02 15:50:39 +00:00
dMetzger eb9d9719be [-] MO : modules exceptions stability improved
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6140 b9a71923-0436-4b27-9f14-aed3839534dd
2011-05-02 12:36:27 +00:00
vAugagneur 1613e871e6 //merge 1.4 => 1.5
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6139 b9a71923-0436-4b27-9f14-aed3839534dd
2011-05-02 12:27:04 +00:00
gBrunier 273dc289ef [-] FO : Fixed bug #PSCFI-1718 - Categories block doesn't show categories when processing empty cart checkout. There was a javascript error.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6133 b9a71923-0436-4b27-9f14-aed3839534dd
2011-05-02 08:56:16 +00:00
dMetzger 92316e3710 [*] MO : theme installer can now manage module exceptions
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6128 b9a71923-0436-4b27-9f14-aed3839534dd
2011-04-29 13:41:10 +00:00
vAugagneur 35ff645731 //merge 1.4 => 1.5
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6124 b9a71923-0436-4b27-9f14-aed3839534dd
2011-04-29 12:34:09 +00:00
dMetzger 39eca4ab76 [-] BO : module XML config files stability improved
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6122 b9a71923-0436-4b27-9f14-aed3839534dd
2011-04-29 10:06:51 +00:00
fBrignoli 56099fa735 // merge 1.4 => 6117
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6118 b9a71923-0436-4b27-9f14-aed3839534dd
2011-04-29 09:09:38 +00:00
aNiassy e60a8b9203 [-] FO : #PSCFI-1674 Display problem about tax identification with guest checkout activated
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6106 b9a71923-0436-4b27-9f14-aed3839534dd
2011-04-28 14:46:25 +00:00
gBrunier bf8359c9cd [-] BO : Fixed bug #PSCFI-1547 - Image paths were hard-coded in the generateHtaccess function
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6100 b9a71923-0436-4b27-9f14-aed3839534dd
2011-04-28 13:04:23 +00:00
gBrunier ee90038754 [*] BO : Fixed #PSCFI-1667
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6099 b9a71923-0436-4b27-9f14-aed3839534dd
2011-04-28 12:37:23 +00:00
fSerny 1bbcd95d9e [-] MO : Changing url in Dibs module
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6096 b9a71923-0436-4b27-9f14-aed3839534dd
2011-04-28 11:48:24 +00:00
tDidierjean be17931df6 // merge 6036 6069 6071 6093
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6094 b9a71923-0436-4b27-9f14-aed3839534dd
2011-04-28 11:32:07 +00:00
gBrunier 991e2c701d [-] BO : Fixed bug #PSCFI-1684 - Tinymce didn't initialize in IE8 because of an extra comma at the end of the function
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6092 b9a71923-0436-4b27-9f14-aed3839534dd
2011-04-28 09:08:28 +00:00
aNiassy e185dcbe01 [-] FO : #PSCFI-1660 Fixed a bug which not display an error when a carrier is not selected
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6081 b9a71923-0436-4b27-9f14-aed3839534dd
2011-04-27 15:41:23 +00:00
gBrunier 1044d7be8c [-] MO : Fixed bug #PSCFI-1574 - When only one language was activated iso code was still used.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6077 b9a71923-0436-4b27-9f14-aed3839534dd
2011-04-27 14:20:08 +00:00
aNiassy b32dc579cf [-] FO : #PSCFI-1654 Fixed a bug concerning the order process after a login
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6075 b9a71923-0436-4b27-9f14-aed3839534dd
2011-04-27 13:45:27 +00:00
gBrunier 58a6964eb2 [-] MO : Fixed bug #PSCFI-1617 - Sitemap module produced duplicate rows.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6072 b9a71923-0436-4b27-9f14-aed3839534dd
2011-04-27 10:28:58 +00:00
gBrunier e772df0473 [-] FO : Fixed bug #PSCFI-1652 - The Best Sales pagination now works properly
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6068 b9a71923-0436-4b27-9f14-aed3839534dd
2011-04-26 10:17:35 +00:00
gBrunier f8501558fc [-] FO : Fixed bug #PSCFI-1582 - Not correct search. Now we list all products which contains the search word.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6066 b9a71923-0436-4b27-9f14-aed3839534dd
2011-04-26 09:14:15 +00:00
aFolletete 6e34cc3f77 // merge
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6062 b9a71923-0436-4b27-9f14-aed3839534dd
2011-04-25 12:07:31 +00:00
gBrunier 66494a5a83 [-] BO : Fixed #PSCFI-1624 - Extra forward slash
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6058 b9a71923-0436-4b27-9f14-aed3839534dd
2011-04-24 17:53:37 +00:00
gBrunier a79b9537ac [-] BO : Fixed #PSCFI-1624 - Extra forward slash
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6057 b9a71923-0436-4b27-9f14-aed3839534dd
2011-04-24 17:53:29 +00:00
gBrunier 30bc61bc32 [-] BO - Fixed #PSCFI-1538 - CCC for CSS doesn't handle doublequoted urls in stylesheets
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6053 b9a71923-0436-4b27-9f14-aed3839534dd
2011-04-24 17:08:08 +00:00
gBrunier ab4e96b921 [-] FO : Fixed #PSCFI-1611 - Comment mistake
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6052 b9a71923-0436-4b27-9f14-aed3839534dd
2011-04-24 15:50:33 +00:00
gBrunier 46aa075cf6 [-] FO : Fixed bug #PSCFI-1592 - CMS category specifics meta tags was missing
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6050 b9a71923-0436-4b27-9f14-aed3839534dd
2011-04-23 11:21:09 +00:00
fBrignoli 43b6a41bbc // merge 1.4 (5397)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6048 b9a71923-0436-4b27-9f14-aed3839534dd
2011-04-22 16:00:58 +00:00
gBrunier 7b4eda5137 [-] FO : Fixed bug #PSCFI-1593 - Path error with CMS subcategory. The $fullPath variable wasn't declared in the right place.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6047 b9a71923-0436-4b27-9f14-aed3839534dd
2011-04-22 14:19:49 +00:00
aNiassy 16d8501d7c #PSCFI-1568 [-] FO : fixed an ajax bug concerning message in one page checkout
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6043 b9a71923-0436-4b27-9f14-aed3839534dd
2011-04-22 09:56:48 +00:00