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

• 69066361a6 [-] BO : FixBug #PSCFV-8234 Products tags not correctly indexed in search Jérôme Nadaud 2013-07-18 12:15:42 +02:00
• d99a1eba24 [-] BO : Bad return value for AdminCountries::processStatus() gRoussac 2013-07-18 12:12:05 +02:00
• 108bd92c3b [-] FO : Fixed partial use of cart rules which does not offer free shipping #PSCFV-9216 Damien Metzger 2013-07-18 12:09:48 +02:00
• c1a4dd6b66 // Added readme in the override directory Damien Metzger 2013-07-18 11:31:08 +02:00
• 9a0e3ca81e // Added logo remove link in carrier wizard Damien Metzger 2013-07-18 10:54:05 +02:00
• 3be36f9897 [*] MO : added configuration cleaning to pscleaner Damien Metzger 2013-07-18 09:35:40 +02:00
• 2e3ec0f038 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Jérôme Nadaud 2013-07-18 08:52:56 +02:00
• 40389822c3 [-] BO : FixBug Directory Separator on URL Jérôme Nadaud 2013-07-18 08:52:39 +02:00
• d7c6516c32 // Fixed size and position of the carrier wizard logo Damien Metzger 2013-07-17 19:47:48 +02:00
• 5939f65fac //norms gRoussac 2013-07-17 19:05:01 +02:00
• 244830d505 // oups2 Rémi Gaillard 2013-07-17 18:49:35 +02:00
• 3ea0c1ed24 // oups Rémi Gaillard 2013-07-17 18:49:21 +02:00
• bfa1294df9 // Added logo management to the carrier wizard (still need a "remove image" feature) Damien Metzger 2013-07-17 18:33:27 +02:00
• 810120aeb9 // Removed useless code Damien Metzger 2013-07-17 11:55:55 +02:00
• eecfdae0b6 [-] BO : FixBug #PSCFV-8217 Shop logo image not refresh after change Jérôme Nadaud 2013-07-17 18:23:59 +02:00
• 1537f0e9eb Merge pull request #566 from PrestaEdit/patch-45 Gregory Roussac 2013-07-17 09:02:28 -07:00
• 312e066751 Merge pull request #550 from PrestaEdit/patch-44 Gregory Roussac 2013-07-17 09:01:32 -07:00
• cf04c18ce6 Merge pull request #537 from PrestaEdit/patch-43 Gregory Roussac 2013-07-17 08:53:31 -07:00
• 8d5027a89b Merge pull request #530 from PrestaEdit/patch-42 Gregory Roussac 2013-07-17 08:44:49 -07:00
• 5c6640c258 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Jérôme Nadaud 2013-07-17 17:34:44 +02:00
• 458838e598 [-] BO : FixBug #PSCFV-9613 Fix product tax to be shop dependent Jérôme Nadaud 2013-07-17 17:33:53 +02:00
• ffb62426d8 Merge pull request #516 from PrestaEdit/patch-41 Gregory Roussac 2013-07-17 07:44:26 -07:00
• 8d5a632c92 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-07-17 16:34:50 +02:00
• 014758d1d8 Merge branch 'PrestaEdit-translate' into development gRoussac 2013-07-17 16:34:26 +02:00
• 3f7bf5c6b0 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-07-17 15:36:03 +02:00
• c9d2cf8ed2 Merge branch 'translate' of https://github.com/PrestaEdit/PrestaShop into PrestaEdit-translate gRoussac 2013-07-17 16:31:49 +02:00
• 6884d7c5de [-] BO : FixBug #PSCFV-8287 Breadcrumbs label was wrong Jérôme Nadaud 2013-07-17 16:19:15 +02:00
• 24b2e1ec8c Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-07-17 15:36:03 +02:00
• d55f31d3b5 Merge branch 'tools-fileAttachment' of https://github.com/PrestaEdit/PrestaShop into PrestaEdit-tools-fileAttachment gRoussac 2013-07-17 15:31:13 +02:00
• 2d1ec5f642 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Jérôme Nadaud 2013-07-17 15:14:05 +02:00
• 421c199e1f [-] BO : FixBug #PSCFV-8229 Default country value set to manufacturer country Jérôme Nadaud 2013-07-17 15:13:34 +02:00
• 1b9892b944 // removed deprecated message Damien Metzger 2013-07-17 13:42:45 +02:00
• eaa9ae95bf // forgot someting Rémi Gaillard 2013-07-17 12:06:50 +02:00
• b41c724e97 // fix validation rules Rémi Gaillard 2013-07-17 11:43:54 +02:00
• 899dc30097 [-] Class : AdminController - Object id fixed François Gaillard 2013-07-17 11:33:33 +02:00
• 22f1cd70f1 // Fixed carrier wizard behavior after validation Damien Metzger 2013-07-17 11:28:32 +02:00
• ee038c868c // Removed useless option "billing according to the default behavior" in the carrier wizard and carrier options Damien Metzger 2013-07-17 11:20:41 +02:00
• 67ec90fae9 // same Rémi Gaillard 2013-07-17 11:13:46 +02:00
• 25e0390128 // Improved carrier wizard navigation Damien Metzger 2013-07-17 11:08:03 +02:00
• 1199ad8cf2 [-] BO : FixBug #PSCFV-6365 Missing message confirmation for Images modification in Preferences > Images Jérôme Nadaud 2013-07-17 10:51:34 +02:00
• f6f2552f38 // fix multishop Rémi Gaillard 2013-07-17 10:49:17 +02:00
• 02921dc9d0 [+] Helper form WIP Kevin Granger 2013-07-16 19:23:46 +02:00
• ea89c2235d [-] BO : Fix bug #PSCFV-9722, do not propose adding root categories in categories when there is only one shop gRoussac 2013-07-16 19:01:05 +02:00
• d66f407fcb [-] BO : Use only 0% reduction from category in group Jérôme Nadaud 2013-07-16 18:28:11 +02:00
• de4cb8a096 // Carrier Wizard summary (just started) Damien Metzger 2013-07-16 18:16:02 +02:00
• ae5b6b79ee [*] BO : #PSCFV-8498 You can now use 0% in groups category rules in order to not apply discount on this category Jérôme Nadaud 2013-07-16 17:42:38 +02:00
• e7eae03508 Merge pull request #575 from dreammeup/development Gregory Roussac 2013-07-16 07:17:03 -07:00
• 82c7e3eeff Correcting errors in order graph at admin home dreammeup 2013-07-16 15:34:52 +02:00
• 145df5a26e Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development djfm 2013-07-16 13:08:36 +00:00
• 8d39f32506 [-] BO: Fix tax rule edition - unique tax rule can't be edited Rémi Gaillard 2013-07-16 11:52:05 +02:00
• d2ff50ddb7 [*] CORE : Fix bug #PSCFV-9811 doc on display404Error gRoussac 2013-07-16 10:50:27 +02:00
• 3d283000a0 // Fixed misplaced comma Damien Metzger 2013-07-16 10:27:39 +02:00
• 274b49bd81 // Fixed typo Damien Metzger 2013-07-16 10:19:18 +02:00
• 672f2d9dd1 [-] BO : Fix bug #PSCFV-9395 Missing vertical separation between flags Jérôme Nadaud 2013-07-16 10:18:54 +02:00
• 97b16d2726 [-] BO : Fix Bug #PSCFV-9550 Bad URL redirection Jérôme Nadaud 2013-07-16 09:59:47 +02:00
• e48b2a411e [-] INSTALLER : Errors in upgrader gRoussac 2013-07-15 22:01:41 +02:00
• a6d0ef744e Merge remote-tracking branch 'origin/development' into development Fabio Chelly 2013-07-15 19:37:19 +02:00
• b67ffb1a50 [-] MO loyalty : categories are now taken into account when creating discount vouchers #PNM-1492 #PNM-1191 #PNM-1223 Fabio Chelly 2013-07-15 19:36:32 +02:00
• 272f2ec8f7 Merge pull request #573 from soware/patch-2 Gregory Roussac 2013-07-15 09:49:17 -07:00
• d9c2ec37d4 // Code cleaning Damien Metzger 2013-07-15 18:13:07 +02:00
• a3039024e7 // Code cleaning Damien Metzger 2013-07-15 18:07:33 +02:00
• 66f64c1baa // update order tab sLorenzini 2013-07-15 17:58:23 +02:00
• c253a8edf4 Update AdminStockManagementController.php soware 2013-07-15 12:45:00 -03:00
• 7a27b11309 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-07-15 17:31:17 +02:00
• f9c5bf0bf2 [-] Fix bug #PSCFV-9633 again could not see delete href in block cart gRoussac 2013-07-15 17:29:08 +02:00
• f6ef6f5d0e Merge pull request #572 from PrestaEdit/patch-47 Gregory Roussac 2013-07-15 07:41:07 -07:00
• 01bad90b29 // Welcome 2013 gRoussac 2013-07-15 16:36:54 +02:00
• 4b8a756add [-] Class: Media / Correct jquery_ui_dependencies fileName PrestaEdit 2013-07-15 16:34:51 +02:00
• ca4a73ddf4 // avoid copy paste mistake with trailing space gRoussac 2013-07-15 15:34:34 +02:00
• 1a056d5e33 [-] BO : Fix bug #PSCFV-9310 bad type for input in helper thankx @Piotr Moćko gRoussac 2013-07-15 14:47:38 +02:00
• f1dcf02caf //fix warnings #PSCFV-9786 gRoussac 2013-07-15 14:25:58 +02:00
• e30e15d76d [-] INSTALER: Fix bug #PSCFV-9762 marketing tab disapear after upgrade gRoussac 2013-07-15 12:29:51 +02:00
• 27571f4d06 //update module tab sLorenzini 2013-07-15 12:02:03 +02:00
• 0c4a5bd984 // update module tab positions & payment sLorenzini 2013-07-15 11:55:06 +02:00
• ee1187d821 [-] BO: Delete specific price after combination deletion && fix SpecificPrice::getByProductId() sql query Rémi Gaillard 2013-07-15 11:00:35 +02:00
• db7f0da746 // Improved display in pscleaner Damien Metzger 2013-07-15 10:48:48 +02:00
• cf7f72fc30 // Fixed AdminMarketing position in upgrade Damien Metzger 2013-07-15 10:11:27 +02:00
• 6ea4a2c553 [-] FO : Fix bug #PSCFV-9662 udpate payments means after delete thanks @maofree gRoussac 2013-07-15 10:08:16 +02:00
• 324dff0595 ParentOrderController->setMedia() proper order for typewatch and cart-summary Cosmin Hutanu 2013-07-15 00:56:56 +03:00
• 795976cadb [*] FO: display Error500 if no database access PrestaEdit 2013-07-14 14:59:25 +02:00
• 3914b7db1b // Vincent Augagneur 2013-07-12 19:19:13 +02:00
• b8babdadb3 // products wip Kevin Granger 2013-07-12 19:17:51 +02:00
• e34289b0b7 // fix product warehouses Rémi Gaillard 2013-07-12 18:53:22 +02:00
• 22b73a7339 [*] BO : upgraded cover icon management in product > images Damien Metzger 2013-07-12 18:43:49 +02:00
• c89281166b Merge pull request #467 from PrestaEdit/patch-40 Gregory Roussac 2013-07-12 09:23:29 -07:00
• 5083cd6b5e Merge pull request #466 from PrestaEdit/patch-39 Gregory Roussac 2013-07-12 08:56:42 -07:00
• e23854d143 // Add currency ID on default modules cache id Rémi Gaillard 2013-07-12 17:49:38 +02:00
• 4919d6d81a // update positions module tab sLorenzini 2013-07-12 17:46:13 +02:00
• 5b6c6a3ce9 Merge pull request #561 from BigZ/patch-5 Gregory Roussac 2013-07-12 08:44:24 -07:00
• 39a23e1494 Merge pull request #560 from BigZ/patch-4 Gregory Roussac 2013-07-12 08:42:16 -07:00
• b25b88cf33 Merge pull request #559 from BigZ/patch-3 Gregory Roussac 2013-07-12 08:41:37 -07:00
• 0453698f50 Merge pull request #557 from BigZ/patch-1 Gregory Roussac 2013-07-12 08:37:21 -07:00
• c12ce3dd29 // Products Kevin Granger 2013-07-12 17:27:25 +02:00
• 9c44faf295 [-] FO : Fix bug #PSCFV-9754 do not use back url on cart summary link in steps gRoussac 2013-07-12 16:59:11 +02:00
• 4e0723b3cc [-] BO : fixed charts and grids in multishop #PSCFV-8978 Damien Metzger 2013-07-12 16:28:47 +02:00
• 105b1422a3 Merge pull request #562 from axometeam/patch-14 Gregory Roussac 2013-07-12 07:22:50 -07:00
• 38b32f7e1a [-] MO : fixed disappearing form in sekeyword #PSCFV-9743 Damien Metzger 2013-07-12 15:56:54 +02:00
• f82e748fc8 [*] MO : you can now exclude IP addresses from the online visitors module #PSCFV-9056 Damien Metzger 2013-07-12 15:38:18 +02:00
• 9fec968488 Update Translate.php Sylvain WITMEYER 2013-07-12 15:17:09 +02:00
• 8588978e03 [*] FO : getCatImageLink doesn't work without type thanks @axometeam gRoussac 2013-07-12 15:03:52 +02:00