dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,312 Commits 9 Branches 19 Tags
a5ee2c2f4fa604f3ce115b83e16360e943a9bcde
Commit Graph

17312 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
gRoussac a5ee2c2f4f [-] Classes : fixed cachefs and memcache classes #PSCFV-5225 thanks @prestalab 2013-07-11 18:27:54 +02:00
Gregory Roussac 293d1afbc7 Merge pull request #484 from axome/module_followup_guests 
[-] MO : Followup : Don't send followup vouchers to guest accounts
 2013-07-11 09:13:39 -07:00
Gregory Roussac 27a72f9b2c Merge pull request #482 from axome/module_followup_cron 
[-] MO : Followup : Don't execute crontasks if the module is disabled
 2013-07-11 09:08:51 -07:00
Damien Metzger 184515a27c [-] MO : fixed bad redirection in trackingfront #PSCFV-8378 2013-07-11 18:03:39 +02:00
Rémi Gaillard d8a444335f Merge pull request #524 from ChristopheBoucaut/development 
Update OrderDetailController.php
 2013-07-11 08:26:13 -07:00
Rémi Gaillard d0cf8fce18 // small fix 2013-07-11 17:04:29 +02:00
Rémi Gaillard 20b5449231 [*] Core: that is now easier to get links for another shop 2013-07-11 16:40:40 +02:00
Rémi Gaillard 17ee071bdf Merge pull request #540 from axometeam/patch-7 
[*] BO : Correct the getList() request for quantity and id_product
 2013-07-11 06:40:17 -07:00
Rémi Gaillard 004e833b24 [+] BO: Addition, deletion and edition are now logged 2013-07-11 14:50:23 +02: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
Francois Gaillard d0e4e956c4 [-] Classes : Mail - check instance of link in the context 2013-07-11 14:01:24 +02:00
Damien Metzger 7cc5196fec [-] FO : fixed useless error when the product id in the URL is not an int #PSCFV-9726 2013-07-11 11:38:57 +02:00
Rémi Gaillard c0cdd0a0e1 Merge pull request #547 from PiotrKaczor/patch-1 
[*] MO : pscleaner reset employees notyfications
 2013-07-11 00:46:30 -07:00
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
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
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