Rémi Gaillard
edddac8a0c
// add colors on some controllers
2013-10-09 16:47:47 +02:00
Damien Metzger
1870dd4dd2
// Added order state color in order::getHistory()
2013-10-09 15:33:46 +02:00
Rémi Gaillard
6f1cdba40e
// typo
2013-10-09 14:56:41 +02:00
Rémi Gaillard
3b677092bf
[*] FO: You can now choose the anchor separator for attributes
2013-10-09 11:01:18 +02:00
Rémi Gaillard
0db2372724
// add color list to some controllers
2013-10-08 15:39:06 +02:00
Vincent Augagneur
828b838d22
//products comparison link
2013-10-04 16:25:47 +02:00
Damien Metzger
5c5a989cda
// Added javascript validation functions (demo)
2013-10-04 15:24:50 +02:00
Rémi Gaillard
eb40f7db24
// Improve cache colors list
2013-09-30 18:48:59 +02:00
Rémi Gaillard
c2857add42
// add color list on product listing
2013-09-30 17:19:02 +02:00
Jáchym Toušek
30367e6427
[-] FO : Fixed products without images
2013-09-26 22:21:18 +02:00
ha99y
42cdc988ac
Send noindex header to avoid ghost carts by bots
2013-09-19 22:15:00 -07:00
Damien Metzger
e68c124218
[-] FO : replace ucfirst by ucwords for the customer firstname #PSCFV-10396
2013-09-16 11:42:11 +02:00
gRoussac
db4b69d10c
[-] BO : Customer message twice encoded
2013-09-12 18:03:30 +02:00
gr4devel
b72f2a7176
[+] FO : add getManufacturer() to ManufacturerControllerCore
...
Add getManufacturer() to ManufacturerControllerCore to access the protected manufacturer instance of the controller.
2013-08-29 21:48:32 +02:00
Vincent Augagneur
4bb0e16509
[-] FO : fixed bug when is virtual cart on OPC carriers is no longer displayed
2013-08-27 16:43:14 +02:00
Jerome Nadaud
de200e1c5e
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-08-27 09:50:35 +02:00
Rémi Gaillard
6fd7f0114e
// small fix
2013-08-27 09:52:05 +02:00
Rémi Gaillard
1a5b9de372
// small fix
2013-08-27 09:51:56 +02:00
Jerome Nadaud
5a685537a4
// Small Fix
2013-08-27 09:49:59 +02:00
Vincent Augagneur
ad428dfb2b
//MERGE branche release
2013-08-26 10:59:36 +02:00
Jerome Nadaud
94133bf734
[-] FO : FixBug duplicate fields for delivery address in OPC mode
2013-08-22 16:45:52 +02:00
Vincent Augagneur
8a0745e8de
[-] BO : fixed bug #PSCFV-9782 - live edit bug with multistore
2013-08-19 17:21:03 +02:00
Jerome Nadaud
c180a20cf9
[-] BO : FixBug #PSCFV-7571 Error checking available product quantity
2013-08-14 17:16:41 +02:00
Gregory Roussac
1e10dab8f8
Merge pull request #646 from kpodemski/patch-2
...
[*] CORE : Get instance of current category in category controller
2013-08-13 05:54:40 -07:00
Krystian Podemski
8051b0021e
[*] CORE : Get instance of current category in category controller
...
Get instance of category in for eg. module hook using:
$category = $this->context->controller->getCategory()
instead of
new Category(1,1);
2013-08-13 14:52:59 +02:00
gRoussac
5d0f1499ac
// without hedgehogs is better
2013-08-12 16:50:14 +02:00
gRoussac
30d9ebe68f
[-] FO : Fix bug #PSCFV-9624 try 302 redirect from old 1.4 images format to new _default before 404.gif
2013-08-12 16:44:25 +02:00
gRoussac
7ec55106ce
[*] CORE : Get instance of current product in product controller merge https://github.com/PrestaShop/PrestaShop/pull/644 thanks @kpodemski
2013-08-12 16:23:54 +02:00
Jerome Nadaud
06cdeb45a5
[-] FO : FixBug #PSCFV-10058 - Missing required form fields in address format
2013-08-12 15:17:21 +02:00
Jerome Nadaud
1359f46bae
[-] FO : FixBug #PSCFV-10090 urlencode syntax error - Thanks Duarte
2013-08-12 14:37:32 +02:00
gRoussac
e923455f6d
// revert from 589052325b
2013-08-08 18:58:04 +02:00
Jerome Nadaud
390b49122e
[-] FO : FixBug #PSCFV-10026 SSL error on ajax action
2013-08-08 15:58:52 +02:00
Rémi Gaillard
589052325b
// Fix cart with ssl
2013-08-08 15:52:16 +02:00
Jerome Nadaud
239c5adb5a
[-] BO : FixBug smarty email variable override by blockcontact
2013-08-07 15:09:14 +02:00
Gregory Roussac
ba69e48f72
Merge pull request #488 from camlafit/pr-countriesbrowser
...
[*] FO : Better regexp to get country browser from HTTP_ACCEPT_LANGUAGE
2013-08-06 03:07:13 -07:00
gRoussac
6449437f58
// norms
2013-08-06 11:38:34 +02:00
gRoussac
184a1c561c
[-] FO : Fix bug #PSCFV-9847 Cart Rule not updated when address is updated on Checkout Page
2013-08-01 11:44:00 +02:00
jeromenadaud
a93667a58b
[-] FO : FixBug Wrong offset in more than one shipping address
2013-07-30 17:03:15 +02:00
Gregory Roussac
3896453c7c
Merge pull request #352 from sdevilcry/development
...
[-] CORE : Fix issue after a payment redirection error, delivery_option is not sent
2013-07-25 06:11:51 -07:00
Jérôme Nadaud
7b980217b5
// norm
2013-07-25 08:49:40 +02:00
Jérôme Nadaud
541a4525b5
[-] FO : FixBug #PSCFV-9879 Email confirmation message not present
2013-07-24 19:24:22 +02:00
Gregory Roussac
c025b8cb2b
Merge pull request #568 from urecheatu007/development
...
[-] CORE : setMedia() proper order for typewatch and cart-summary.js
2013-07-23 10:15:43 -07:00
gRoussac
3483706951
[-] FO : Prevent unsassigned category id, thans @PrestaCaptainFLAM
2013-07-20 19:07:10 +02:00
Jérôme Nadaud
dd78e97b4a
[-] FO : FixBug #PSCFV-7723 Bad manufacturers list pagination
2013-07-18 17:09:44 +02:00
gRoussac
d55f31d3b5
Merge branch 'tools-fileAttachment' of https://github.com/PrestaEdit/PrestaShop into PrestaEdit-tools-fileAttachment
...
Conflicts:
classes/Tools.php
controllers/front/ContactController.php
2013-07-17 15:35:18 +02:00
gRoussac
ca4a73ddf4
// avoid copy paste mistake with trailing space
2013-07-15 15:34:34 +02:00
gRoussac
f1dcf02caf
//fix warnings #PSCFV-9786
2013-07-15 14:25:58 +02:00
Cosmin Hutanu
324dff0595
ParentOrderController->setMedia() proper order for typewatch and cart-summary
...
In the original class, typewatch is inserted after cart-summary, but it is used for the quantity input in cart-summary.js, so we need to have typewatch first.
2013-07-15 00:56:56 +03:00
Rémi Gaillard
d8a444335f
Merge pull request #524 from ChristopheBoucaut/development
...
Update OrderDetailController.php
2013-07-11 08:26:13 -07:00
Damien Metzger
d772d97bfa
[-] BO : you can now have different mail topic for one mail template #PSCFV-9617
2013-07-11 14:27:40 +02:00
