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

• ae98bcd86b // php warning rGaillard 2013-12-06 18:40:44 +01:00
• 746c74dfac // id of root category could be different of 1 rGaillard 2013-12-06 18:34:50 +01:00
• c5ff838fca // Blocklayered starting code refacto Jerome Nadaud 2013-12-06 18:12:04 +01:00
• a569ab7e33 // Fix tree shop missing attributes Jerome Nadaud 2013-12-06 18:11:06 +01:00
• adf158a0c3 // small fix rGaillard 2013-12-06 17:31:09 +01:00
• 95d5e9d819 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 Kevin Granger 2013-12-06 17:25:23 +01:00
• 71ac20c819 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 Kevin Granger 2013-12-06 17:24:00 +01:00
• cfee36f609 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 sLorenzini 2013-12-06 17:19:59 +01:00
• 31c5f204b1 // update pages for w3c sLorenzini 2013-12-06 17:19:49 +01:00
• db37e42b21 // checkout W3C valid - wip Kevin Granger 2013-12-06 17:19:47 +01:00
• ed5496479d // removed console.log() Kevin Granger 2013-12-06 17:18:20 +01:00
• 03e0cb7515 // break line gRoussac 2013-12-06 17:09:14 +01:00
• b2204aac6e Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 gRoussac 2013-12-06 17:06:46 +01:00
• 99fe216413 [*] FO : Move both sliders module on new hook gRoussac 2013-12-06 17:05:39 +01:00
• aecbc18779 Merge pull request #1107 from djfm/import Jérôme Nadaud 2013-12-06 07:54:27 -08:00
• 6419f6a7ad // fixed bug with ordering of JS files in AdminImport djfm 2013-12-06 15:47:29 +00:00
• 97937a8aa1 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 sLorenzini 2013-12-06 15:57:50 +01:00
• ff08c1311b // update my account page for w3c sLorenzini 2013-12-06 15:57:38 +01:00
• 74b16defa8 // themeconfigurator install failed gRoussac 2013-12-06 15:53:33 +01:00
• 9f106d06ef // valid W3C checkout - WIP Kevin Granger 2013-12-06 15:43:12 +01:00
• 0d374e5501 // new hook rGaillard 2013-12-06 14:54:45 +01:00
• 0af0601cc7 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 gRoussac 2013-12-06 12:18:59 +01:00
• 33e9c2c132 [-] FO : Remove bad links on home tabs gRoussac 2013-12-06 12:12:54 +01:00
• d4f73213cb // checkout - shopping cart W3C valid Kevin Granger 2013-12-06 12:12:21 +01:00
• da3ca98dfd // remove default theme gRoussac 2013-12-06 12:00:34 +01:00
• 946d5520f8 // nomrs gRoussac 2013-12-06 11:42:28 +01:00
• 669a49be59 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 Vincent Augagneur 2013-12-06 10:17:12 +01:00
• c2e0edcc7a [-] BO : carrier wizard no fees display Vincent Augagneur 2013-12-06 10:17:07 +01:00
• 5e18a94d2a // employee avatar on the logs listing rGaillard 2013-12-05 19:16:43 +01:00
• 0067eff263 // working on W3C validation Kevin Granger 2013-12-05 18:50:50 +01:00
• ddcade285f [-] CORE : Ensure correct parent category for home categories Jerome Nadaud 2013-12-05 18:37:49 +01:00
• 134914dc1a // invisible char rGaillard 2013-12-05 18:13:45 +01:00
• df2e2280ea Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 sLorenzini 2013-12-05 17:59:25 +01:00
• 1f1b3974cf // update itemprop on product page + w3c bug on address.tpl sLorenzini 2013-12-05 17:59:13 +01:00
• d50999fde0 [-] Core: Fix #PSCFV-11165 numerical configuration values should not be overridden if the value is the same between shop and global context rGaillard 2013-12-05 17:17:35 +01:00
• 3975599023 [- ] CORE : Fix bug #PSCFV-10627, bad default shoip currency && Shop::getEntityIds returning deleted currency gRoussac 2013-12-05 16:47:05 +01:00
• 9dd82367f3 // Product compare almost W3C valid -> #availability_value must be change with a class Kevin Granger 2013-12-05 16:27:10 +01:00
• f128dac9c4 // small fix rGaillard 2013-12-05 15:59:14 +01:00
• 02b6e24ca4 // category page almost W3C valid Kevin Granger 2013-12-05 15:27:40 +01:00
• c0e8794947 // make product.tpl human readable ;) Kevin Granger 2013-12-05 14:42:22 +01:00
• 0261096f4d Merge pull request #1105 from PhpMadman/1.6-CSVAvancedFixes Gregory Roussac 2013-12-05 04:28:31 -08:00
• 9df713e6ec [-] BO : Fixes for Advanced Stock Management Import [*] BO : Combinations import supports Advanced Stock Management [*] BO : Advanced Stock Management import now supports stock increase [*] BO : Advanced Stock Management stock unit price uses wholesale_price (Product Cost) or 0.00001 if not set [*] BO : Added Advanced Stock Management to csv import docs PhpMadman 2013-12-05 12:30:17 +01:00
• 185d02b290 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 gRoussac 2013-12-05 11:27:20 +01:00
• 3889f6d61f // follow up https://github.com/PrestaShop/PrestaShop/commit/7140a63272fa2de5f7368a062d7fde79ca89d692#commitcomment-4775950 gRoussac 2013-12-05 11:27:07 +01:00
• e52652f96f Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 rGaillard 2013-12-05 11:26:39 +01:00
• acd0bbc366 // php warning rGaillard 2013-12-05 11:26:26 +01:00
• 9850eeb3e5 // Fix category delete cancel button Jerome Nadaud 2013-12-05 11:00:58 +01:00
• a82919b023 Merge pull request #1100 from djfm/1.6 Jérôme Nadaud 2013-12-05 01:47:05 -08:00
• 5e9db96f61 // home is valid W3C! Kevin Granger 2013-12-05 10:38:59 +01:00
• 7117a6f4fd [-] BO : fixed bug #PSCSX-76 - carrier wizard fees not display after reload carrier Vincent Augagneur 2013-12-05 10:35:51 +01:00
• 04d2ff59ee // fix product list + facebook block HTML5 version WIP Kevin Granger 2013-12-04 19:31:02 +01:00
• ec8ca92e67 // norms gRoussac 2013-12-04 18:49:34 +01:00
• 7140a63272 Merge branch '1.6-CSVAdvanced' of https://github.com/PhpMadman/PrestaShop into PhpMadman-1.6-CSVAdvanced gRoussac 2013-12-04 18:39:33 +01:00
• 36a70d83d5 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 Vincent Augagneur 2013-12-04 18:31:19 +01:00
• b1304f0379 //carrier wizard range table auto size Vincent Augagneur 2013-12-04 18:27:08 +01:00
• 72be705759 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 gRoussac 2013-12-04 17:53:01 +01:00
• d81426bab2 Merge pull request #1102 from glafarge/patch-1 Gregory Roussac 2013-12-04 08:52:02 -08:00
• 8f34b61eec Merge pull request #1101 from kpodemski/patch-1 Gregory Roussac 2013-12-04 08:48:23 -08:00
• 39ded96964 Fix newline trim Guillaume Lafarge 2013-12-04 17:42:32 +01:00
• 96fd3f3d32 [+] BO : Merge of https://github.com/PrestaShop/PrestaShop/pull/570 gRoussac 2013-12-04 17:41:10 +01:00
• d1959f87d4 // fixed bug url "add to cart" in product-list sLorenzini 2013-12-04 17:35:16 +01:00
• 2db8c21376 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 sLorenzini 2013-12-04 17:29:46 +01:00
• 4285882949 // update indent code sLorenzini 2013-12-04 17:29:35 +01:00
• 665c5d155d [*] CORE: original search_query assign to .tpl Krystian Podemski 2013-12-04 17:24:30 +01:00
• e90dafe7b1 // more descriptive labels in dashactivity djfm 2013-12-04 16:18:22 +00:00
• ab71b813be [-] BO : fixed top right link with the "open in a new tab" button Damien Metzger 2013-12-04 17:00:12 +01:00
• e702aca520 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 sLorenzini 2013-12-04 16:59:14 +01:00
• ad1c7b3962 // update product-list itemproperty sLorenzini 2013-12-04 16:59:00 +01:00
• 33b5327b4d // data-id-product instead of using rel tag Kevin Granger 2013-12-04 16:58:34 +01:00
• 08cb7ee566 Merge pull request #1099 from djfm/blocktopmenu Gregory Roussac 2013-12-04 07:11:51 -08:00
• fa804b9bf8 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 Damien Metzger 2013-12-04 16:06:55 +01:00
• 2f088c4ac3 [*] BO : changed dashgoals system Damien Metzger 2013-12-04 16:06:42 +01:00
• a8e6dfe7f5 // fixed undefined variable in blocktopmenu djfm 2013-12-04 15:03:04 +00:00
• b450a9fa80 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 Kevin Granger 2013-12-04 15:48:16 +01:00
• ad6ed3dcf1 // data-id-product instead of using rel tag Kevin Granger 2013-12-04 15:46:42 +01:00
• 79198487ac Merge pull request #1098 from djfm/1.6 Rémi Gaillard 2013-12-04 06:19:39 -08:00
• 32237777e3 Merge branch '1.6' of https://github.com/PrestaShop/PrestaShop into 1.6 sLorenzini 2013-12-04 15:18:13 +01:00
• c127f9765a // update code on footer and header sLorenzini 2013-12-04 15:17:35 +01:00
• cb9dd448e1 // another typo in default theme blockcart.tpl djfm 2013-12-04 14:14:01 +00:00
• 73e3e447f6 // typo in default theme blockcart.tpl djfm 2013-12-04 14:09:34 +00:00
• 90f5560cb3 // add new hook on product comparator rGaillard 2013-12-04 14:43:09 +01:00
• a7f20fd986 Merge pull request #1097 from TMMeilleur/1.6 Rémi Gaillard 2013-12-04 05:34:09 -08:00
• 4ba424a72f adedd social's buttons on products compare page TMMeilleur 2013-12-04 14:12:36 +02:00
• f6fed64472 [*] BO : Merge of https://github.com/PrestaShop/PrestaShop/pull/636 gRoussac 2013-12-04 12:14:51 +01:00
• be91ec02f2 // fix modules filter after category change rGaillard 2013-12-04 12:03:12 +01:00
• e505588688 [-] IN : Merge of https://github.com/PrestaShop/PrestaShop/pull/1095 gRoussac 2013-12-04 11:47:14 +01:00
• 68edf085d4 // fix «enter» on retrieve password panel Kevin Granger 2013-12-04 11:29:21 +01:00
• 97dabf5b74 // upadate banner Kevin Granger 2013-12-04 10:00:40 +01:00
• 360d68c5f7 Merge pull request #1091 from TMMeilleur/1.6 Rémi Gaillard 2013-12-04 00:45:33 -08:00
• 689fcb005d small fixes TMMeilleur 2013-12-04 10:08:35 +02:00
• f274103b0e Merge pull request #1086 from rhyslk/1.6 Jérôme Nadaud 2013-12-03 22:25:17 -08:00
• 9eea7203fe Merge pull request #1084 from PhpMadman/1.6-ShipMaxInput Gregory Roussac 2013-12-03 11:43:32 -08:00
• 6640e47781 [*] LO : Corrected units for weight/volume/distance Rhys 2013-12-03 19:12:27 +00:00
• 8949382e00 [-] BO : Better maxlength on shippinh input fields PhpMadman 2013-12-03 19:38:28 +01:00
• 81481d6105 [*] FO : Merge of https://github.com/PrestaShop/PrestaShop/pull/48 gRoussac 2013-12-03 19:24:31 +01:00
• 03239a32ea Merge pull request #1082 from xBorderie/patch-1 Jérôme Nadaud 2013-12-03 09:50:32 -08:00
• 3115008443 Added an "About this repository" section. Xavier 2013-12-03 18:49:14 +01:00
• b657115552 // Fixed bad entities in KPI Damien Metzger 2013-12-03 18:12:02 +01:00
• 5a5c754dab // clean css Kevin Granger 2013-12-03 17:43:49 +01:00
• 3f2ce54efd // gamification + multishop wip Kevin Granger 2013-12-03 15:21:13 +01:00