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

19077 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dlage
b4c4068e41 [-] BO : fixed bug loading wrong root category in AdminCategoriesController 
Fix wrong root category being loaded.
There's an issue if you activate multishop and create a new root category which loads the wrong category and causes, at least, 'Add new Category' and 'Export' in AdminCategories to redirect back to the category list (e.g. impossible to add/remove categories).
 2013-12-11 01:38:05 +00:00
Vincent Augagneur
fd1050b0db //tab module list fix 2013-12-10 09:43:15 +01:00
Gregory Roussac
5b809ec536 Merge pull request #1108 from Gamesh/patch-1 
[-] FO : filesize returns negavite int for realy large files
 2013-12-08 08:50:09 -08:00
Gamesh
02fd940124 filesize returns negavite int for realy large files 
this will cast to unsigned int that will allow to display correct file size up about 4 gigabytes
 2013-12-06 21:18:52 +02:00
rGaillard
134914dc1a // invisible char 2013-12-05 18:13:45 +01:00
rGaillard
d8a1dca660 // demo mode 2013-11-29 17:00:50 +01:00
rGaillard
10fa987832 // small fix 2013-11-29 15:11:49 +01:00
Jérôme Nadaud
58da52b808 Merge pull request #1047 from djfm/development 
Localization Packs
 2013-11-28 03:26:04 -08:00
rGaillard
0585b8d723 // small fix 2013-11-28 11:29:27 +01:00
Jérôme Nadaud
ccc388fab9 Merge pull request #1044 from prestamodule/development 
Mail translation methods fix & template translation fix
 2013-11-28 00:08:54 -08:00
fram
dbd5f9d32f // added country name to Tunisia localization pack 2013-11-27 10:44:46 +01:00
fram
27397ab839 // updated Slovenia VAT rate 2013-11-27 10:39:44 +01:00
fram
11f530b54f // updated Singapore localization pack 2013-11-27 10:34:59 +01:00
fram
6c271e037c // corrected spelling of Saudi Arabia 2013-11-27 10:27:52 +01:00
fram
964a0a4601 // updated Poland VAT rate 2013-11-27 10:20:04 +01:00
fram
9737709ee6 // added country name to Philippines localization pack 2013-11-27 10:12:02 +01:00
fram
70144c7cef // added country name to Peru localization pack 2013-11-27 10:11:05 +01:00
fram
0442da817c // added country name to Panama localization pack 2013-11-27 10:07:14 +01:00
fram
9d63514220 // updated Norway VAT rate 2013-11-27 10:00:04 +01:00
rGaillard
13061bdc04 [-] Core: update cartrule feature active on cartrule updating 2013-11-26 18:04:57 +01:00
Vincent Augagneur
5150a3fc4c [-] MO : fixed bug #PSCFV-9642 - Slider does not scroll when define language from right to left 2013-11-26 15:20:44 +01:00
fram
4ab4e19d20 // updated Latvia VAT rate 2013-11-26 12:32:45 +01:00
fram
023be78690 // updated Liechtenstein VAT rate 2013-11-26 12:28:38 +01:00
fram
55c329c16e // updated Kenya VAT rate 2013-11-26 11:54:51 +01:00
fram
b951c2809c // updated Jersey VAT rate 2013-11-26 11:47:34 +01:00
prestamodule
2b37db629e - Fix english translation for backoffice_order template 
Signed-off-by: hadjedjvincent <v.hadjedj@presta-module.com>
 2013-11-26 11:23:33 +01:00
prestamodule
d064be1587 - Fix multiple translations in a same process for different id_lang 
If id_lang are mixed (1, 2, 3, 1, 4, 2...) the translations aren't correctly populated from the theme lang.php override if include_once is used.
include must be used in order to handle mixed id_lang in a same process.

Signed-off-by: hadjedjvincent <v.hadjedj@presta-module.com>
 2013-11-26 11:22:57 +01:00
