dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,638 Commits 9 Branches 19 Tags
2a28e476500cd854d9e80d4bb0ded5da170e0615
Commit Graph

18638 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rémi Gaillard
2578ffb6e1 Merge pull request #552 from codl/development 
[-] WS: do not escape shop name overzealously
 2013-07-11 00:44:52 -07:00
gRoussac
105ae7e59f [*] FO : Retrieve invoice address in OPC + guest checkout, thanks @Piotr Moćko 2013-07-10 18:16:09 +02:00
gRoussac
9f2dad0c6c Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-10 17:44:48 +02:00
gRoussac
8b16bd44aa [*] FO : Fix bug #PSCFV-9440 add another address in guest checkout in OPC 2013-07-10 17:43:36 +02:00
Vincent Augagneur
53ec2aab7e //remove unused configuration 2013-07-10 17:33:02 +02:00
Corentin Delcourt
02faf9d18e [-] WS: do not escape shop name overzealously 2013-07-10 10:21:33 +02:00
gRoussac
e8b8fa0527 [-] CORE: No category in url preview on BO product page 2013-07-09 18:06:02 +02:00
Agence CINS
32a83e20c4 [+] BO: Fix Bug Progress Bar Upload Image Product 
Lorsque l'on ajoute des images a des produits, la barre de progression
s'affiche en dehors de son cadre. "position:relative" n'est pas présent
pour "div.progressBarImage" dans le fichier admin.css .
----
When we add pictures to products, the progress bar is out of his
wrapper.
"position:relative" is missing for "div.progressBarImage" in admin.css
file.
 2013-07-09 17:09:19 +02:00
gRoussac
5e0893979b [-] FO : Fix bug #PSCFV-9021 : bad category id for breadcrumb on product when url rewrite is on 2013-07-09 16:06:21 +02:00
gRoussac
4f5661572e [-] PDF : Fix columns error 2013-07-09 11:58:56 +02:00
Damien Metzger
bad15211a8 [-] BO : added checks on product attributes properties #PSCFV-9703 2013-07-09 11:30:59 +02:00
Rémi Gaillard
7b62144220 [-] Core: ObjectModel::toggleStatus should change only active field on multishop with global context #PSCFV-9707 2013-07-09 11:19:58 +02:00
Damien Metzger
bfa82c9648 [-] FO : you cannot access the front office with a disabled language anymore #PSCFV-9714 2013-07-09 10:59:25 +02:00
Damien Metzger
00425a4c1a [-] FO : fixed bad condition in the dispatcher rules 2013-07-09 10:52:50 +02:00
Damien Metzger
c0c6c10bba [-] IN : fixed local install without connection #PSCFV-9286 #PSCFV-9709 2013-07-09 10:21:22 +02:00
Rémi Gaillard
18b247be94 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-08 16:07:43 +02:00
Rémi Gaillard
f413d9e6e6 [-] Core: Fix #PSCFV-9652 too much payments for multishipping orders 2013-07-08 16:07:20 +02:00
Damien Metzger
1bdc07be20 [*] FO : removed code specific to multishipping from the no-multishipping process 2013-07-08 11:21:50 +02:00
Rémi Gaillard
4b88e8cc06 // John Doe is really a big scammer ! #PSCFV-9434 2013-07-08 11:17:12 +02:00
Gregory Roussac
1a6518689c Merge pull request #415 from ccauw/patch-11 
[-] BO : Fix bug #PSCFV-8987 in BO translations when Windows OS
 2013-07-08 01:34:48 -07:00
PrestaEdit
3166573aa9 [-] Class: PaymentModule / Be sure to have the right "TaxCalculationMethod" 2013-07-06 13:50:38 +02:00
gRoussac
19c9ae0a5c [-] FO : Fix bug #PSCFV-9653 could not return a custom product 2013-07-05 18:15:27 +02:00
gRoussac
cf849077ed // small css fix on history 2013-07-05 17:43:10 +02:00
Fabio Chelly
391c7301da Merge remote-tracking branch 'origin/development' into development 2013-07-05 17:18:50 +02:00
Fabio Chelly
a70d3145cd [-] MO Blockwishlist : images are displayed in wishlist page loaded through a permalink. Add to cart is restored and quantity is correctly calculated for each product with or without combinations 
#PNM-573
#PNM-663
#PNM-1268
#PNM-1302
#PNM-1303
#PNM-1313
#PNM-1512
#PNM-1541
 2013-07-05 17:18:28 +02:00
