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

• ba06b217cc // update javascript login page Sarah Lorenzini 2013-10-01 17:26:13 +02:00
• c4e549db13 [-] BO : Fix #PSCFV-6482 could not import tags in deiffrent languages gRoussac 2013-10-02 14:20:27 +02:00
• f5a4aeeab5 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-10-02 13:59:04 +02:00
• 0867e8b7c1 // fix AdminController array unique Kevin Granger 2013-10-02 13:58:57 +02:00
• 661e18916b // Permission bootstrap design Jerome Nadaud 2013-10-02 12:30:07 +02:00
• 51c1ee0cf0 // Move ajax box and ajax confirmation to content part Jerome Nadaud 2013-10-02 12:23:10 +02:00
• a876b13c1c [-] BO : fixed currency format on order creation Damien Metzger 2013-10-02 12:10:38 +02:00
• a891c9277a // Advanced stock management details list Jerome Nadaud 2013-10-02 12:09:03 +02:00
• eb7655e318 [+] Added hook in maintenance page thoma202 2013-10-02 11:58:35 +02:00
• 99f325dc3c // validation of carrierwizard Rémi Gaillard 2013-10-02 11:24:08 +02:00
• dbc5c4301f [*] BO : Allow complex GROUP BY in SQL Manager Grégoire Bélorgey 2013-10-02 10:31:41 +02:00
• 43c874e06e // Fix line feed on address observation Jerome Nadaud 2013-10-02 09:59:14 +02:00
• dd79b3c702 // Manufacturer bootstraping Jerome Nadaud 2013-10-02 09:43:46 +02:00
• ba2494fa8b // Remove language select on textarea with 1 langue Jerome Nadaud 2013-10-02 09:43:24 +02:00
• c466320887 [-] Bo : Fix again #PSCFV-10474 again, not deleting start page after import gRoussac 2013-10-01 19:11:51 +02:00
• 65fc1fea63 // orders WIP Kevin Granger 2013-10-01 18:50:41 +02:00
• 301de7a3a1 // Webservice and advanced stock list bootstraping Jerome Nadaud 2013-10-01 18:29:35 +02:00
• a6e8af99f9 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release gRoussac 2013-10-01 18:13:02 +02:00
• 6bbcbb536f [-] CORE : Cart rules not ordered by priority for PaymentModule gRoussac 2013-10-01 16:17:23 +02:00
• 294384d9ea [-] CORE : Partial fix bug #PSCFV-10534 bad total_products_wt calculated without other cart rules gRoussac 2013-10-01 14:46:40 +02:00
• dd60eb66cf // Fix features list filters and sort Jerome Nadaud 2013-10-01 18:10:52 +02:00
• 953f0641e8 Merge pull request #778 from djfm/release Gregory Roussac 2013-10-01 09:09:32 -07:00
• a5dc1ce6f6 [-] Bo : Fix again #PSCFV-10474 coul not export more than 300 products gRoussac 2013-10-01 18:02:12 +02:00
• f2849bdb70 // Remove unnecessary function Jerome Nadaud 2013-10-01 17:56:17 +02:00
• 68831ffbe9 // Fix attribute group view list Jerome Nadaud 2013-10-01 17:55:20 +02:00
• 172986a461 // changed help text djfm 2013-10-01 15:06:33 +00:00
• 9c40dbb222 // Fix group view for bootstrap - removing limit restriction 'cause is now fixed Jerome Nadaud 2013-10-01 17:00:56 +02:00
• 23df6cb875 // updated German installer translations djfm 2013-10-01 14:52:04 +00:00
• 88be78d096 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Jerome Nadaud 2013-10-01 16:44:20 +02:00
• 99a4ffe583 // Fix enable friendly url button generator on multishop Jerome Nadaud 2013-10-01 16:44:03 +02:00
• c4c15917ab Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-10-01 16:24:27 +02:00
• a866de41e7 // login form Kevin Granger 2013-10-01 16:24:14 +02:00
• f4c2bacea3 [-] CORE : Cart rules not ordered by priority for PaymentModule gRoussac 2013-10-01 16:17:23 +02:00
• 55a5c69d40 // Remove language select on only one language Jerome Nadaud 2013-10-01 16:03:34 +02:00
• a2aa90a4b6 // Fix page header title bug Jerome Nadaud 2013-10-01 15:32:34 +02:00
• bc8e972dfa // Fix language id in features and quantities Jerome Nadaud 2013-10-01 15:32:13 +02:00
• f469b69113 // Fix fixed home category And Norm Jerome Nadaud 2013-10-01 15:18:56 +02:00
• 299d1f65ec //Fix Stats bug Jerome Nadaud 2013-10-01 15:15:02 +02:00
• 759a3e191a // Groups and language bootsrapify Jerome Nadaud 2013-10-01 15:14:46 +02:00
• 626ccf0985 [-] CORE : Partial fix bug #PSCFV-10534 bad total_products_wt calculated without other cart rules gRoussac 2013-10-01 14:46:40 +02:00
• 14b584fc01 // Remove language select if exist only 1 language Jerome Nadaud 2013-10-01 14:36:48 +02:00
• f2a760c245 //small fix Vincent Augagneur 2013-10-01 12:31:07 +02:00
• a76a7273ea Merge pull request #776 from kpodemski/patch-5 Gregory Roussac 2013-10-01 03:04:54 -07:00
• 9e4b6c020f [*] FO: We let style selected category in CSS on blockcategories Krystian Podemski 2013-10-01 12:02:19 +02:00
• 9e64ecc887 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release djfm 2013-10-01 09:58:40 +00:00
• 9ad046677c [*] BO: Allow to breakdown the taxes when they are computed Rémi Gaillard 2013-10-01 11:55:56 +02:00
• 4fcbde878d [-] BO: Fix total without tax in breakdown taxes when taxes are combined #PSCFV-10394 on the invoices Rémi Gaillard 2013-10-01 11:18:11 +02:00
• f4f1b6e831 //vatnumber now use bootstrap design Vincent Augagneur 2013-10-01 11:03:37 +02:00
• f30bc80485 [-] BO : Remove duplicate sql insert in setProductOutOfStock in monoshop gRoussacandJerome Nadaud 2013-09-25 18:41:52 +02:00
• e706b531bc // updated br, es, fr, ru installer translations djfm 2013-10-01 08:41:03 +00:00
• 340f6cebe4 [-] FO : FixBug #PSCFV-10542 - Category description view problem Jerome Nadaud 2013-10-01 10:20:33 +02:00
• 97a25eb9c6 Merge pull request #774 from kpodemski/patch-4 Gregory Roussac 2013-10-01 01:15:24 -07:00
• ecb4ccfdda // Fix product visibility on Product::getAccessories and ProductSale::getBestSales #PSCFV-9760 Rémi Gaillard 2013-10-01 09:56:26 +02:00
• 2b55944874 [-] BO: translation mismatch Krystian Podemski 2013-10-01 08:38:04 +02:00
• 452e07ab0b [-] BO : FixBug #PSCFV-10477 - Error message not shown on delete module without permissions Jerome Nadaud 2013-09-30 19:26:49 +02:00
• 4a66bdcdf9 // report of https://github.com/PrestaShop/PrestaShop/commit/9b627bf9a28ffc2ce2a0b55bb88af0dd59544c55 gRoussac 2013-09-30 19:18:08 +02:00
• f899380e3b [-) BO : #PSCFV-10474 coul not export more than 300 products gRoussac 2013-09-30 19:04:04 +02:00
• 1b9472cc37 [-] BO : FixBug #PSCFV-10291 - Remove temporary image on install Jerome Nadaud 2013-09-30 19:01:11 +02:00
• eb40f7db24 // Improve cache colors list Rémi Gaillard 2013-09-30 18:48:59 +02:00
• 9c04f1dace Merge pull request #748 from djfm/release Damien Metzger 2013-09-30 09:21:43 -07:00
• 1cce312aaa // orthograph djfm 2013-09-30 16:15:53 +00:00
• f39c2c40cf Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release djfm 2013-09-30 16:13:15 +00:00
• b2a9ec57bf // cache Rémi Gaillard 2013-09-30 17:25:12 +02:00
• b7ff8d634a [-] BO : FixBug #PSCFV-10317 - Attributes value not shown on features sorted by position. Jerome Nadaud 2013-09-30 17:23:12 +02:00
• c2857add42 // add color list on product listing Rémi Gaillard 2013-09-30 17:19:02 +02:00
• f983e0eaf1 [-] BO : FixBug #PSCFV-10380 - Missing lang file existence verification. Jerome Nadaud 2013-09-30 16:25:58 +02:00
• a6d8ffa293 // More breadcrumbs improvements Damien Metzger 2013-09-30 15:38:06 +02:00
• 0db013f1c8 // fix checkbox Kevin Granger 2013-09-30 15:13:08 +02:00
• 6bb1fa6a4d // Missing '?' on regex Jerome Nadaud 2013-09-30 14:59:27 +02:00
• 05eafdb14f Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Jerome Nadaud 2013-09-30 14:57:46 +02:00
• cfc41ec4ef [+] BO : Add remove module override on constant - PSCFV-10430 Jerome Nadaud 2013-09-30 14:57:30 +02:00
• 6822373378 Merge pull request #772 from codeurWeb/patch-5 Gregory Roussac 2013-09-30 05:56:09 -07:00
• 85abfde45c // Added links to breadcrumbs Damien Metzger 2013-09-30 14:45:21 +02:00
• dd5cd33bb4 [-] BO : fix pre-selection of id_contact in contact-form.tpl Julien 2013-09-30 14:38:06 +02:00
• 4ebc47856e [-] BO : fixed breadcrumbs and filters (in the breadcrumbs) Damien Metzger 2013-09-30 14:16:33 +02:00
• 7eddca6d15 update localization pack for romania - added states Cosmin Hutanu 2013-09-30 13:06:19 +03:00
• 7d764c5ce8 [-] BO : AdminImport, not matching by ref for updating gRoussac 2013-09-30 11:50:51 +02:00
• f9ad0d1b79 Merge pull request #3 from PrestaShop/development Cosmin Hutanu 2013-09-30 02:47:52 -07:00
• 80376e9034 // Fixed meta title Damien Metzger 2013-09-30 11:26:45 +02:00
• d6a541df58 //pscleaner now use bootstrap design Vincent Augagneur 2013-09-30 11:23:41 +02:00
• 7019af3a11 // Bound the menu to the employee option Damien Metzger 2013-09-30 11:20:49 +02:00
• 8ed77030aa Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into bootstrap Kevin Granger 2013-09-30 11:01:23 +02:00
• e040c096d1 [-] BO : Remove customers group view list link Jerome Nadaud 2013-09-30 10:34:54 +02:00
• b6f13648db [-] WS: Fix order by on id field on multishop entities Rémi Gaillard 2013-09-30 10:29:54 +02:00
• 22173355a5 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release Rémi Gaillard 2013-09-30 09:59:51 +02:00
• 06b6facc2d [-] BO: Fix #PSCFV-10488 filter by employee on logs tab Rémi Gaillard 2013-09-30 09:59:33 +02:00
• e0e5f80767 [-] BO : FixBig #PSCFV-10442 - Members Cutomer Group list Jerome NadaudandgRoussac 2013-09-27 19:20:46 +02:00
• 3e85622972 Merge pull request #767 from enumag/patch-3 Gregory Roussac 2013-09-30 00:47:12 -07:00
• 67d0ac95b5 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release djfm 2013-09-30 07:09:17 +00:00
• 6e191fe054 [-] Classes : Hook - Display payment method & custommer currency bug fix Jáchym Toušek 2013-09-29 16:24:33 +02:00
• 5ebc2e5e91 [-] BO : Fix #PSCFV-10520 Jáchym Toušek 2013-09-29 14:43:14 +02:00
• 813ef8bc7e [-] BO : Could not import empty linkrewrite for products and not matching refs gRoussac 2013-09-27 19:22:10 +02:00
• c2b9ff40ef [-] BO : FixBig #PSCFV-10442 - Members Cutomer Group list Jerome Nadaud 2013-09-27 19:20:46 +02:00
• a4178a9fd2 Merge pull request #761 from nuzelac/patch-1 Gregory Roussac 2013-09-27 09:50:03 -07:00
• 40617c0a81 Merge pull request #761 from nuzelac/patch-1 Gregory Roussac 2013-09-27 09:50:03 -07:00
• ca01b58262 fix multilingual field validity in AdminProductsController Nino Uzelac 2013-09-27 18:22:07 +02:00
• f84a3c7fda // Add missing index Damien Metzger 2013-09-27 17:47:10 +02:00
• 9d94337c9b [-] MO sendtoafriend: The method used to check all required input fields could lead to errors Fabio Chelly 2013-09-27 11:27:58 +02:00
• 650c18e9f7 // Added Translations KPIs Damien Metzger 2013-09-27 14:51:01 +02:00
• 6449ecfb32 [-] BO : Force invoice footer text to 1 ligne Jerome Nadaud 2013-09-27 14:41:50 +02:00