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

• 2a9ebaa6ed Merge pull request #920 from djfm/bootstrap Damien Metzger 2013-11-04 09:07:41 -08:00
• 71e3a8a937 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap djfm 2013-11-04 16:58:17 +00:00
• 5372f31b4c // updated English emails djfm 2013-11-04 16:57:50 +00:00
• b650c349d5 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Jerome Nadaud 2013-11-04 17:47:46 +01:00
• 5af2ef38a1 // Fix Tagify javascript error Jerome Nadaud 2013-11-04 17:47:27 +01:00
• 9611c17980 // removed install.css http://www.youtube.com/watch?v=Y9mq7Qc4oSM Kevin Granger 2013-11-04 17:28:50 +01:00
• 2c3a5c553d // small fix Rémi Gaillard 2013-11-04 17:22:08 +01:00
• 0a65de5e5f Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Rémi Gaillard 2013-11-04 17:22:21 +01:00
• f4740088c1 // small fix Rémi Gaillard 2013-11-04 17:22:08 +01:00
• ddd722dc14 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-11-04 17:08:43 +01:00
• 667848d1df // removed csshover.htc Kevin Granger 2013-11-04 17:08:32 +01:00
• ac1f142f23 // Moved default_language Damien Metzger 2013-11-04 17:08:17 +01:00
• e8c0195ee9 // small fix merge Damien Metzger 2013-11-04 17:04:09 +01:00
• c44b1d617c [-] BO : Could not change image position gRoussac 2013-11-04 16:59:03 +01:00
• f3fa65f9be // removed admin-ie.css Kevin Granger 2013-11-04 16:58:27 +01:00
• 68cda947ed // removed login.css Kevin Granger 2013-11-04 16:53:43 +01:00
• 0009556ed5 // Fixed no bootstrap for modules Damien Metzger 2013-11-04 16:51:19 +01:00
• 695326bc4e // Filter search BO Damien Metzger 2013-11-04 16:47:03 +01:00
• 0ddc0d9f9a Merge pull request #919 from djfm/bootstrap Damien Metzger 2013-11-04 07:23:25 -08:00
• 5f1efc6b63 // installer typography fram 2013-11-04 16:20:10 +01:00
• d4a6148b64 // Anything but a 404 image Damien Metzger 2013-11-04 16:09:43 +01:00
• 48025838df // fixs referrers Kevin Granger 2013-11-04 16:08:38 +01:00
• d0c6d86eb9 // fixs for merge Kevin Granger 2013-11-04 15:56:24 +01:00
• c452444620 [-] IN : Could not install when session_start() does not fail on ajax requests gRoussac 2013-11-04 15:47:29 +01:00
• a81cde11d6 [-] Classes : ProductSale - Merge fix Francois Gaillard 2013-11-04 15:35:59 +01:00
• f7d346ba99 // Added more results link at the end of the BO search Damien Metzger 2013-11-04 15:03:48 +01:00
• 2e80ed8de5 // Cleaned conflict Damien Metzger 2013-11-04 14:58:03 +01:00
• 5386a4547b Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Vincent Augagneur 2013-11-04 14:57:50 +01:00
• 27273334e3 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Damien Metzger 2013-11-04 14:47:16 +01:00
• e7e4376307 // Changed "gender image" to social title in the customer (BO) Damien Metzger 2013-11-04 14:45:36 +01:00
• 92bd59fbea Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-11-04 14:43:10 +01:00
• 889a2006ec Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-11-04 14:43:01 +01:00
• f8256bc15d // Fixed module KPI Damien Metzger 2013-11-04 14:39:53 +01:00
• 3f817e8729 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-11-04 14:31:29 +01:00
• 66f314bbb2 // missing trailing bracket in modules/productcomments/config.xml gRoussac 2013-11-04 14:31:15 +01:00
• d93ea846a9 // Code cleaning and small fixes Damien Metzger 2013-11-04 14:29:31 +01:00
• bf8cd29868 // validator on message field Rémi Gaillard 2013-11-04 14:21:42 +01:00
• 178cd7362d // admin search code cleaning Damien Metzger 2013-11-04 13:57:27 +01:00
• 0451ca5c73 // Added Addons search Damien Metzger 2013-11-04 12:24:55 +01:00
• b8b7fbaf71 [*] MO : New modules version since 1.5.6.0 gRoussac 2013-11-04 11:57:31 +01:00
• 9ea79f8cb5 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development gRoussac 2013-11-04 11:48:25 +01:00
• b3c54a59dd // typo Rémi Gaillard 2013-11-04 11:48:30 +01:00
• 06d73554be // preg instead strpos Rémi Gaillard 2013-11-04 11:39:48 +01:00
• 96a6a24a14 // move to 1.5.6.1 Installer gRoussac 2013-11-04 11:11:21 +01:00
• ad555f1d30 [-] IN : Follow up #PSCFV-10671 update messages in base and https://github.com/PrestaShop/PrestaShop/commit/b16e4b5a8ee6bdab13808f8ab473bda6c060c086 gRoussac 2013-11-04 11:10:40 +01:00
• d571920806 //small fix Vincent Augagneur 2013-11-04 11:09:53 +01:00
• 4b6ee72072 Merge pull request #894 from codeurWeb/patch-6 Gregory Roussac 2013-11-04 02:02:10 -08:00
• cfeeda7d9b // Assigned compared products to smarty Damien Metzger 2013-11-04 11:00:50 +01:00
• e000f8c627 // something is missing in the last commit Rémi Gaillard 2013-11-04 11:00:21 +01:00
• 02367e5396 //missing file for blockwishlist module Vincent Augagneur 2013-11-04 10:42:37 +01:00
• 6ef7f258ea // small fix Rémi Gaillard 2013-11-04 10:34:58 +01:00
• 2be72f50d1 [-] FO : FixBug Categories description Jerome Nadaud 2013-11-04 10:29:44 +01:00
• 3de663f9a1 //missing files for module followup Vincent Augagneur 2013-11-04 10:20:17 +01:00
• e03a86ad05 //homeslider new use bootstrap design Vincent Augagneur 2013-11-04 10:01:29 +01:00
• d49c4cf62e [-] BO: Fix from name when replying to customer threads Rémi Gaillard 2013-11-04 09:38:12 +01:00
• c7323c2bfe [-] CORE : Fix bug #PSCFV-10901 warnings on htmlentities gRoussac 2013-11-03 22:59:04 +01:00
• 2a3192d98c [-] IN : Refacto for update_customer_default_group bad logical gRoussac 2013-11-03 14:55:25 +01:00
• b16e4b5a8e [-] IN : Lower memory usage in migrate_orders, fix update_order_messages loop gRoussac 2013-11-03 01:49:16 +01:00
• 8f72282594 [-] IN : update_customer_default_group returning false gRoussac 2013-11-02 21:51:13 +01:00
• a5bb4f0323 [-] IN: Fix [insert order detail 1] error while upgrading gRoussac 2013-11-02 20:39:53 +01:00
• c4d18e5e9f avatar on customer threads Rémi Gaillard 2013-11-02 16:01:06 +01:00
• 95b5036782 // addsharethis cache Rémi Gaillard 2013-11-02 15:41:40 +01:00
• 930c9f3ff5 // validators Rémi Gaillard 2013-11-02 10:50:02 +01:00
• 5db9c5cdd5 // small fix Rémi Gaillard 2013-11-02 09:54:37 +01:00
• 84be298dc5 // some W3C fixs Kevin Granger 2013-11-01 17:25:18 +01:00
• 1bcb8d5c82 // sass-bootstrap 3.0.1 update Kevin Granger 2013-11-01 16:44:55 +01:00
• 9c499dc8a4 // Placeholder instead of label for list filter date Kevin Granger 2013-11-01 16:28:21 +01:00
• bf781ed267 // horizontal nav Kevin Granger 2013-11-01 15:50:33 +01:00
• d4075f1267 [-] FO: use 4 images in thumbnails, not 3 PrestaEdit 2013-10-31 23:06:19 +01:00
• 062fb90c2e [-] IN : Fix Unknown column 'module_name' in 'ps_webservice_account' during upgrade gRoussac 2013-10-31 19:24:41 +01:00
• 87eb9bba26 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-10-31 19:13:53 +01:00
• 64598535bd // Avatar + Vertical Nav WIP Kevin Granger 2013-10-31 19:13:34 +01:00
• 9193a29a44 [+] MO : Blockcart - Add error handler on ajax function Jerome Nadaud 2013-10-31 19:02:43 +01:00
• 671062af07 // Add Disable overrides to debug mode Jerome Nadaud 2013-10-31 18:41:56 +01:00
• a1696efe63 // small fix Rémi Gaillard 2013-10-31 18:40:29 +01:00
• 74e92e364c // php warning Rémi Gaillard 2013-10-31 18:26:09 +01:00
• 3669948547 // Revert to the previous lib with a trick Damien Metzger 2013-10-31 17:53:34 +01:00
• 1ecc6e32ba // Try out new PEAR JSON encode Damien Metzger 2013-10-31 17:45:02 +01:00
• 8670db2316 // Image sizes Damien Metzger 2013-10-31 17:41:02 +01:00
• 343c9578da // Better Damien Metzger 2013-10-31 17:15:30 +01:00
• 23e4e1badb // I forgot the link Damien Metzger 2013-10-31 17:10:15 +01:00
• fe78dceede // Fixed image sizes Damien Metzger 2013-10-31 17:08:11 +01:00
• c091729fd7 // missing directory Rémi Gaillard 2013-10-31 17:03:41 +01:00
• dc90450365 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Rémi Gaillard 2013-10-31 16:39:21 +01:00
• a7ed5ee869 // cleaning Rémi Gaillard 2013-10-31 16:39:01 +01:00
• 80c60be952 [-] BO : Do not enable rewrite url for index gRoussac 2013-10-31 16:20:55 +01:00
• 3c1cdf4ef2 // Fixed new arrivals issue Damien Metzger 2013-10-31 16:08:57 +01:00
• ba28c5f527 // UI fixs Kevin Granger 2013-10-31 15:49:57 +01:00
• 549fa9003c // Small fix with URL rewrite Damien Metzger 2013-10-31 15:41:41 +01:00
• 6c8e70f780 [*] FO : added "back to search results" the the product page Damien Metzger 2013-10-31 15:32:52 +01:00
• 1b019dffc5 // Fix lang detection on dispatcher Rémi Gaillard 2013-10-31 15:28:19 +01:00
• f565b273d8 // Reverting the revert Damien Metzger 2013-10-31 15:13:46 +01:00
• 9a1b45a8e6 // Fixed warning and prepared next commit Damien Metzger 2013-10-31 15:09:03 +01:00
• a97e3927df Merge pull request #915 from TMMeilleur/bootstrap Damien Metzger 2013-10-31 07:06:40 -07:00
• 68a98b29a6 tm theme TMMeilleur 2013-10-31 15:51:25 +02:00
• f9dc0b0252 [-] MO : Could not translate in transit mail, revert from https://github.com/viger-creator/PrestaShop/commit/3213b5dffb266ddb0639b94f72babd892328ffa2 gRoussac 2013-10-31 14:20:21 +01:00
• ff2954b1d2 [*] FO : Changed category block behavior inside categories Damien Metzger 2013-10-31 12:20:41 +01:00
• 534421fb6b // UI fixs Kevin Granger 2013-10-31 12:20:29 +01:00
• 03564fe0e5 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-10-31 11:34:58 +01:00
• 4334364b36 // cart rules > conditions > product rules Kevin Granger 2013-10-31 11:34:47 +01:00