gRoussac
9f0867b700 [-] FO : could not see old_price_display when specific price on one combination 2013-07-05 14:42:39 +02:00
Damien Metzger
62ff976d69 // Removed redundant function calls 2013-07-05 14:25:22 +02:00
gRoussac
91cd196cf6 // remove console.log sorry bad commit 2013-07-05 12:29:29 +02:00
gRoussac
128ceffcc0 [-] FO : Bad specific price for a combination // sorry 2013-07-05 12:28:10 +02:00
gRoussac
268f1fd030 [-] FO : Bad specific price for a combination 2013-07-05 12:11:02 +02:00
Fabio Chelly
2489778b3c [-] MO Blocknewsletter : deletes e-mail from newsletter table only if newsletter checkbox has been checked on subscription page 
#PNM-1419
 2013-07-05 11:53:04 +02:00
Piotr Kaczor
54b882e936 [*] MO : pscleaner reset employees notyfications 
pscleaner afetr truncating orders, messages and customers reset also employees notyfications
 2013-07-05 08:05:51 +02:00
gRoussac
8a7edf3668 [-] FO : Fix bug #PSCFV-9355 dleete button missing for custo in blockcart 2013-07-04 17:42:35 +02:00
gRoussac
58091a3b0e Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-04 17:25:41 +02:00
gRoussac
df7b5c9861 [-] FO : Fix bug #PSCFV-9669, update total price on order-payment 2013-07-04 17:25:00 +02:00
Rémi Gaillard
12e7e3a44a [-] BO: display vat number field should not depends of the vatnumber module #PSCFV-9672 2013-07-04 17:00:27 +02:00
gRoussac
c335115f68 // remove console.log 2013-07-04 16:48:56 +02:00
gRoussac
c360e841b3 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-04 16:48:14 +02:00
gRoussac
0bddd17889 // remove console.log 2013-07-04 16:43:17 +02:00
gRoussac
fd14268da3 // remove .gitattributes 2013-07-04 15:23:39 +02:00
Damien Metzger
47d343df90 // Fixed module positions in tabs 2013-07-04 09:33:43 +02:00
Damien Metzger
ae03669541 // Added the possibility to sort the modules in the tabs 2013-07-03 17:50:24 +02:00
Damien Metzger
ec981b7f86 [*] WS : improved performances 2013-07-03 17:03:33 +02:00
Damien Metzger
d2440df8ca [*] FO : added smarty cache on productscategory 2013-07-03 15:49:32 +02:00
Damien Metzger
f78f3dc3a8 [*] FO : added smarty cache on crossselling module 2013-07-03 15:30:31 +02:00
gRoussac
36e3956267 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-03 15:06:05 +02:00
Damien Metzger
afda9cdd94 // Small fix 2013-07-03 15:05:22 +02:00
gRoussac
ae0299a6eb [-] FO :Fix bug #PSCFV-9650 could not see delete href in block cart 2013-07-03 15:04:11 +02:00
Sébastien
16e90488c4 [-] MO : Bug fix - PS Cleaner, check if module favoriteproducts is installed. 
Fix Bug when favoriteproducts is not install.
 2013-07-03 14:55:32 +02:00
indesign47
1208e45958 [-] BO : products comments impossible if quantity > 0 
The pull request https://github.com/PrestaShop/PrestaShop/pull/219 makes the module not working properly in v1.5.4.1.
Indeed, after this change, the OosHook works as expected but now, as the product comments module is attached to the OosHook, comments information is only shown when the product is out of stock!
 2013-07-03 14:09:44 +02:00