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

• 7491f46322 Merge pull request #1 from PrestaShop/development Cosmin Hutanu 2013-09-06 12:42:22 -07:00
• 4c49048e39 [-] FO : Partial fix of adding gift on cart rule on the same entity in the cart rule gRoussac 2013-09-06 18:35:56 +02:00
• 302d5f94dd // grmbl Rémi Gaillard 2013-09-06 18:33:19 +02:00
• a10b5a517f // Added visits to chart Damien Metzger 2013-09-06 17:56:06 +02:00
• e5f53afd5f Merge remote-tracking branch 'origin/development' into development Fabio Chelly 2013-09-06 17:54:34 +02:00
• 9377775eca [-] MO productcomments : - Module was broken and works now - A message is displayed to indicate when a comment has been added. - Error li are correctly indented Fabio Chelly 2013-09-06 17:54:12 +02:00
• f6355ff2d5 [-] BO : Change categories tree method Jerome Nadaud 2013-09-06 17:09:32 +02:00
• c7e4f0ce5f [+] BO : Adding Tree Helper Jerome Nadaud 2013-09-06 17:06:19 +02:00
• 36a863df59 [+] BO : Adding Tree Helper Jerome Nadaud 2013-09-06 17:05:19 +02:00
• 8df63f256d // Added chart data Damien Metzger 2013-09-06 16:25:37 +02:00
• fa198aeabc // fix menu, design, css Kevin Granger 2013-09-06 16:25:01 +02:00
• 768a8b36d5 [-] BO : AdminModulesController - Bug fix, $params was not set Francois Gaillard 2013-09-06 15:41:24 +02:00
• 1b0c5be93d Merge remote-tracking branch 'origin/development' into development Fabio Chelly 2013-09-06 11:47:11 +02:00
• 663f592306 [-] MO sendtoafriend : a message is displayed whether the e-mail has been sent or not #PNM-627 #PNM-1610 #PNM-1616 Fabio Chelly 2013-09-06 11:40:41 +02:00
• 8e1250dad1 // I hate <br /> Kevin Granger 2013-09-06 11:13:18 +02:00
• 1b2bab6943 // performance Kevin Granger 2013-09-06 11:03:36 +02:00
• ec11b7e064 // Better control of the requests when our website is down Damien Metzger 2013-09-06 10:18:25 +02:00
• 5afdc024aa // navigation sidebar Kevin Granger 2013-09-06 09:48:22 +02:00
• 7e1c0d5a24 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Fabio Chelly 2013-09-06 09:24:43 +02:00
• 79677324b6 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Vincent Augagneur 2013-09-05 19:11:07 +02:00
• 3c2a086296 //merge Vincent Augagneur 2013-09-05 19:10:59 +02:00
• b2fd886722 // add new tpl for navigation top/side Kevin Granger 2013-09-05 19:07:57 +02:00
• 4b2ef10dd6 //dashboard data-chart-line added Vincent Augagneur 2013-09-05 19:07:49 +02:00
• 53241af228 // remove strict standard warning gRoussac 2013-09-05 19:00:25 +02:00
• a3233cc00c // Rémi Gaillard 2013-09-05 18:51:53 +02:00
• c35d8c7845 // Rémi Gaillard 2013-09-05 18:47:13 +02:00
• f5e00a59f7 // Rémi Gaillard 2013-09-05 18:41:51 +02:00
• a7d619b208 [-] MO : fix bug #PSCFV-9906 again, bad url parsing gRoussac 2013-09-05 18:39:07 +02:00
• 8868271c07 // push changes Rémi Gaillard 2013-09-05 18:37:25 +02:00
• 6b080e1f02 Optimize image copy in ShopImport module sjousse 2013-09-05 18:24:02 +02:00
• e7495f3fe4 //oups Vincent Augagneur 2013-09-05 17:38:17 +02:00
• 2ff2a6b6f9 // Profiling adapted to the new dashboard Damien Metzger 2013-09-05 17:27:48 +02:00
• 06b54d0519 //typo Vincent Augagneur 2013-09-05 16:35:15 +02:00
• 4124a48b1e //added check on range picker if date from is superior than date to Vincent Augagneur 2013-09-05 16:34:03 +02:00
• e4932131f6 //small fix Vincent Augagneur 2013-09-05 16:25:42 +02:00
• 1481dc0f5f //added PS_DASHBOARD_USE_PUSH in install Vincent Augagneur 2013-09-05 16:03:14 +02:00
• 7568b84f9f //added PS_DASHBOARD_USE_PUSH in upgrade Vincent Augagneur 2013-09-05 16:02:30 +02:00
• 0f81518ba2 // Add a buton to erase all log Rémi Gaillard 2013-09-05 15:58:36 +02:00
• c306b2a425 // Small fix dashboard push Damien Metzger 2013-09-05 15:41:10 +02:00
• 6e5fb47642 [-] INSTALLER : Fix bug #PSCFV-8289 bad orders vouchers total after update gRoussac 2013-09-05 15:31:13 +02:00
• e352f2137f //small fix Vincent Augagneur 2013-09-05 15:30:59 +02:00
• c34dbcf43a //dashboard range date choice in ajax 👍 Vincent Augagneur 2013-09-05 15:25:41 +02:00
• f09347a8be // update backup BDD, import, and email pages Sarah Lorenzini 2013-09-05 14:55:07 +02:00
• 73524c7a4c // update maintenance and email pages Sarah Lorenzini 2013-09-05 14:14:22 +02:00
• d9a429eccc // update radio helper Kevin Granger 2013-09-05 14:06:54 +02:00
• 1c88bdd24e //dashboard widget regardless refresh Vincent Augagneur 2013-09-05 11:52:18 +02:00
• 38e00f9080 //disabled push on dashboard by default Vincent Augagneur 2013-09-05 11:47:57 +02:00
• 95c9edd87a // Fixed Gapi v3.0 token refresh Damien Metzger 2013-09-05 11:12:58 +02:00
• 824a6b90f3 [-] FO : Fix bug #PSCFV-10118 quantity not updated when cart rules give the same product as gift gRoussac 2013-09-05 11:07:41 +02:00
• 009536d3f4 //small fix on version compare for install module Vincent Augagneur 2013-09-05 10:33:15 +02:00
• 5fa8cc4d47 //added translation Vincent Augagneur 2013-09-05 10:17:18 +02:00
• 284711b22f Merge pull request #697 from sjousse/patch-1 Gregory Roussac 2013-09-05 01:16:29 -07:00
• 2f6e0e3fae Changed the way to get the home category (get it from Configuration table now) sjousse 2013-09-05 10:14:31 +02:00
• 49718d6ea9 //new install version for gamification & bootstrap compatibility Vincent Augagneur 2013-09-04 23:16:56 +02:00
• befddf0115 //added 1.6.0.1.sql Vincent Augagneur 2013-09-04 23:15:49 +02:00
• 6e3d24b567 // add push Rémi Gaillard 2013-09-04 19:33:05 +02:00
• 114b86ed43 // Stats Damien Metzger 2013-09-04 19:15:01 +02:00
• d5a25f063f Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-09-04 18:56:32 +02:00
• 161c612c02 // fix modules list Kevin Granger 2013-09-04 18:56:00 +02:00
• d59f3383cf Merge pull request #694 from sjousse/patch-1 Gregory Roussac 2013-09-04 09:28:23 -07:00
• 6b2492b62c //added data into dashproducts module Vincent Augagneur 2013-09-04 18:26:58 +02:00
• 4d68595447 ShopImporter module is now aware of multi-shop sjousse 2013-09-04 18:26:24 +02:00
• 22d636f93a // Colored switch, removed "required field" legend, removed duplicate links quick access Kevin Granger 2013-09-04 18:14:11 +02:00
• 07bdcd4129 Merge pull request #693 from sjousse/development Gregory Roussac 2013-09-04 07:46:44 -07:00
• e9d066c981 fix value of date_add sjousse 2013-09-04 16:40:12 +02:00
• 56a1449c69 add date_add to categories sjousse 2013-09-04 16:32:00 +02:00
• 63c19ce1a9 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-09-04 15:39:25 +02:00
• 3ca2c8da95 [-] BO : Fix #PSCFV-9906 could not register search engines keywords gRoussac 2013-09-04 15:39:02 +02:00
• b4ecaf3ddb // Carrier Wizard with bootstrap WIP Kevin Granger 2013-09-04 15:38:45 +02:00
• 00c1860d22 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Rémi Gaillard 2013-09-04 15:08:41 +02:00
• 9348768ceb [-] MO: Fix blocklayered sort by quantity #PSCFV-10300 Rémi Gaillard 2013-09-04 15:05:55 +02:00
• cf1f9a01db // More stats Damien Metzger 2013-09-04 14:38:02 +02:00
• 40eab759dd //remove debug Vincent Augagneur 2013-09-04 14:24:17 +02:00
• 7b0349ca33 // bad commit sorry for that gRoussac 2013-09-04 11:14:45 +02:00
• efa81a7107 [-] INSTALLER: Wrong SQL query for PS_LEGACY_IMAGES to 0 gRoussac 2013-09-04 11:14:00 +02:00
• da353c884d [-] INSTALLER: short_description for PREFIX_manufacturer_lang is now type TEXT gRoussac 2013-09-04 10:45:48 +02:00
• df56d7af42 [-] CORE: Fix for field length and type regarding https://github.com/PrestaShop/PrestaShop/pull/678 gRoussac 2013-09-04 10:38:14 +02:00
• 87567ed1a0 // fixed translation of modules descriptions containing quotes djfm 2013-09-04 07:44:52 +00:00
• 5d38743b72 Merge pull request #690 from Ha99y/20130903_addToolBarModulesListButton Gregory Roussac 2013-09-04 00:40:41 -07:00
• 75a663b6e3 [-] BO : Fix pull request #665 Jerome Nadaud 2013-09-04 09:40:12 +02:00
• 08806f0240 //recents orders data-table for dashboard Vincent Augagneur 2013-09-04 09:36:09 +02:00
• f4892686c1 Warning in AdminController.php ha99y 2013-09-03 17:30:05 -07:00
• 671d419c27 // Carrier Wizard with bootstrap WIP Kevin Granger 2013-09-03 19:36:04 +02:00
• b55a84e961 [-] INSTALLER : Fix infinite loop when order message has additional ampersand gRoussac 2013-09-03 18:36:30 +02:00
• 6daf8ebbfa [-] BO : Fix error returned when first import of a localisation pack gRoussac 2013-09-03 18:20:58 +02:00
• f29c2d3fcb // Added some figures to the dashboard Damien Metzger 2013-09-03 18:00:22 +02:00
• 5d8e187faa Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-09-03 17:43:51 +02:00
• 0891c986d6 // fix from comment https://github.com/PrestaShop/PrestaShop/commit/c6d2e1252e1757478339009ec7b48320b1ccd92ahttps://github.com/PrestaShop/PrestaShop/commit/c6d2e1252e1757478339009ec7b48320b1ccd92a#commitcomment-4002919 gRoussac 2013-09-03 17:43:33 +02:00
• 8fedbe189c Merge pull request #682 from MyBB-Services/dev/sa/ordercartrulecleanup Gregory Roussac 2013-09-03 06:41:06 -07:00
• 7d61be252f [+] BO : Get categories in nested array Jerome Nadaud 2013-09-03 15:27:58 +02:00
• 5f5997b567 // fix quick access -> target _blank for frontend Kevin Granger 2013-09-03 15:19:34 +02:00
• b840f28137 //oups Vincent Augagneur 2013-09-03 15:13:05 +02:00
• cd7d604b75 [*] Project : Orders should rely only on ps_order_cart_rule soufyan 2013-09-03 14:38:35 +02:00
• 5caae97813 Merge pull request #680 from djfm/development Gregory Roussac 2013-09-03 06:00:50 -07:00
• dca6e39feb // css for tree view Kevin Granger 2013-09-03 14:52:50 +02:00
• 572a2e45aa // fixed unstranslatable string in AdminSupplyOrdersController djfm 2013-09-03 12:51:21 +00:00
• 98f60d039b // fix warning gRoussac 2013-09-03 12:29:17 +02:00
• 2990497a26 // header notifications Kevin Granger 2013-09-03 12:25:48 +02:00
• a900edee68 // Data, data, data Damien Metzger 2013-09-03 11:05:08 +02:00
• 70e6aea7c3 //typo Vincent Augagneur 2013-09-03 10:59:12 +02:00