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

• e56ec2f234 // BO : Changed product display on supplier page Damien Metzger 2013-04-29 18:34:19 +02:00
• 548ef7691a // BO : Changed product display on supplier page Damien Metzger 2013-04-29 18:34:19 +02:00
• 7f8a33763a // Fixed image import Dragan Skrbic 2013-04-29 18:07:42 +02:00
• d00ccdf306 // Fixed image import Dragan Skrbic 2013-04-29 18:07:42 +02:00
• 7eba77ae66 // Fixed case which caused duplicated translation #PSCFV-8936 Damien Metzger 2013-04-29 17:45:29 +02:00
• 4c259393f5 // Fixed case which caused duplicated translation #PSCFV-8936 Damien Metzger 2013-04-29 17:45:29 +02:00
• 3600a31862 [-] BO : fixed image import with allow_url_fopen deactivated #PSCFV-8181 Damien Metzger 2013-04-29 17:11:17 +02:00
• 989b19d94a [-] BO : fixed image import with allow_url_fopen deactivated #PSCFV-8181 Damien Metzger 2013-04-29 17:11:17 +02:00
• d2d4b68f7c // typo gRoussac 2013-04-29 17:19:07 +02:00
• 88adba8e5b // typo gRoussac 2013-04-29 17:19:07 +02:00
• 140b9b2bba // rework of https://github.com/PrestaShop/PrestaShop/commit/5f6d0614df4bf7d354988dd7320d012238488401#commitcomment-3108107 gRoussac 2013-04-29 17:12:17 +02:00
• 78747eedc2 // rework of https://github.com/PrestaShop/PrestaShop/commit/5f6d0614df4bf7d354988dd7320d012238488401#commitcomment-3108107 gRoussac 2013-04-29 17:12:17 +02:00
• 7afdb08a56 // revert from commit 5f6d0614df gRoussac 2013-04-29 17:03:41 +02:00
• 9ce2249883 // revert from commit 5f6d0614df gRoussac 2013-04-29 17:03:41 +02:00
• 7b1c50b97f Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2013-04-29 16:21:51 +02:00
• 716b79b8c6 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2013-04-29 16:21:51 +02:00
• f58c8e7a93 Merged Pull Request #242 - thanks @andskiba vAugagneur 2013-04-29 16:21:33 +02:00
• acccaf5fbc Merged Pull Request #242 - thanks @andskiba vAugagneur 2013-04-29 16:21:33 +02:00
• 051adc7b36 [-] BO : bug in BO translations when Windows OS ccauw 2013-04-29 16:00:55 +03:00
• bfc8a0ad02 [-] BO: Fix #PSCFV-8957 order creation when id_cart=0 is present in database but should normally not happen Rémi Gaillard 2013-04-29 13:47:46 +02:00
• dc7f1ceddf [-] BO: Fix #PSCFV-8957 order creation when id_cart=0 is present in database but should normally not happen Rémi Gaillard 2013-04-29 13:47:46 +02:00
• e036d47d13 Merge pull request #389 from ccauw/patch-5 Vincent Augagneur 2013-04-29 03:11:40 -07:00
• d0f6f2b6c7 Merge pull request #389 from ccauw/patch-5 Vincent Augagneur 2013-04-29 03:11:40 -07:00
• 94090e2a39 // Fixed directory creation in translation #PSCFV-8212 Damien Metzger 2013-04-29 12:08:45 +02:00
• 527f87a691 // Fixed directory creation in translation #PSCFV-8212 Damien Metzger 2013-04-29 12:08:45 +02:00
• 71c3f2e71f [-] FO : removed misleading label on the shipping total #PSCFV-8556 Damien Metzger 2013-04-29 11:35:47 +02:00
• 3b5591dc55 [-] FO : removed misleading label on the shipping total #PSCFV-8556 Damien Metzger 2013-04-29 11:35:47 +02:00
• 43a897436a [-] BO : fixed automatic creation of email overrides in the template #PSCFV-8785 Damien Metzger 2013-04-29 11:16:26 +02:00
• c587934e25 [-] BO : fixed automatic creation of email overrides in the template #PSCFV-8785 Damien Metzger 2013-04-29 11:16:26 +02:00
• 49b5d3ab02 [-] FO : fixed truncate and entities in the cart block #PSCFV-8870 Damien Metzger 2013-04-29 10:52:44 +02:00
• a06b42704e [-] FO : fixed truncate and entities in the cart block #PSCFV-8870 Damien Metzger 2013-04-29 10:52:44 +02:00
• 459768d1ac [-] BO : fixed error message in language form #PSCFV-8890 Damien Metzger 2013-04-29 10:47:19 +02:00
• 903b17979c [-] BO : fixed error message in language form #PSCFV-8890 Damien Metzger 2013-04-29 10:47:19 +02:00
• 626009d157 Merge pull request #259 from ldecoker/patch-3 Vincent Augagneur 2013-04-29 01:38:17 -07:00
• 795d7aa952 Merge pull request #259 from ldecoker/patch-3 Vincent Augagneur 2013-04-29 01:38:17 -07:00
• bb59365004 Merge pull request #291 from minicstudio/development Vincent Augagneur 2013-04-29 01:35:38 -07:00
• ad3ba5342d Merge pull request #291 from minicstudio/development Vincent Augagneur 2013-04-29 01:35:38 -07:00
• 218a76c443 Merge pull request #310 from Patanock/patch-5 Vincent Augagneur 2013-04-29 01:31:16 -07:00
• ad17dbc700 Merge pull request #310 from Patanock/patch-5 Vincent Augagneur 2013-04-29 01:31:16 -07:00
• e4323f18f4 Merge pull request #411 from MyBB-Services/dev/gb/mailcolor Vincent Augagneur 2013-04-29 01:28:19 -07:00
• 83bc226508 Merge pull request #411 from MyBB-Services/dev/gb/mailcolor Vincent Augagneur 2013-04-29 01:28:19 -07:00
• fe05e1cc39 Merge pull request #330 from DrySs/patch-5 Vincent Augagneur 2013-04-29 01:22:21 -07:00
• 5438a131b4 Merge pull request #330 from DrySs/patch-5 Vincent Augagneur 2013-04-29 01:22:21 -07:00
• 83088a1905 [*] Mails : delete a hard-coded pink background Grégoire Bélorgey 2013-04-29 10:21:53 +02:00
• 0fed37eecd [*] Mails : delete a hard-coded pink background Grégoire Bélorgey 2013-04-29 10:21:53 +02:00
• 8331ab0c1a [-]BO : bug color parameter in List ccauw 2013-04-28 16:01:55 +03:00
• 25b42744c8 Wrong link in CONTRIBUTING.md Grégoire Bélorgey 2013-04-28 11:51:50 +02:00
• f21ddef3cc Wrong link in CONTRIBUTING.md Grégoire Bélorgey 2013-04-28 11:51:50 +02:00
• 4b52f6da2e Replacing the default pinkish background with a grey one, and put the text in {color} Grégoire Bélorgey 2013-04-28 11:13:46 +02:00
• 1a81461965 Replacing the default pinkish background with a grey one, and put the text in {color} Grégoire Bélorgey 2013-04-28 11:13:46 +02:00
• 71b8e7cc33 // small fix Rémi Gaillard 2013-04-26 16:07:32 +02:00
• 9ec979cd29 // small fix Rémi Gaillard 2013-04-26 16:07:32 +02:00
• 1e6b8dd92b Merge pull request #408 from djfm/development Damien Metzger 2013-04-26 06:33:36 -07:00
• 83167fee67 Merge pull request #408 from djfm/development Damien Metzger 2013-04-26 06:33:36 -07:00
• 60ea65d5fb Merge pull request #407 from zecrazytux/fixracecondition Rémi Gaillard 2013-04-26 06:24:56 -07:00
• 41d93d1c66 Merge pull request #407 from zecrazytux/fixracecondition Rémi Gaillard 2013-04-26 06:24:56 -07:00
• 4c180685e1 [*] LO : Updated it & nl localization files djfm 2013-04-26 15:20:19 +02:00
• 650fef032e [*] LO : Updated it & nl localization files djfm 2013-04-26 15:20:19 +02:00
• 2ac6e52c9f [-] Fixes a race condition Sébastien Bocahu 2013-04-26 14:28:01 +02:00
• fd88ac76be [-] Fixes a race condition Sébastien Bocahu 2013-04-26 14:28:01 +02:00
• ea6b4eaef8 // Fixed installer translation Damien Metzger 2013-04-26 14:09:23 +02:00
• 9edf97ee52 // Fixed installer translation Damien Metzger 2013-04-26 14:09:23 +02:00
• 0f08250e92 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2013-04-26 12:19:25 +02:00
• 0c71bda9e6 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2013-04-26 12:19:25 +02:00
• 21aa134774 [-] BO : fixed bug #PSCFV-7411 - Store location problem with some longitude values vAugagneur 2013-04-26 12:19:20 +02:00
• 231614290a [-] BO : fixed bug #PSCFV-7411 - Store location problem with some longitude values vAugagneur 2013-04-26 12:19:20 +02:00
• 135689fc1f // small fix on php-cli installer Rémi Gaillard 2013-04-26 11:54:05 +02:00
• 821c8c0f3f // small fix on php-cli installer Rémi Gaillard 2013-04-26 11:54:05 +02:00
• 9983b1723f [-] MO : fixed bug #PSCFV-7703 - Images for bank wire, cheque and cash payment missing on Order Summary vAugagneur 2013-04-26 10:30:17 +02:00
• fc14c79521 [-] MO : fixed bug #PSCFV-7703 - Images for bank wire, cheque and cash payment missing on Order Summary vAugagneur 2013-04-26 10:30:17 +02:00
• a0867d3a92 [-] CORE : fixed PHP Notice: Undefined index: date_expiration on virtual product vAugagneur 2013-04-26 10:15:54 +02:00
• 48ee7b417d [-] CORE : fixed PHP Notice: Undefined index: date_expiration on virtual product vAugagneur 2013-04-26 10:15:54 +02:00
• d58377bf37 //small css fix in installer vAugagneur 2013-04-26 09:44:51 +02:00
• 8b590af1c7 //small css fix in installer vAugagneur 2013-04-26 09:44:51 +02:00
• 23239ef680 [-] BO : Fix bug #PSCFI-7141, wrong quantity and sales number in Product Sales, thankx to @Tuan Tran gRoussac 2013-04-25 18:02:33 +02:00
• 1dabfcef6a [-] BO : Fix bug #PSCFI-7141, wrong quantity and sales number in Product Sales, thankx to @Tuan Tran gRoussac 2013-04-25 18:02:33 +02:00
• 1921668596 [-] BO : Fixed display when you translate modules without theme selected Damien Metzger 2013-04-25 17:47:07 +02:00
• 6251815c37 [-] BO : Fixed display when you translate modules without theme selected Damien Metzger 2013-04-25 17:47:07 +02:00
• bc87fc478c // Fix homeslider upgrade Damien Metzger 2013-04-25 17:21:19 +02:00
• 829a0b482a // Fix homeslider upgrade Damien Metzger 2013-04-25 17:21:19 +02:00
• a994c93dee Progressive JPEG Otto Nascarella 2013-04-25 12:18:50 -03:00
• 8d735b333f // Release branch merged Francois Gaillard 2013-04-25 17:00:56 +02:00
• 6106066ef1 // Release branch merged François Gaillard 2013-04-25 17:00:56 +02:00
• 062759808e // CHANGELOG 1.5.4.1 Francois Gaillard 2013-04-25 16:59:40 +02:00
• 056709f2dd // CHANGELOG 1.5.4.1 1.5.4.1 François Gaillard 2013-04-25 16:59:40 +02:00
• 4b8b7f34d0 Merge pull request #404 from MrManchot/patch-5 Vincent Augagneur 2013-04-25 05:48:24 -07:00
• f0da3fa2ae Merge pull request #404 from MrManchot/patch-5 Vincent Augagneur 2013-04-25 05:48:24 -07:00
• a56e4fa62d // delete char Rémi Gaillard 2013-04-25 14:20:27 +02:00
• eb7cf3dbbb // delete char Rémi Gaillard 2013-04-25 14:20:27 +02:00
• 8f23902023 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release Rémi Gaillard 2013-04-25 11:41:09 +02:00
• 5ac2a0d946 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release Rémi Gaillard 2013-04-25 11:41:09 +02:00
• 7f372216cc // update default languages pack Rémi Gaillard 2013-04-25 11:40:54 +02:00
• 17209a1725 // update default languages pack Rémi Gaillard 2013-04-25 11:40:54 +02:00
• 0c52150021 // Added english pack in the installer Damien Metzger 2013-04-25 11:29:19 +02:00
• 907047165b // Added english pack in the installer Damien Metzger 2013-04-25 11:29:19 +02:00
• d5817a56cc Double 'id_image' definition in product getList Cédric MouleyreandRémi Gaillard 2013-04-25 11:31:10 +03:00
• a8b89d7411 Double 'id_image' definition in product getList Cédric MouleyreandRémi Gaillard 2013-04-25 11:31:10 +03:00
• 36b0eae84f Merge pull request #403 from MrManchot/patch-4 Rémi Gaillard 2013-04-25 02:23:16 -07:00
• cde13e7707 Merge pull request #403 from MrManchot/patch-4 Rémi Gaillard 2013-04-25 02:23:16 -07:00
• 2ba2336df4 Merge pull request #402 from djfm/release Damien Metzger 2013-04-25 02:17:35 -07:00