gRoussac
2a1c991612 [-] BO : Undefined on image upload, revert of 48b7a49b1a 2013-11-25 22:56:50 +01:00
Jérôme Nadaud
fa059751fc Merge pull request #1032 from djfm/development 
// updated Italian VAT rate
 2013-11-25 09:48:47 -08:00
fram
6284c55e2a // updated Italian VAT rate 2013-11-25 18:42:17 +01:00
Rémi Gaillard
81f05b9db3 Merge pull request #780 from MyBB-Services/dev/gb/sqlmanagergroupby 
[*] BO : Allow complex GROUP BY in SQL Manager
 2013-11-25 08:21:23 -08:00
Rémi Gaillard
09b5d3a0b8 Merge pull request #863 from Prestaworks/patch-15 
// Update GuestTrackingController.php
 2013-11-25 07:52:57 -08:00
Jérôme Nadaud
754ba06a39 Merge pull request #1030 from ccauw/patch-13 
[-] BO : Double separator in function createTemplate()
 2013-11-25 05:18:28 -08:00
Jérôme Nadaud
2129aebac0 Update CONTRIBUTING.md 2013-11-25 14:17:49 +01:00
ccauw
04760c91e5 [-] BO : Double separator in function createTemplate() 
smarty->getTemplateDir() returns a result ending with a separator,
so no need to add DIRECTORY_SEPARATOR ?
 2013-11-25 14:13:10 +01:00
Damien Metzger
2eb620267c Merge pull request #835 from axometeam/patch-20 
// Fixed potential issue with textarea
 2013-11-25 02:35:23 -08:00
Damien Metzger
a932ba512a Merge pull request #846 from sebastienhouzet/patch-2 
[-] MO : Fix add truncate tag in pscleaner
 2013-11-25 02:13:06 -08:00
gRoussac
d14fcf169a [-] IN : bad reset on vars in migrate_orders 2013-11-21 17:10:19 +01:00
gRoussac
d6e52bdecb Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-11-21 14:20:00 +01:00
gRoussac
3ab28374e6 [-] BO : Remove warning with open_basdir on module list 2013-11-21 14:17:55 +01:00
Fabio Chelly
5f47526ed2 [-] FO : Fixed bug #PSCFV-11076 2013-11-21 12:13:30 +01:00
Jérôme Nadaud
033bf745cd Merge pull request #1000 from studiokiwik/sk-ps15x-011 
"---<br />" string is now removed correctly from the end of customization data text
 2013-11-21 00:14:28 -08:00
Gregory Roussac
6d0de6e29e Merge pull request #1003 from priyank/patch-1 
[-] FO : Homefeatured adding a position order by clause.
 2013-11-20 07:29:19 -08:00
Priyank Bolia
0ff7163cba Adding a position order by clause. 
Adding a position order by clause. This way you can manage how the featured products will display on home page. You can manage the order from the PrestaShop backend, and thus you have full control on the display in the frontend.
 2013-11-20 20:56:35 +05:30
gRoussac
914f613e7b [-] FO : Fix bug #PSCFV-11052 no carrier fess whne tax display to false 2013-11-20 15:32:33 +01:00
gRoussac
5ef392aaeb [-] FO : Fix #PSCFV-11069 remove unused file 2013-11-20 14:44:56 +01:00
Quentin Montant
0410378bd3 "---<br />" string is now removed correctly from the end of customization data text 2013-11-20 13:30:47 +01:00
Quentin Montant
1508a8a5d7 "---<br />" string is now removed correctly from the end of customization data text 2013-11-20 11:31:02 +01:00
Damien Metzger
33b8703d24 // Changelog 1.5.6.1 1.5.6.1 2013-11-20 09:43:06 +01:00
Jerome Nadaud
e02b5d5c11 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 
Conflicts:
	admin-dev/themes/default/template/helpers/list/list_header.tpl
 2013-11-18 18:39:25 +01:00