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

• 953f4c4686 // Fixed login social links Damien Metzger 2013-10-15 18:08:44 +02:00
• a85c1d7933 // Add index.php files to dashboard folder Jerome Nadaud 2013-10-15 18:05:02 +02:00
• 2157311f11 // Some improvement for range datepicker Jerome Nadaud 2013-10-15 18:04:28 +02:00
• 237b950eb6 [-] FO : #PSCFV-10640 again, bad assignement gRoussac 2013-10-15 16:35:58 +02:00
• 6c6c3b240e // Fix bug display final price when country have no display tax Jerome Nadaud 2013-10-15 15:06:38 +02:00
• 7ae9832992 // small cast gRoussac 2013-10-15 14:56:25 +02:00
• 81497be5ab [-] Fo : Fix bug #PSCFV-10640, redirect loop when country address is not among active countries in OPC gRoussac 2013-10-15 14:53:44 +02:00
• 5fd6b9aac6 // Add overflow-y to module payments Jerome Nadaud 2013-10-15 14:53:31 +02:00
• eed6b65914 // Added Addons block in the dashboard Damien Metzger 2013-10-15 14:18:50 +02:00
• 7759bfaa66 // Typo Damien Metzger 2013-10-15 14:00:37 +02:00
• 7b307094b6 // Added comparison to the dashboard Damien Metzger 2013-10-15 13:51:57 +02:00
• d19b0ed8e0 // icon for error notice Kevin Granger 2013-10-15 12:31:17 +02:00
• d23714e9e8 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-10-15 12:11:15 +02:00
• d1bc5eb6e0 // calendar WIP Kevin Granger 2013-10-15 12:10:05 +02:00
• 55fad19954 // Updated dashactivity Damien Metzger 2013-10-15 11:17:14 +02:00
• 837ca34e7e [-] Core: Product::getPriceStatic called with 1 quantity return the specific price for 1 qty if called with id_cart = 0 Rémi Gaillard 2013-10-15 10:30:48 +02:00
• 9c861642a5 [-] BO : AdminImport, wrong default separators gRoussac 2013-10-15 10:09:16 +02:00
• dec9ef40a8 Merge pull request #841 from indesign47/patch-10 Gregory Roussac 2013-10-15 01:03:33 -07:00
• bd95d03e37 //blockwishlist now use boostrap design Vincent Augagneur 2013-10-15 09:30:26 +02:00
• b4e18954f9 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development djfm 2013-10-15 07:22:03 +00:00
• fd2dc4ff64 [-] Classes : Modules listing and case insensitive Francois Gaillard 2013-10-15 09:14:49 +02:00
• f25a418785 Update Alias.php indesign47 2013-10-14 19:20:38 +02:00
• 6f4b85430c // Fix listings and sort Rémi Gaillard 2013-10-14 18:52:48 +02:00
• 7d85b21e92 // Pagination fix Jerome Nadaud 2013-10-14 18:22:55 +02:00
• 2bc927c810 // login css Kevin Granger 2013-10-14 18:08:33 +02:00
• 2a28e47650 Merge pull request #799 from Lupul/development Gregory Roussac 2013-10-14 08:37:28 -07:00
• 7e4329a4dc Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Jerome Nadaud 2013-10-14 17:31:50 +02:00
• 7e9cdbb163 // Pagination fix Jerome Nadaud 2013-10-14 17:30:56 +02:00
• 07073afa1f // Fix CMS filter, reset and sort Jerome Nadaud 2013-10-14 17:28:21 +02:00
• f3755e2d0a Merge pull request #843 from ldecoker/patch-10 Gregory Roussac 2013-10-14 07:46:56 -07:00
• bce6e8f09f Merge pull request #837 from axometeam/patch-21 Gregory Roussac 2013-10-14 07:45:52 -07:00
• 3eeac7f2bb Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-10-14 16:35:01 +02:00
• 3f22a6b6c9 // login flip Kevin Granger 2013-10-14 16:34:02 +02:00
• cc8ec4fd45 [-] CORE : Fix bug #PSCFV-10687 bad conversion for accentuated Y and W, thanks @mike15 gRoussac 2013-10-14 16:03:50 +02:00
• 7742020606 // small fix Rémi Gaillard 2013-10-14 15:59:48 +02:00
• fa6d09a756 // Fixed warning Damien Metzger 2013-10-14 15:56:53 +02:00
• 8f10e42b60 // Small fixes Damien Metzger 2013-10-11 16:47:32 +02:00
• 80f6f4e223 [-] FO : Fix bug #PSCFV-10688, bad priceDisplay in order-carrier gRoussac 2013-10-14 15:34:47 +02:00
• 4da04275fe //small fix related to 1316bd7e1f Vincent Augagneur 2013-10-14 15:07:50 +02:00
• f4118c4f9d // Fix some table header column title Jerome Nadaud 2013-10-14 15:06:09 +02:00
• b9c6b0e8af //dateofdelivery now use bootstrap design Vincent Augagneur 2013-10-14 14:55:56 +02:00
• 50002ec714 [-] FO : Fix #PSCFV-10690 again, change just on directories gRoussac 2013-10-14 14:23:26 +02:00
• c6e3e28894 [-] FO : Fix bug #PSCFV-10690 could not index a category beacause of robot.txt gRoussac 2013-10-14 14:20:11 +02:00
• 6d3a15ef5b Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-10-14 14:18:06 +02:00
• f8edca8ac8 [-] IN : Fix bug #PSCFV-10539 duplicate "address" url rewrite in meta.xml for Russian gRoussac 2013-10-14 13:59:19 +02:00
• 67dc7aac04 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-10-14 12:21:29 +02:00
• 2a54296b96 [-] BO : Fix bug #PSCFV-10692, AdminImport bad utf8 cars for subst gRoussac 2013-10-14 12:11:47 +02:00
• 1adfa1584c Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-10-14 11:37:51 +02:00
• 1358c696cd [-] BO : Fix #PSCFV-10678 warning in chrome gRoussac 2013-10-14 11:37:15 +02:00
• 833091674c // Adding translations and PHP date format for datepicker Jerome Nadaud 2013-10-14 11:34:04 +02:00
• 5e407db21e [*] LO : Fixed a few bugs with currency formats in Back-Office orders djfm 2013-10-14 09:30:45 +00:00
• 3282bd19e4 // Small fix Jerome Nadaud 2013-10-14 10:59:20 +02:00
• 3bc02bbe10 // fields are already correctly formated when they are in a object coming from the database Rémi Gaillard 2013-10-14 10:56:38 +02:00
• af9182dad5 [-] CORE , follow up https://github.com/kiropowered/PrestaShop/commit/b87e934a66a15d4f68e573f5afa9494505a60e28 and https://github.com/kiropowered/PrestaShop/commit/a10dcab6e74d138a2f3a3f558ec7d66b1e9d9e10 gRoussac 2013-10-14 10:51:17 +02:00
• 3539eb3697 Merge pull request #842 from kiropowered/patch-1 Gregory Roussac 2013-10-14 01:30:30 -07:00
• 59435fa2ee // login flip WIP Kevin Granger 2013-10-14 09:57:02 +02:00
• a377ecd571 Update Meta.php ldecoker 2013-10-14 09:53:50 +02:00
• 8d7e96176c SEO - make sure module and controller name are in lowercase ldecoker 2013-10-14 09:38:04 +02:00
• 80c8605264 // Adding RTL to calendar helper Jerome Nadaud 2013-10-14 09:14:18 +02:00
• 892516342e // Fix when date is null Jérôme Nadaud 2013-10-13 11:47:29 +02:00
• f9cfde9a05 [-] MO : Trackingfront, could not load employee stats date gRoussac 2013-10-12 23:24:32 +02:00
• ee29f4365e [-] FO : Copuld not load datepicker in trackingfront stats.php gRoussac 2013-10-12 17:54:26 +02:00
• a10dcab6e7 Update StockMvt.php kiropowered 2013-10-12 14:28:27 +02:00
• 0a441b9a4b Update Alias.php indesign47 2013-10-12 11:49:27 +02:00
• 4f9191fe0c Update form.tpl indesign47 2013-10-12 11:45:07 +02:00
• 2afbe8fd04 Create alias_import.csv indesign47 2013-10-12 11:39:29 +02:00
• 85c6e799c3 [+] BO : AdminImport add entity Alias indesign47 2013-10-12 11:33:36 +02:00
• 418155cf2b Merge pull request #838 from pelTek/patch-1 Gregory Roussac 2013-10-11 11:52:22 -07:00
• 3f6139be42 BO: added UPC and EAN search Chris 2013-10-11 21:02:01 +03:00
• e47f0a7c68 // Adding stats compare date to employee table Jerome Nadaud 2013-10-11 18:34:20 +02:00
• 0fe3630a05 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Jerome Nadaud 2013-10-11 18:30:16 +02:00
• d575ba8273 // Adding compare dates to date range picker Jerome Nadaud 2013-10-11 18:30:05 +02:00
• 89251a667b // feedback button Kevin Granger 2013-10-11 18:26:12 +02:00
• 9d5a9225e5 Correct some "bad query" in the admin products getList Axome 2013-10-11 18:17:55 +02:00
• 0dbaa59985 Merge pull request #836 from mkdgs/patch-1 Gregory Roussac 2013-10-11 09:05:15 -07:00
• 06c62c1684 [-] WS: Fix #PSCFV-10672 order by ID for non multishop entities Rémi Gaillard 2013-10-11 17:53:15 +02:00
• 0f9c81a683 [-] BO : FixBug #PSCFV-10671 - remove htmlentities on customer message Jerome Nadaud 2013-10-11 17:29:44 +02:00
• cfa4d72eab Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-10-11 17:22:06 +02:00
• 41f5d9f1f1 // fix datepicker Kevin Granger 2013-10-11 17:21:45 +02:00
• 18690e4b9a // Adding update for customer message Jerome Nadaud 2013-10-11 17:17:58 +02:00
• a07733fcec [-] BO : Could not insert referrer id_connections_source can not be null gRoussac 2013-10-11 16:52:53 +02:00
• eff3f6f713 A new version of my precedent pull-request Axome 2013-10-11 16:52:14 +02:00
• 1786f8e907 Update blocktopmenu.php Mickael Desgranges 2013-10-11 16:42:21 +02:00
• 9fc9df6ba4 Merge remote-tracking branch 'origin/development' into development Fabio Chelly 2013-10-11 16:38:09 +02:00
• 9e3b82e8ed [*] BO Module productcomments: JS variables are correctly escaped. Padding in error message has also been pushed to theme tpl Fabio Chelly 2013-10-11 16:37:26 +02:00
• eff292731f // Fixed typo Damien Metzger 2013-10-11 16:35:49 +02:00
• 8cfe9a2065 [-] Bo : Could not update mailalert 2.5 with id_lang missing gRoussac 2013-10-11 15:51:02 +02:00
• d2ecdfb93d // fix dashboard modules upgrade Damien Metzger 2013-10-11 16:18:37 +02:00
• 0e91352520 // Dashboard update Damien Metzger 2013-10-11 16:10:08 +02:00
• 0f28393c8f // Fix data range picker Jerome Nadaud 2013-10-11 16:16:03 +02:00
• bedcacf0b4 // Starting development of data range picker Jerome Nadaud 2013-10-11 16:12:40 +02:00
• 45e9040606 [-] Bo : Could not update mailarler 2.5 with id_mlang gRoussac 2013-10-11 15:51:02 +02:00
• 1849995291 // Code cleaning Damien Metzger 2013-10-11 15:35:45 +02:00
• dcf7e48f6e // datepicker stylesheet Kevin Granger 2013-10-11 15:04:14 +02:00
• 5bcacf9b48 //statsdata now use boostrap design Vincent Augagneur 2013-10-11 14:38:18 +02:00
• 38a7e90eff //referralprogram now use boostrap design Vincent Augagneur 2013-10-11 14:29:56 +02:00
• 6b52ada195 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Rémi Gaillard 2013-10-11 14:11:28 +02:00
• 1316bd7e1f // add check stock value for color list if needed Rémi Gaillard 2013-10-11 14:11:12 +02:00
• 7a5187e84e // Fix module active Damien Metzger 2013-10-11 14:11:01 +02:00
• 809eac6308 // Fix upgrade and dashboard Damien Metzger 2013-10-11 14:06:49 +02:00