Commit Graph
20949 Commits
Author SHA1 Message Date
Rémi Gaillard 99f325dc3c // validation of carrierwizard 2013-10-02 11:24:08 +02:00
Jerome Nadaud 43c874e06e // Fix line feed on address observation 2013-10-02 09:59:14 +02:00
Jerome Nadaud dd79b3c702 // Manufacturer bootstraping 2013-10-02 09:43:46 +02:00
Jerome Nadaud ba2494fa8b // Remove language select on textarea with 1 langue 2013-10-02 09:43:24 +02:00
gRoussac c466320887 [-] Bo : Fix again #PSCFV-10474 again, not deleting start page after import 2013-10-01 19:11:51 +02:00
Kevin Granger 65fc1fea63 // orders WIP 2013-10-01 18:50:41 +02:00
Jerome Nadaud 301de7a3a1 // Webservice and advanced stock list bootstraping 2013-10-01 18:29:35 +02:00
gRoussac a6e8af99f9 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-10-01 18:13:02 +02:00
gRoussac 6bbcbb536f [-] CORE : Cart rules not ordered by priority for PaymentModule 2013-10-01 18:12:15 +02:00
gRoussac 294384d9ea [-] CORE : Partial fix bug #PSCFV-10534 bad total_products_wt calculated without other cart rules 2013-10-01 18:11:54 +02:00
Jerome Nadaud dd60eb66cf // Fix features list filters and sort 2013-10-01 18:10:52 +02:00
Gregory Roussac 953f0641e8 Merge pull request #778 from djfm/release
[*] TR : Installer Translations
2013-10-01 09:09:32 -07:00
gRoussac a5dc1ce6f6 [-] Bo : Fix again #PSCFV-10474 coul not export more than 300 products 2013-10-01 18:02:12 +02:00
Jerome Nadaud f2849bdb70 // Remove unnecessary function 2013-10-01 17:56:17 +02:00
Jerome Nadaud 68831ffbe9 // Fix attribute group view list 2013-10-01 17:55:20 +02:00
djfm 172986a461 // changed help text 2013-10-01 15:06:33 +00:00
Jerome Nadaud 9c40dbb222 // Fix group view for bootstrap - removing limit restriction 'cause is now fixed 2013-10-01 17:00:56 +02:00
djfm 23df6cb875 // updated German installer translations 2013-10-01 14:52:04 +00:00
Jerome Nadaud 88be78d096 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-01 16:44:20 +02:00
Jerome Nadaud 99a4ffe583 // Fix enable friendly url button generator on multishop 2013-10-01 16:44:03 +02:00
Kevin Granger c4c15917ab Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-10-01 16:24:27 +02:00
Kevin Granger a866de41e7 // login form 2013-10-01 16:24:14 +02:00
gRoussac f4c2bacea3 [-] CORE : Cart rules not ordered by priority for PaymentModule 2013-10-01 16:17:23 +02:00
Jerome Nadaud 55a5c69d40 // Remove language select on only one language 2013-10-01 16:03:34 +02:00
Jerome Nadaud a2aa90a4b6 // Fix page header title bug 2013-10-01 15:32:34 +02:00
Jerome Nadaud bc8e972dfa // Fix language id in features and quantities 2013-10-01 15:32:13 +02:00
Jerome Nadaud f469b69113 // Fix fixed home category And Norm 2013-10-01 15:18:56 +02:00
Jerome Nadaud 299d1f65ec //Fix Stats bug 2013-10-01 15:15:02 +02:00
Jerome Nadaud 759a3e191a // Groups and language bootsrapify 2013-10-01 15:14:46 +02:00
gRoussac 626ccf0985 [-] CORE : Partial fix bug #PSCFV-10534 bad total_products_wt calculated without other cart rules 2013-10-01 14:46:40 +02:00
Jerome Nadaud 14b584fc01 // Remove language select if exist only 1 language 2013-10-01 14:36:48 +02:00
Vincent Augagneur f2a760c245 //small fix 2013-10-01 12:31:07 +02:00
Gregory Roussac a76a7273ea Merge pull request #776 from kpodemski/patch-5
[*] FO: We let style selected category in CSS on blockcategories
2013-10-01 03:04:54 -07:00
Krystian Podemski 9e4b6c020f [*] FO: We let style selected category in CSS on blockcategories
It's good to have this by default.
2013-10-01 12:02:19 +02:00
djfm 9e64ecc887 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-10-01 09:58:40 +00:00
Rémi Gaillard 9ad046677c [*] BO: Allow to breakdown the taxes when they are computed 2013-10-01 11:55:56 +02:00
Rémi Gaillard 4fcbde878d [-] BO: Fix total without tax in breakdown taxes when taxes are combined #PSCFV-10394 on the invoices 2013-10-01 11:18:11 +02:00
Vincent Augagneur f4f1b6e831 //vatnumber now use bootstrap design 2013-10-01 11:03:37 +02:00
gRoussacandJerome Nadaud f30bc80485 [-] BO : Remove duplicate sql insert in setProductOutOfStock in monoshop 2013-10-01 10:48:17 +02:00
djfm e706b531bc // updated br, es, fr, ru installer translations 2013-10-01 08:41:03 +00:00
Jerome Nadaud 340f6cebe4 [-] FO : FixBug #PSCFV-10542 - Category description view problem 2013-10-01 10:20:33 +02:00
Gregory Roussac 97a25eb9c6 Merge pull request #774 from kpodemski/patch-4
[-] BO: translation mismatch
2013-10-01 01:15:24 -07:00
Rémi Gaillard ecb4ccfdda // Fix product visibility on Product::getAccessories and ProductSale::getBestSales #PSCFV-9760 2013-10-01 09:56:26 +02:00
Krystian Podemski 2b55944874 [-] BO: translation mismatch
Here is a form to edit the values ​​in the group, we do not need here "attribute type".
2013-10-01 08:38:04 +02:00
Jerome Nadaud 452e07ab0b [-] BO : FixBug #PSCFV-10477 - Error message not shown on delete module without permissions 2013-09-30 19:26:49 +02:00
gRoussac 4a66bdcdf9 // report of https://github.com/PrestaShop/PrestaShop/commit/9b627bf9a28ffc2ce2a0b55bb88af0dd59544c55 2013-09-30 19:18:08 +02:00
gRoussac f899380e3b [-) BO : #PSCFV-10474 coul not export more than 300 products 2013-09-30 19:04:04 +02:00
Jerome Nadaud 1b9472cc37 [-] BO : FixBug #PSCFV-10291 - Remove temporary image on install 2013-09-30 19:01:11 +02:00
Rémi Gaillard eb40f7db24 // Improve cache colors list 2013-09-30 18:48:59 +02:00
Damien Metzger 9c04f1dace Merge pull request #748 from djfm/release
// fix PSCFV-8260, currency format containing spaces and RTL languages
2013-09-30 09:21:43 -07:00