 rMalie
|
39e2b09219
|
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7620 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-13 13:26:40 +00:00 |
|
|
rMalie
|
82754451ad
|
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7618 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-13 12:52:44 +00:00 |
|
|
rMalie
|
67c80b2b42
|
// Refactoring of shop class with new context Part 2
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7617 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-13 12:52:09 +00:00 |
|
|
tDidierjean
|
c5cc771f16
|
// Context part 4
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7607 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-13 07:51:09 +00:00 |
|
|
rMalie
|
a6c08c7340
|
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7605 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-12 16:28:33 +00:00 |
|
|
rMalie
|
10dd3db8d4
|
// Refactoring of shop class with new context
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7604 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-12 16:28:20 +00:00 |
|
|
tDidierjean
|
9f7c369d53
|
// Context part 3
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7603 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-12 16:25:27 +00:00 |
|
|
rMalie
|
50f9794383
|
// Context
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7600 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-12 13:50:15 +00:00 |
|
|
tDidierjean
|
25b1bceffd
|
// Context part 2
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7598 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-12 12:50:00 +00:00 |
|
|
rMalie
|
39d0acc30b
|
// Hook modules exceptions now works with new dispatcher
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7587 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-11 15:16:16 +00:00 |
|
|
tDidierjean
|
143022e488
|
// Context - first commit
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7586 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-11 14:32:05 +00:00 |
|
|
rMalie
|
2ee764963b
|
// Fix shop association on new object + some strict standard for Franck
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7584 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-11 13:18:17 +00:00 |
|
|
rMalie
|
4f3aad65e3
|
// Multishop for referrers
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7583 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-07-11 13:03:26 +00:00 |
|
|
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 |
|