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

• 9611ea1f70 [-] BO: Fix empty group list on changing opt or newsletter on customers listing Rémi Gaillard 2013-10-31 11:22:40 +01:00
• 8a7f869515 // small graphical bug Rémi Gaillard 2013-10-31 10:41:15 +01:00
• d17515a728 // don't format currency on input Rémi Gaillard 2013-10-31 10:22:38 +01:00
• 036fa7cba6 [-] FO : Fix bug #PSCFV-10889 wrong color when oos product gRoussac 2013-10-31 10:18:28 +01:00
• 9c57c71deb Merge pull request #913 from djfm/development Damien Metzger 2013-10-31 01:48:56 -07:00
• 7812731095 // removed hard-coded space before ellipsis (...) in English installer steps djfm 2013-10-31 08:29:05 +00:00
• a8a204edf3 // small correction in English installer text djfm 2013-10-31 08:25:57 +00:00
• 11f60492be // removed unnecessary punctuation in English installer strings, both in source code and translations djfm 2013-10-31 08:09:14 +00:00
• f919cc899d [-] IN : Set conversion rate to 1 if equal 0 in base gRoussac 2013-10-30 20:06:47 +01:00
• 09dcff959e // cart rules > conditions > product rules WIP Kevin Granger 2013-10-30 19:25:58 +01:00
• fbdddba753 [-] IN : Set default conversion rate to 1 not 0 gRoussac 2013-10-30 19:03:36 +01:00
• cbfa8dfc30 // forgot to commit in https://github.com/PrestaShop/PrestaShop/commit/f78cde96d633f65ece5700d2bc9793f134bdb7e6 gRoussac 2013-10-30 19:02:24 +01:00
• 8547f663d1 [-] BO : AdminImport withdraw separator changed in js gRoussac 2013-10-30 18:46:02 +01:00
• 372130f7d7 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-10-30 18:37:46 +01:00
• f78cde96d6 [-] BO : AdminImport wrong group by default gRoussac 2013-10-30 18:37:26 +01:00
• ecf45d0475 // small fix Rémi Gaillard 2013-10-30 18:28:55 +01:00
• 48f00b2367 [-] BO : FixBug #PSCFV-10882 - Add json encode and decode smarty modifier via tools class Jerome Nadaud 2013-10-30 18:28:17 +01:00
• c958436a76 // Dutch installer translations djfm 2013-10-30 17:26:22 +00:00
• 9f2424db41 // Fix Module exception in transplant Jerome Nadaud 2013-10-30 18:11:33 +01:00
• a56fb7c639 // Polish installer translations djfm 2013-10-30 17:06:52 +00:00
• 8aa369531e // employee avatar Rémi Gaillard 2013-10-30 18:02:10 +01:00
• 16efe89bed // improved installer translations: no colons in translations and filled some missing fields djfm 2013-10-30 16:57:30 +00:00
• 56799f53c8 [-] Bo : AdminImport customer group default gRoussac 2013-10-30 17:12:20 +01:00
• da43700361 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Jerome Nadaud 2013-10-30 16:48:26 +01:00
• d7b46e80af [+] BO : Add debug mode system Jerome Nadaud 2013-10-30 16:48:16 +01:00
• b311a0c719 [-] BO : Fix bug #PSCFV-10872 AdminImport could not import supllier orders gRoussac 2013-10-30 16:06:38 +01:00
• 6a3e711cff //small fix Vincent Augagneur 2013-10-30 15:43:31 +01:00
• a0f4eab4c1 // typo Rémi Gaillard 2013-10-30 15:40:40 +01:00
• 9ef10ee806 [-] IN : Handle RC PHP_VERSION gRoussac 2013-10-30 15:03:07 +01:00
• b9ad576fb0 // -> mailsrc branch Rémi Gaillard 2013-10-30 15:02:06 +01:00
• f9b1545037 // missing file Rémi Gaillard 2013-10-30 14:59:08 +01:00
• c56e8471c2 [-] BO: fix the checkbox of shop activation on modules configuration Rémi Gaillard 2013-10-30 14:57:15 +01:00
• 8953c55b7f [-] BO : Adminimport default customers group gRoussac 2013-10-30 12:30:22 +01:00
• ad68105467 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Vincent Augagneur 2013-10-30 10:52:04 +01:00
• 0020412aea //added Preactivation request on dashboard Vincent Augagneur 2013-10-30 10:51:58 +01:00
• 190c14ed9d // delete src mails -> go mailsrc branch Rémi Gaillard 2013-10-30 10:25:51 +01:00
• 653c38e01a Merge pull request #911 from madef/development Jérôme Nadaud 2013-10-30 00:55:53 -07:00
• 78af47e2d3 [-] BO : tagify call twice if field is not translatable Madef 2013-10-29 23:18:34 +01:00
• 26b4fbf883 [*] BO : Manual merge of https://github.com/PrestaShop/PrestaShop/pull/891 1/2 gRoussac 2013-10-29 19:07:31 +01:00
• c98b5e0c78 [*] CORE : Manual merge of https://github.com/PrestaShop/PrestaShop/ thanks @kpodemski gRoussac 2013-10-29 19:05:21 +01:00
• df80e6ec8b // btn-group-action adjustments Kevin Granger 2013-10-29 18:55:33 +01:00
• 0b564c0107 // oups Kevin Granger 2013-10-29 18:15:17 +01:00
• aee725839e // fixs btn-group Kevin Granger 2013-10-29 18:10:07 +01:00
• 6d5ca9969e // js error Rémi Gaillard 2013-10-29 17:56:29 +01:00
• 5fa36abcaf // fixs UI Kevin Granger 2013-10-29 17:32:57 +01:00
• c7fe91a0a9 // Fixed traffic sources chart on dashboard Damien Metzger 2013-10-29 16:38:40 +01:00
• 90bef56c84 Merge pull request #907 from djfm/development Gregory Roussac 2013-10-29 08:24:45 -07:00
• 34aaeee0b5 // Fixed product images on the dashboard Damien Metzger 2013-10-29 16:17:40 +01:00
• 75cde08776 // update conf message in AdminImport gRoussac 2013-10-29 16:16:55 +01:00
• c6319a754e [-] BO : Stats are empty when no conversion rate gRoussac 2013-10-29 16:04:15 +01:00
• 9d18ef8186 // Frenglish djfm 2013-10-29 14:44:51 +00:00
• f58526c701 Merge pull request #905 from PhpMadman/RMARef Gregory Roussac 2013-10-29 07:44:26 -07:00
• d5eedd5eaa Merge pull request #906 from djfm/development Damien Metzger 2013-10-29 07:42:07 -07:00
• a43851469e [-] CORE : Currency conversion rate can not be 0 gRoussac 2013-10-29 15:39:17 +01:00
• 0288696c90 // English djfm 2013-10-29 14:37:55 +00:00
• 64706075d5 // Fix default language on BO forms Rémi Gaillard 2013-10-29 15:32:31 +01:00
• 4fe4d71361 // Stats cleaning Damien Metzger 2013-10-29 15:29:55 +01:00
• 7c1623c7fa [-] BO : Order-follow displayed order id instead of order reference PhpMadman 2013-10-29 14:53:50 +01:00
• f06eb84d9f // Stats cleaning Damien Metzger 2013-10-29 14:36:27 +01:00
• ed2fbba996 Merge pull request #903 from PhpMadman/patch-2 Jérôme Nadaud 2013-10-29 05:31:02 -07:00
• 87bb957431 fixed missing comma PhpMadman 2013-10-29 13:28:00 +01:00
• 7b029457e4 [-] BO : hide stmp options when selecting never send emails PhpMadman 2013-10-29 12:41:24 +01:00
• b605f33359 [-] BO : FixBug #PSCFV-10866 - Tagify system not working Jerome Nadaud 2013-10-29 12:07:30 +01:00
• 580e201c48 [-] BO : FixBug #PSCFV-9319 - display only valid order id Jerome Nadaud 2013-10-29 11:38:48 +01:00
• d409614222 [-] FO : CustomerMessage ip_address to string gRoussac 2013-10-29 11:18:53 +01:00
• dabb23ac8d // Added KPIs to the category page and fixed dashboard data Damien Metzger 2013-10-29 11:02:58 +01:00
• e1c7541a38 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development djfm 2013-10-29 10:01:00 +00:00
• 1bee84d26c [-] BO : Do not delete other default jpg when _deleteOldImages and type defined gRoussac 2013-10-29 10:57:33 +01:00
• af61191a7e // rename field Action when out of stock gRoussac 2013-10-29 10:55:46 +01:00
• 07222be5dd // demo mode on ajaxfilemanager Rémi Gaillard 2013-10-29 10:53:00 +01:00
• b3d7b8754b // fixs date range picker Wip Kevin Granger 2013-10-29 10:40:33 +01:00
• 9f2580f3bd Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Jerome Nadaud 2013-10-29 10:31:12 +01:00
• d2e475dd3a // Removed line from merge Jerome Nadaud 2013-10-29 10:30:59 +01:00
• 2b67d7072c // type of logger field Rémi Gaillard 2013-10-29 10:18:29 +01:00
• b885c63564 Merge pull request #900 from kpodemski/patch-10 Gregory Roussac 2013-10-29 02:06:56 -07:00
• d74291e5b5 Merge pull request #901 from kpodemski/patch-11 Gregory Roussac 2013-10-29 02:06:25 -07:00
• 1d90218e0d // Update mailalert module version Jerome Nadaud 2013-10-29 10:00:57 +01:00
• 9660cef0aa [-] MO : mailalert - Fix deprecated warning on displayDate Jerome Nadaud 2013-10-29 09:58:42 +01:00
• 4b1f198cc4 Merge pull request #899 from cedricfontaine/patch-3 Jérôme Nadaud 2013-10-29 01:43:03 -07:00
• 0aca1d4a67 [*] BO : AdminProducts find smallest images gRoussac 2013-10-29 08:47:41 +01:00
• 526f32b6a0 [*] MO: blocksharefb optimization Krystian Podemski 2013-10-28 23:24:32 +01:00
• faa4a18a82 [*] MO: productcomments optimization Krystian Podemski 2013-10-28 23:21:35 +01:00
• 79cba4b655 [-] FO : Fix bug #PSCFV-10851, no shop restriction in vouchers display in cart gRoussac 2013-10-28 19:00:00 +01:00
• 0ba8fbc39a Update stores.js cedricfontaine 2013-10-28 13:46:42 -04:00
• edf54eb2ca // re-generate class_index on the first step of install Rémi Gaillard 2013-10-28 18:43:02 +01:00
• dd10301413 // Fix tagify key events Jerome Nadaud 2013-10-28 17:46:00 +01:00
• e86c56172d [*] FO: Can not establish purchase total when tax incl. gRoussac 2013-10-28 17:42:23 +01:00
• 38f034f4e0 // Remove header and footer display when ajax Jerome Nadaud 2013-10-28 17:10:53 +01:00
• a466c6f5f7 // Add tagify system to product information Jerome Nadaud 2013-10-28 16:32:17 +01:00
• 3798adff2f Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-10-28 16:19:02 +01:00
• d523d739e7 // dashboard date range picker wip Kevin Granger 2013-10-28 16:18:43 +01:00
• 5760718b85 // Add Save button to page header toolbar Jerome Nadaud 2013-10-28 15:55:58 +01:00
• 1454a0d26a // search type in BO Rémi Gaillard 2013-10-28 15:32:26 +01:00
• 48b7a49b1a // Product image upload failed with bad content-type header Jerome Nadaud 2013-10-28 14:58:19 +01:00
• 12a257db7a Merge pull request #898 from Jacky75/blulab20131028-slider-virtualuri Gregory Roussac 2013-10-28 06:53:41 -07:00
• 63141a9c4d [-] FO: fixed bug #PSCFV-10654 - TinyMCE editor: List of products by manufacturer, products by supplier - Long description is not hidden. Sarah Lorenzini 2013-10-28 14:48:48 +01:00
• c84689ec71 homeslider stores slider about multistore with virtual uri Daniele Giachino 2013-10-28 14:09:35 +01:00
• 0aea146a4c // Code cleaning stats modules Damien Metzger 2013-10-28 13:39:39 +01:00
• 9c54dcce66 // Fixed default stats graph engine Damien Metzger 2013-10-28 12:15:35 +01:00
• 08732eda50 // Fixed default selection in the stats submenu Damien Metzger 2013-10-28 12:08:46 +01:00