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

• c2d15f4ade // Changed language display in back office dropdown menu Damien Metzger 2013-09-12 14:52:20 +02:00
• e63ce0a86d // Tree Jerome Nadaud 2013-09-12 14:47:47 +02:00
• 91d3da310b // dashboard panel version Kevin Granger 2013-09-12 14:42:20 +02:00
• cc36eb2d27 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Francois Gaillard 2013-09-12 14:32:22 +02:00
• 53c1e56c51 [-] BO : Bug fix - Encoding & tips of the day Francois Gaillard 2013-09-12 14:32:02 +02:00
• 8590b0e699 Merge pull request #716 from romainberger/typos Gregory Roussac 2013-09-12 05:30:36 -07:00
• 876be3b452 [*] FO : removed extra slash and point romainberger 2013-09-12 14:07:45 +02:00
• a1b0710f85 // fix menu + sass refacto Kevin Granger 2013-09-12 12:26:08 +02:00
• e5276ff531 [-] FO : 301 Redirect /iso_lang to /iso_lang/ url gRoussac 2013-09-12 11:16:12 +02:00
• 4a6c5979a8 //added new useful links on dashboard Vincent Augagneur 2013-09-12 10:52:56 +02:00
• 90091d4f2c [-] BO : Do not copy link_rewrite from title if cms already has one gRoussac 2013-09-12 10:50:04 +02:00
• 3870388e1c Merge branch 'mailalerts_real_multishop' of https://github.com/axome/PrestaShop into axome-mailalerts_real_multishop gRoussac 2013-09-12 10:09:25 +02:00
• 6fa398e8e0 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Vincent Augagneur 2013-09-12 10:08:32 +02:00
• 38822bfb5e //dashactivity configuration Vincent Augagneur 2013-09-12 10:08:28 +02:00
• ea1bdbc849 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Rémi Gaillard 2013-09-12 10:01:39 +02:00
• f0297824d7 Merge pull request #709 from AgenceNetDesign/development Gregory Roussac 2013-09-12 00:56:36 -07:00
• c91a86740f Merge pull request #715 from Prestaspirit/patch-6 Gregory Roussac 2013-09-12 00:55:28 -07:00
• a37033e478 [-] MO : Fixed a bug when displaying textures Prestaspirit 2013-09-12 07:01:55 +02:00
• e9dbadcabf // Tree Jerome Nadaud 2013-09-11 20:41:14 +02:00
• 9fa6c86a94 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Rémi Gaillard 2013-09-11 20:05:13 +02:00
• ab8d5bc265 // VT theme Kevin Granger 2013-09-11 18:17:57 +02:00
• 18212420c3 // fix switch menu top // side Kevin Granger 2013-09-11 17:26:44 +02:00
• 739d1434b5 // Small fix Damien Metzger 2013-09-11 17:02:30 +02:00
• 99263a1492 // switch menu top // side Kevin Granger 2013-09-11 16:56:10 +02:00
• ddd7ed2d2b // Connected traffic sources to analytics (dashboard) Damien Metzger 2013-09-11 16:43:24 +02:00
• f4f3084c35 [-] Core: Set a remote addr with php-cli #PSCFV-10372 Rémi Gaillard 2013-09-11 16:40:33 +02:00
• e2dac03baa Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-09-11 16:30:52 +02:00
• a4d131eac9 [-] WS: Fix entities retrieve for some cases Rémi Gaillard 2013-09-11 16:32:11 +02:00
• dfdbe39ee3 [-] BO : Small changes when creating vouchers in back office orders gRoussac 2013-09-11 16:28:11 +02:00
• 31c94caebc [-] BO: Fix out of stock creation with multishop and stock sharing Rémi Gaillard 2013-09-11 16:22:13 +02:00
• 4a3e0c5075 // Updated README.md Damien Metzger 2013-09-11 16:11:16 +02:00
• c42d71b8f5 // oups Rémi Gaillard 2013-09-11 16:06:23 +02:00
• 669c3791b5 [-] BO: Fix preview url with multishop Rémi Gaillard 2013-09-11 15:55:25 +02:00
• 7909a7388c //Fix disabled categories with add parameter Jerome Nadaud 2013-09-11 15:41:08 +02:00
• 617b58ba2f //Fix Text input desc error Jerome Nadaud 2013-09-11 15:40:21 +02:00
• 3e750490fe // chmod class_index 666 instead of 664 Rémi Gaillard 2013-09-11 15:16:15 +02:00
• 49c9afec40 // Categories tree Jerome Nadaud 2013-09-11 15:08:24 +02:00
• 01be908e51 [-] CORE : Could not add several cart rules gRoussac 2013-09-11 14:50:42 +02:00
• 0ff6b25f56 // Fixed norm Damien Metzger 2013-09-11 14:15:56 +02:00
• 981ce70594 // Added realtime Analytics to the dashboard (private beta only at this time) Damien Metzger 2013-09-11 14:07:43 +02:00
• 937ce38a1f //added dashactivity config Vincent Augagneur 2013-09-11 12:25:07 +02:00
• 913ee1007c // menu top Kevin Granger 2013-09-11 11:32:06 +02:00
• 486bb58bf6 //added dashboard widget config toggle display Vincent Augagneur 2013-09-11 11:07:38 +02:00
• 3cc187a716 //dashactivity trafic source data_list & pie_chart Vincent Augagneur 2013-09-11 10:34:01 +02:00
• 9f12ff15be [-] BO : Fix possible Uncaught exception 'ReflectionException' when viewing AdminMeta gRoussac 2013-09-11 10:30:40 +02:00
• 53805f2b93 Merge pull request #712 from Prestaworks/patch-13 Gregory Roussac 2013-09-11 00:58:30 -07:00
• 614e56283a Update mailalerts.php Daniel 2013-09-11 10:49:34 +08:00
• f29b1b3a31 // perts fix + menu top WIP Kevin Granger 2013-09-10 20:23:06 +02:00
• 85a471a690 //bad commit , sorry for that gRoussac 2013-09-10 18:51:20 +02:00
• 86d3a8afe1 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-09-10 18:49:05 +02:00
• f94f0f14a4 [-] FO : Fix bug #PSCFV-8917 taxes calculation when changing delivery address gRoussac 2013-09-10 18:48:28 +02:00
• e0d33eae9e // Categories Tree changes Jerome Nadaud 2013-09-10 18:40:05 +02:00
• 31d762b88a Merge pull request #710 from nilsga/development Gregory Roussac 2013-09-10 09:24:04 -07:00
• 9713f93075 Add Bcc support in Mail class Nils-Helge Garli Hegvik 2013-09-10 17:11:34 +02:00
• 1aba28ff6f //typo Vincent Augagneur 2013-09-10 16:42:54 +02:00
• 7990db8b0c // Tree folders icon problem Jerome Nadaud 2013-09-10 14:34:48 +02:00
• 85dc552667 // Toolbar Jerome Nadaud 2013-09-10 14:08:29 +02:00
• c5afbc75bd [-] MO : carriercompare fixed bug, override template's files in theme. Ticket #PNM-1691 unknown 2013-09-10 12:01:38 +02:00
• 332d68c7ec [-] MO : Statsdata, exception on duplicate entry gRoussac 2013-09-10 11:08:57 +02:00
• f30a088848 [*] MO : MailAlerts : Add SQL update script for v2.5 Nicolas Sorosac 2013-09-10 11:01:11 +02:00
• 3c090535a9 // small fix for image SSL links Rémi Gaillard 2013-09-10 10:39:03 +02:00
• c4681c1fb1 [*] MO : MailAlerts : multishop/multilang full compatibility Customers will receive alerts based on the real context of the moment they subscribed to the alert (sho, theme & language) Nicolas Sorosac 2013-09-10 10:24:40 +02:00
• 021790a3e2 [-] FO: Fix SSL links on domain_ssl instead domain Rémi Gaillard 2013-09-10 10:15:52 +02:00
• 03d1697e19 // treeview helper Kevin Granger 2013-09-10 09:41:39 +02:00
• 1d8da79507 [-] BO : fixed notifications when there is too much data Damien Metzger 2013-09-10 09:17:42 +02:00
• 4968a792b4 [-] IN : Remove notice when upgrading from gRoussac 2013-09-10 01:12:52 +02:00
• 2a7bc49190 // treeview Kevin Granger 2013-09-09 19:03:38 +02:00
• e91460b8fe [-] BO : Change Nested categories Jerome Nadaud 2013-09-09 18:58:32 +02:00
• 4e8658f1d6 [+] BO : Helper Tree js improvement Jerome Nadaud 2013-09-09 18:57:42 +02:00
• b6e0583af8 //added security check on dashboard Vincent Augagneur 2013-09-09 18:47:15 +02:00
• 4e1a513371 //added rss and useful link on dashboard Vincent Augagneur 2013-09-09 18:44:34 +02:00
• 69b38f4d6f Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-09-09 18:13:49 +02:00
• 7774e46cb3 // tree view product Kevin Granger 2013-09-09 18:12:31 +02:00
• a383d55421 Merge pull request #707 from sjousse/development Gregory Roussac 2013-09-09 08:31:15 -07:00
• 00f3045690 fix imported prices sjousse 2013-09-09 17:24:27 +02:00
• 5362f4d426 Merge pull request #699 from sjousse/patch-1 Gregory Roussac 2013-09-09 08:11:51 -07:00
• 9880d152d4 Merge pull request #706 from sjousse/development Gregory Roussac 2013-09-09 08:10:12 -07:00
• 990a889b1c Add some fields to Orders in Import module sjousse 2013-09-09 17:08:17 +02:00
• 7bb295b076 // Jerome Nadaud 2013-09-09 16:21:32 +02:00
• e6d0a3e5a4 // revert form https://github.com/PrestaShop/PrestaShop/commit/2874f1498352228c84df969c42e9d8f699a8afc5 gRoussac 2013-09-09 15:11:55 +02:00
• 242556e176 [-] MO: Fix unifunc smarty errors if module is displayed on multiplehook without cache Rémi Gaillard 2013-09-09 15:12:26 +02:00
• c502c9766f [-] BO : FixBug PSCFV-10331 - Tax rules Pagination Jerome Nadaud 2013-09-09 15:04:14 +02:00
• c18dea7296 //carrier wizard fix - bootstrap compatibility Vincent Augagneur 2013-09-09 14:14:57 +02:00
• accd2d77c1 [+] BO : Adding tree templates and functions Jerome Nadaud 2013-09-09 12:20:58 +02:00
• 54f7c65165 [-] BO : Display the old image system migration tool if product images are in _PS_PROD_IMG_DIR_ gRoussac 2013-09-09 12:20:38 +02:00
• b5f6e8a1d8 [+] BO : Add "tree-selected" class to tree.js Jerome Nadaud 2013-09-09 12:10:26 +02:00
• 641cf225f2 // fix small translation bug PSCFV-10329 djfm 2013-09-09 09:47:44 +00:00
• 6ea3783013 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development djfm 2013-09-09 09:46:49 +00:00
• dcad699ede [-] FO : fixed chinese search with multiple symbols #PSCFV-10322 Damien Metzger 2013-09-09 11:18:48 +02:00
• e1d0347757 [-] Classes : Bug fix - FrontController, mobile & JS minifier fixed Francois Gaillard 2013-09-09 10:17:15 +02:00
• b975a9375c [-] IN : remove warnings while upgrading gRoussac 2013-09-09 00:10:03 +02:00
• 9c756a7fcb [-] IN : Do not duplicate images types when coming from 1.4, update it gRoussac 2013-09-08 23:22:36 +02:00
• 6b03af9ef9 [-] BO : ini_get('safe_mode') can return false gRoussac 2013-09-08 22:26:21 +02:00
• ec556bb307 // remove Warning on array_map() gRoussac 2013-09-08 20:01:55 +02:00
• e6f8dba2e6 // remove Notice: Undefined index gRoussac 2013-09-08 19:55:03 +02:00
• 25ba388d69 [-] IN : fix bad pathes gRoussac 2013-09-08 18:29:06 +02:00
• e5337f5e76 [-] IN : Do not test module names if they are not directories gRoussac 2013-09-08 18:25:54 +02:00
• 683513a9d2 [-] IN : Remove fails on upgrade coming to loop when upgrading again gRoussac 2013-09-08 17:29:00 +02:00
• 19a6c4373e [-] IN : Remove warnings when safe_mode open_basedir missconfigured gRoussac 2013-09-08 17:25:59 +02:00
• 2874f14983 [-] CORE : Fix bug #PSCFV-10040 Notice: Undefined index: unifunc && Fatal error: Function name must be a string on some PHP version with empty cache folder and smarty cache enabled gRoussac 2013-09-06 23:55:58 +02:00