Commit Graph

Select branches

Hide Pull Requests

1.5

1.6

bootstrap

carrierwizard

development

export_excel

ignore_stock_without_combination

master

patch-1

1.5.0.0

1.5.0.1

1.5.0.13

1.5.0.15

1.5.0.17

1.5.0.2

1.5.0.3

1.5.0.5

1.5.0.9

1.5.1.0

1.5.2.0

1.5.3.0

1.5.3.1

1.5.4.0

1.5.4.1

1.5.5.0

1.5.6.0

1.5.6.1

1.6.0.1

Mono Color

• 160857bdc3 // update css module tab sLorenzini 2013-07-12 14:30:44 +02:00
• 24d124f190 [*] MODULE : Multi-shop compatibility in newsletter module tanks @axometeam gRoussac 2013-07-12 14:17:49 +02:00
• 876c49b690 PNM-1241 Issue with backbutton Daniel 2013-07-12 18:24:18 +08:00
• b880bc3a18 [*] PDF : Free shipping in invoice PDF display X2 thanks @axometeam gRoussac 2013-07-12 12:09:34 +02:00
• 6f9e415ca7 // missing image gRoussac 2013-07-12 12:03:32 +02:00
• e4173fbc98 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development djfm 2013-07-12 09:50:04 +00:00
• 1c960da57a [*] BO : Not increment stock if statut change fom Error to Canceled Axome 2013-07-12 11:22:42 +02:00
• 0928efb112 // small fix Rémi Gaillard 2013-07-12 11:17:30 +02:00
• c3b7e1dad9 Merge pull request #519 from axometeam/patch-5 Gregory Roussac 2013-07-12 02:08:45 -07:00
• 44debd682f Merge pull request #517 from axometeam/patch-4 Gregory Roussac 2013-07-12 02:07:51 -07:00
• 4b492046c0 // add another logs information Rémi Gaillard 2013-07-12 10:55:37 +02:00
• 8fcca7999d Merge pull request #502 from axometeam/patch-2 Gregory Roussac 2013-07-12 01:29:39 -07:00
• 994d43d3e4 // Oops Damien Metzger 2013-07-12 09:40:14 +02:00
• f1049c021a get correct prefix for invoices BigZ 2013-07-12 03:43:03 +02:00
• 25b5d2857b develivery slip should use prefix BigZ 2013-07-12 03:03:21 +02:00
• e28a1e793a Invoice prefix wasn't used in filename BigZ 2013-07-12 03:01:33 +02:00
• bd432641a0 update documents listing to display proper prefix BigZ 2013-07-12 02:32:52 +02:00
• db42e9c642 // Vincent Augagneur 2013-07-11 19:23:33 +02:00
• 84c0ccbae6 // products TPL Kevin Granger 2013-07-11 18:58:44 +02:00
• 5d8d7c0383 [-] MO : Followup : don't send emails for empty carts thanks @axometeam gRoussac 2013-07-11 18:57:37 +02:00
• 68d135b4cf Payment currency restriction incorret type of input for radio Piotr Moćko 2013-07-11 18:56:50 +02:00
• 291cec36ab Do not limit features value on a list Piotr Moćko 2013-07-11 18:49:44 +02:00
• 9af2d3946f // Fixed potential error when deleting a module Damien Metzger 2013-07-11 18:45:48 +02:00
• a5ee2c2f4f [-] Classes : fixed cachefs and memcache classes #PSCFV-5225 thanks @prestalab gRoussac 2013-07-11 18:27:54 +02:00
• 293d1afbc7 Merge pull request #484 from axome/module_followup_guests Gregory Roussac 2013-07-11 09:13:39 -07:00
• 27a72f9b2c Merge pull request #482 from axome/module_followup_cron Gregory Roussac 2013-07-11 09:08:51 -07:00
• 184515a27c [-] MO : fixed bad redirection in trackingfront #PSCFV-8378 Damien Metzger 2013-07-11 18:03:24 +02:00
• 40967e6525 // update modules list tab sLorenzini 2013-07-11 17:27:11 +02:00
• d8a444335f Merge pull request #524 from ChristopheBoucaut/development Rémi Gaillard 2013-07-11 08:26:13 -07:00
• d0cf8fce18 // small fix Rémi Gaillard 2013-07-11 17:04:29 +02:00
• 20b5449231 [*] Core: that is now easier to get links for another shop Rémi Gaillard 2013-07-11 16:40:40 +02:00
• 17ee071bdf Merge pull request #540 from axometeam/patch-7 Rémi Gaillard 2013-07-11 06:40:17 -07:00
• 004e833b24 [+] BO: Addition, deletion and edition are now logged Rémi Gaillard 2013-07-11 14:50:23 +02:00
• d772d97bfa [-] BO : you can now have different mail topic for one mail template #PSCFV-9617 Damien Metzger 2013-07-11 14:27:22 +02:00
• d0e4e956c4 [-] Classes : Mail - check instance of link in the context Francois Gaillard 2013-07-11 14:01:24 +02:00
• 7cc5196fec [-] FO : fixed useless error when the product id in the URL is not an int #PSCFV-9726 Damien Metzger 2013-07-11 11:38:32 +02:00
• c0cdd0a0e1 Merge pull request #547 from PiotrKaczor/patch-1 Rémi Gaillard 2013-07-11 00:46:30 -07:00
• 2578ffb6e1 Merge pull request #552 from codl/development Rémi Gaillard 2013-07-11 00:44:52 -07:00
• f042d704d2 // field translatable + tpl products + fixs Kevin Granger 2013-07-10 19:39:35 +02:00
• f847c821ed // update tab modules bootsrap sLorenzini 2013-07-10 18:19:03 +02:00
• 105ae7e59f [*] FO : Retrieve invoice address in OPC + guest checkout, thanks @Piotr Moćko gRoussac 2013-07-10 18:16:09 +02:00
• 9f2dad0c6c Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-07-10 17:44:48 +02:00
• 8b16bd44aa [*] FO : Fix bug #PSCFV-9440 add another address in guest checkout in OPC gRoussac 2013-07-10 17:43:36 +02:00
• 53ec2aab7e //remove unused configuration Vincent Augagneur 2013-07-10 17:33:02 +02:00
• 8b33ac5aca // quantities product modified + line bootsrap added in order, categories and attributes group controllers sLorenzini 2013-07-10 12:21:22 +02:00
• 02faf9d18e [-] WS: do not escape shop name overzealously Corentin Delcourt 2013-07-10 10:16:04 +02:00
• ec466b8c70 // Porting more product tpl Kevin Granger 2013-07-09 19:10:56 +02:00
• e8b8fa0527 [-] CORE: No category in url preview on BO product page gRoussac 2013-07-09 18:06:02 +02:00
• 32a83e20c4 [+] BO: Fix Bug Progress Bar Upload Image Product Agence CINS 2013-07-09 17:09:19 +02:00
• 52c117e02c // update sLorenzini 2013-07-09 16:57:20 +02:00
• ad0743ebc8 // update css carrier wizard sLorenzini 2013-07-09 16:48:51 +02:00
• 5e0893979b [-] FO : Fix bug #PSCFV-9021 : bad category id for breadcrumb on product when url rewrite is on gRoussac 2013-07-09 16:06:21 +02:00
• 278ffa1720 //carrier wizard steps validation error Vincent Augagneur 2013-07-09 16:03:05 +02:00
• d0a35b242f // update css error carrier wizard sLorenzini 2013-07-09 14:36:21 +02:00
• dbfa7d63ef //carrier wizard field validation Vincent Augagneur 2013-07-09 14:26:34 +02:00
• 4f5661572e [-] PDF : Fix columns error gRoussac 2013-07-09 11:58:56 +02:00
• bad15211a8 [-] BO : added checks on product attributes properties #PSCFV-9703 Damien Metzger 2013-07-09 11:30:44 +02:00
• 7b62144220 [-] Core: ObjectModel::toggleStatus should change only active field on multishop with global context #PSCFV-9707 Rémi Gaillard 2013-07-09 11:19:58 +02:00
• bfa82c9648 [-] FO : you cannot access the front office with a disabled language anymore #PSCFV-9714 Damien Metzger 2013-07-09 10:59:25 +02:00
• 00425a4c1a [-] FO : fixed bad condition in the dispatcher rules Damien Metzger 2013-07-09 10:52:50 +02:00
• c0c6c10bba [-] IN : fixed local install without connection #PSCFV-9286 #PSCFV-9709 Damien Metzger 2013-07-09 10:21:06 +02:00
• 18b247be94 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Rémi Gaillard 2013-07-08 16:07:43 +02:00
• f413d9e6e6 [-] Core: Fix #PSCFV-9652 too much payments for multishipping orders Rémi Gaillard 2013-07-08 16:07:20 +02:00
• 1bdc07be20 [*] FO : removed code specific to multishipping from the no-multishipping process Damien Metzger 2013-07-08 11:21:35 +02:00
• 4b88e8cc06 // John Doe is really a big scammer ! #PSCFV-9434 Rémi Gaillard 2013-07-08 11:17:12 +02:00
• 1a6518689c Merge pull request #415 from ccauw/patch-11 Gregory Roussac 2013-07-08 01:34:48 -07:00
• 3166573aa9 [-] Class: PaymentModule / Be sure to have the right "TaxCalculationMethod" PrestaEdit 2013-07-06 13:50:38 +02:00
• 1f33638f32 [+] BO Wip BS -> Products + fix Kevin Granger 2013-07-05 18:36:42 +02:00
• 19c9ae0a5c [-] FO : Fix bug #PSCFV-9653 could not return a custom product gRoussac 2013-07-05 18:15:27 +02:00
• cf849077ed // small css fix on history gRoussac 2013-07-05 17:43:10 +02:00
• 391c7301da Merge remote-tracking branch 'origin/development' into development Fabio Chelly 2013-07-05 17:18:50 +02:00
• 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 Fabio Chelly 2013-07-05 17:18:28 +02:00
• 9f0867b700 [-] FO : could not see old_price_display when specific price on one combination gRoussac 2013-07-05 14:42:39 +02:00
• 62ff976d69 // Removed redundant function calls Damien Metzger 2013-07-05 14:24:39 +02:00
• 91cd196cf6 // remove console.log sorry bad commit gRoussac 2013-07-05 12:29:29 +02:00
• 128ceffcc0 [-] FO : Bad specific price for a combination // sorry gRoussac 2013-07-05 12:28:10 +02:00
• 268f1fd030 [-] FO : Bad specific price for a combination gRoussac 2013-07-05 12:11:02 +02:00
• 2489778b3c [-] MO Blocknewsletter : deletes e-mail from newsletter table only if newsletter checkbox has been checked on subscription page #PNM-1419 Fabio Chelly 2013-07-05 11:53:04 +02:00
• 54b882e936 [*] MO : pscleaner reset employees notyfications Piotr Kaczor 2013-07-05 08:05:51 +02:00
• 8a7edf3668 [-] FO : Fix bug #PSCFV-9355 dleete button missing for custo in blockcart gRoussac 2013-07-04 17:42:35 +02:00
• 58091a3b0e Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-07-04 17:25:41 +02:00
• df7b5c9861 [-] FO : Fix bug #PSCFV-9669, update total price on order-payment gRoussac 2013-07-04 17:25:00 +02:00
• 1fa36e5464 // update link steps carrier wizard sLorenzini 2013-07-04 17:09:36 +02:00
• 12e7e3a44a [-] BO: display vat number field should not depends of the vatnumber module #PSCFV-9672 Rémi Gaillard 2013-07-04 17:00:27 +02:00
• f72b6fb9fc // update steps carrier wizard (css for 3/4/5 steps) sLorenzini 2013-07-04 16:52:20 +02:00
• c335115f68 // remove console.log gRoussac 2013-07-04 16:48:56 +02:00
• c360e841b3 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-07-04 16:48:14 +02:00
• 0bddd17889 // remove console.log gRoussac 2013-07-04 16:43:17 +02:00
• cc8270761a //small fix Vincent Augagneur 2013-07-04 16:27:46 +02:00
• ec15c8c8db // Vincent Augagneur 2013-07-04 16:20:12 +02:00
• fd14268da3 // remove .gitattributes gRoussac 2013-07-04 15:23:39 +02:00
• 9d838b9a54 // update carrier wizard sLorenzini 2013-07-04 09:35:55 +02:00
• 47d343df90 // Fixed module positions in tabs Damien Metzger 2013-07-04 09:33:43 +02:00
• 9cfcb98c71 // update step wizard sLorenzini 2013-07-03 18:00:03 +02:00
• ae03669541 // Added the possibility to sort the modules in the tabs Damien Metzger 2013-07-03 17:50:24 +02:00
• cdd2842500 //added carrier wizard breadcrumb sprite Vincent Augagneur 2013-07-03 17:49:47 +02:00
• 471206c909 // custom carrier wizard steps sLorenzini 2013-07-03 17:41:09 +02:00
• ec981b7f86 [*] WS : improved performances Damien Metzger 2013-07-03 17:03:33 +02:00
• 18a6e7839e //added classes from a to li in carrier wizard Vincent Augagneur 2013-07-03 16:56:19 +02:00
• 943eacdf75 //carrier wizard first step Vincent Augagneur 2013-07-03 16:10:23 +02:00