dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,608 Commits 9 Branches 19 Tags
a07733fcec16f471ec447789631804a0a33b94de
Commit Graph

18608 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
thoma202 eb7655e318 [+] Added hook in maintenance page 2013-10-02 11:58:35 +02:00
Rémi Gaillard 99f325dc3c // validation of carrierwizard 2013-10-02 11:24:08 +02:00
gRoussac c466320887 [-] Bo : Fix again #PSCFV-10474 again, not deleting start page after import 2013-10-01 19:11:51 +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
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
djfm 172986a461 // changed help text 2013-10-01 15:06:33 +00:00
djfm 23df6cb875 // updated German installer translations 2013-10-01 14:52:04 +00:00
gRoussac f4c2bacea3 [-] CORE : Cart rules not ordered by priority for PaymentModule 2013-10-01 16:17:23 +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
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
gRoussac 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
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
djfm 1cce312aaa // orthograph 2013-09-30 16:15:53 +00:00
djfm f39c2c40cf Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-09-30 16:13:15 +00:00
Jerome Nadaud b7ff8d634a [-] BO : FixBug #PSCFV-10317 - Attributes value not shown on features sorted by position. 2013-09-30 17:23:12 +02:00
Jerome Nadaud f983e0eaf1 [-] BO : FixBug #PSCFV-10380 - Missing lang file existence verification. 2013-09-30 16:25:58 +02:00
Jerome Nadaud 6bb1fa6a4d // Missing '?' on regex 2013-09-30 14:59:27 +02:00
Jerome Nadaud 05eafdb14f Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-09-30 14:57:46 +02:00
Jerome Nadaud cfc41ec4ef [+] BO : Add remove module override on constant - PSCFV-10430 2013-09-30 14:57:30 +02:00
Gregory Roussac 6822373378 Merge pull request #772 from codeurWeb/patch-5 
[*] FO : add GET pre-selection of id_contact in contact-form.tpl
 2013-09-30 05:56:09 -07:00
Julien dd5cd33bb4 [-] BO : fix pre-selection of id_contact in contact-form.tpl 2013-09-30 14:38:06 +02:00
Cosmin Hutanu 7eddca6d15 update localization pack for romania - added states 2013-09-30 13:06:19 +03:00
gRoussac 7d764c5ce8 [-] BO : AdminImport, not matching by ref for updating 2013-09-30 11:50:51 +02:00
Cosmin Hutanu f9ad0d1b79 Merge pull request #3 from PrestaShop/development 
update from prestashop/development
 2013-09-30 02:47:52 -07:00
Jerome Nadaud e040c096d1 [-] BO : Remove customers group view list link 2013-09-30 10:34:54 +02:00
Rémi Gaillard b6f13648db [-] WS: Fix order by on id field on multishop entities 2013-09-30 10:29:54 +02:00
Rémi Gaillard 22173355a5 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-09-30 09:59:51 +02:00
Rémi Gaillard 06b6facc2d [-] BO: Fix #PSCFV-10488 filter by employee on logs tab 2013-09-30 09:59:33 +02:00
Jerome Nadaud e0e5f80767 [-] BO : FixBig #PSCFV-10442 - Members Cutomer Group list 2013-09-30 09:59:25 +02:00
Gregory Roussac 3e85622972 Merge pull request #767 from enumag/patch-3 
[-] BO : Fix #PSCFV-10520 id_attribute_group can not be null
 2013-09-30 00:47:12 -07:00
djfm 67d0ac95b5 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-09-30 07:09:17 +00:00
Jáchym Toušek 6e191fe054 [-] Classes : Hook - Display payment method & custommer currency bug fix 2013-09-29 16:24:33 +02:00
Jáchym Toušek 5ebc2e5e91 [-] BO : Fix #PSCFV-10520 2013-09-29 14:43:14 +02:00
gRoussac 813ef8bc7e [-] BO : Could not import empty linkrewrite for products and not matching refs 2013-09-27 19:22:10 +02:00