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

5959 Commits

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
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
Rémi Gaillard
09b5d3a0b8 Merge pull request #863 from Prestaworks/patch-15 
// Update GuestTrackingController.php
 2013-11-25 07:52:57 -08:00
Rémi Gaillard
4cba2623e5 Merge pull request #926 from djfm/loc_ui 
//Localization
 2013-11-18 06:32:34 -08:00
Jerome Nadaud
bcc851c98c // Update image fix 2013-11-18 14:44:23 +01:00
gRoussac
bfed3532bf [*] BO : AdminPerformances Hide warnings message when not necessary 2013-11-15 16:12:07 +01:00
gRoussac
73bf2a7db1 [-] BO : Fix #PSCFV-11016 typo 2013-11-15 15:16:02 +01:00
Jerome Nadaud
50eee795ed // Add truncate category description preserving html tags 2013-11-15 11:03:06 +01:00
gRoussac
6393746f04 [-] BO : 406 when mod_security follow up 034e6a7e7f 2013-11-14 11:43:05 +01:00
gRoussac
db99f188a2 [-] BO : AdminImport, execption when creating groups 2013-11-13 18:23:41 +01:00
Rémi Gaillard
83400c691c Merge pull request #973 from djfm/development 
//translations
 2013-11-13 06:34:38 -08:00
fram
28e1a94bb6 // instead instead of insted 2013-11-13 15:10:06 +01:00
gRoussac
5a8c335d78 [-] FO : Bad value for back when controller name is sent 2013-11-13 12:30:39 +01:00
gRoussac
6ddf220aee [-] Fo : Call Gmaps on https if required 2013-11-12 21:16:09 +01:00
gRoussac
f0f3679cbd [*] FO : https on TOS in fancybox, follow up https://github.com/PrestaShop/PrestaShop/pull/956 2013-11-12 15:56:04 +01:00
gRoussac
3f42a381a4 [*] FO : Redirect to address.tpl when !Address::isCountryActiveById 2013-11-12 12:12:19 +01:00
gRoussac
a7869a1f06 [*] CORE : Remove duplicate SQL queries 2013-11-11 13:41:23 +01:00
gRoussac
91cde1ab3a [-] BO : getCMSPages to associated shop in cmscontroller 2013-11-07 12:09:58 +01:00
gRoussac
fc4a660f76 [-] BO : Fix bug #PSCFV-10666 product_supllier currency set to 0 2013-11-07 11:24:32 +01:00
PhpMadman
d95885caae [*] FO : Added posibilty to display new price instead of quantity discount 2013-11-06 14:41:42 +01:00
fram
4b0b5cf4da // added an option not to override the local localization pack when installing a localization pack 2013-11-05 12:08:14 +01:00
gRoussac
581645ce6d [-) BO : Action is mandatory for a cart rule 2013-11-05 11:26:10 +01:00
Jerome Nadaud
12276f41fb // Update image when updated 2013-11-04 18:26:24 +01:00
gRoussac
be13f82b30 [*] FO: Follow up e86c56172d 2013-11-04 18:20:01 +01:00
Rémi Gaillard
bf8cd29868 // validator on message field 2013-11-04 14:21:42 +01:00
Rémi Gaillard
d49c4cf62e [-] BO: Fix from name when replying to customer threads 2013-11-04 09:38:12 +01:00
Jerome Nadaud
671062af07 // Add Disable overrides to debug mode 2013-10-31 18:41:56 +01:00
gRoussac
80c60be952 [-] BO : Do not enable rewrite url for index 2013-10-31 16:20:55 +01:00
gRoussac
f9dc0b0252 [-] MO : Could not translate in transit mail, revert from 3213b5dffb 2013-10-31 14:20:21 +01:00
gRoussac
f78cde96d6 [-] BO : AdminImport wrong group by default 2013-10-30 18:37:26 +01:00
gRoussac
56799f53c8 [-] Bo : AdminImport customer group default 2013-10-30 17:12:20 +01:00
Jerome Nadaud
da43700361 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-10-30 16:48:26 +01:00
Jerome Nadaud
d7b46e80af [+] BO : Add debug mode system 2013-10-30 16:48:16 +01:00
gRoussac
b311a0c719 [-] BO : Fix bug #PSCFV-10872 AdminImport could not import supllier orders 2013-10-30 16:06:38 +01:00
Rémi Gaillard
f9b1545037 // missing file 2013-10-30 14:59:08 +01:00
gRoussac
8953c55b7f [-] BO : Adminimport default customers group 2013-10-30 12:30:22 +01:00
gRoussac
26b4fbf883 [*] BO : Manual merge of https://github.com/PrestaShop/PrestaShop/pull/891 1/2 2013-10-29 19:07:31 +01:00
gRoussac
c98b5e0c78 [*] CORE : Manual merge of https://github.com/PrestaShop/PrestaShop/ thanks @kpodemski 2013-10-29 19:05:21 +01:00
Gregory Roussac
90bef56c84 Merge pull request #907 from djfm/development 
// Frenglish
 2013-10-29 08:24:45 -07:00
djfm
9d18ef8186 // Frenglish 2013-10-29 14:44:51 +00:00
Damien Metzger
d5eedd5eaa Merge pull request #906 from djfm/development 
// Small fix
 2013-10-29 07:42:07 -07:00
gRoussac
a43851469e [-] CORE : Currency conversion rate can not be 0 2013-10-29 15:39:17 +01:00
djfm
0288696c90 // English 2013-10-29 14:37:55 +00:00
PhpMadman
87bb957431 fixed missing comma 2013-10-29 13:28:00 +01:00
PhpMadman
7b029457e4 [-] BO : hide stmp options when selecting never send emails 2013-10-29 12:41:24 +01:00
Jerome Nadaud
b605f33359 [-] BO : FixBug #PSCFV-10866 - Tagify system not working 2013-10-29 12:07:30 +01:00
Jerome Nadaud
580e201c48 [-] BO : FixBug #PSCFV-9319 - display only valid order id 2013-10-29 11:38:48 +01:00