dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,965 Commits 9 Branches 19 Tags
3fcf166a9da7f893aaeceaa3fc888f5ef845895c
Commit Graph
17965 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Gregory Roussac d618c8618a //norms 2013-04-29 21:55:30 +02:00
Gregory Roussac 2051b925a1 //norms 2013-04-29 21:55:30 +02:00
Gregory Roussac a8698d9e59 [-] Bo : Admin login loop under Firefox 2013-04-29 21:54:26 +02:00
Gregory Roussac 93d5016848 [-] Bo : Admin login loop under Firefox 2013-04-29 21:54:26 +02:00
Rémi Gaillard 9fc4bce500 [-] Core: Fix specific prices if they are configured to count quantity per product and not per combination 2013-04-29 18:49:42 +02:00
Rémi Gaillard 8996690a65 [-] Core: Fix specific prices if they are configured to count quantity per product and not per combination 2013-04-29 18:49:42 +02:00
Damien Metzger 548ef7691a // BO : Changed product display on supplier page 2013-04-29 18:34:34 +02:00
Damien Metzger e56ec2f234 // BO : Changed product display on supplier page 2013-04-29 18:34:34 +02:00
Dragan Skrbic d00ccdf306 // Fixed image import 2013-04-29 18:07:42 +02:00
Dragan Skrbic 7f8a33763a // Fixed image import 2013-04-29 18:07:42 +02:00
Damien Metzger 4c259393f5 // Fixed case which caused duplicated translation #PSCFV-8936 2013-04-29 17:45:45 +02:00
Damien Metzger 7eba77ae66 // Fixed case which caused duplicated translation #PSCFV-8936 2013-04-29 17:45:45 +02:00
Damien Metzger 989b19d94a [-] BO : fixed image import with allow_url_fopen deactivated #PSCFV-8181 2013-04-29 17:45:45 +02:00
Damien Metzger 3600a31862 [-] BO : fixed image import with allow_url_fopen deactivated #PSCFV-8181 2013-04-29 17:45:45 +02:00
gRoussac 88adba8e5b // typo 2013-04-29 17:19:07 +02:00
gRoussac d2d4b68f7c // typo 2013-04-29 17:19:07 +02:00
gRoussac 78747eedc2 // rework of https://github.com/PrestaShop/PrestaShop/commit/5f6d0614df4bf7d354988dd7320d012238488401#commitcomment-3108107 2013-04-29 17:12:17 +02:00
gRoussac 140b9b2bba // rework of https://github.com/PrestaShop/PrestaShop/commit/5f6d0614df4bf7d354988dd7320d012238488401#commitcomment-3108107 2013-04-29 17:12:17 +02:00
gRoussac 9ce2249883 // revert from commit 5f6d0614df 2013-04-29 17:03:41 +02:00
gRoussac 7afdb08a56 // revert from commit 5f6d0614df 2013-04-29 17:03:41 +02:00
vAugagneur 716b79b8c6 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-29 16:21:51 +02:00
vAugagneur 7b1c50b97f Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-04-29 16:21:51 +02:00
vAugagneur acccaf5fbc Merged Pull Request #242 - thanks @andskiba 2013-04-29 16:21:33 +02:00
vAugagneur f58c8e7a93 Merged Pull Request #242 - thanks @andskiba 2013-04-29 16:21:33 +02:00
ccauw 051adc7b36 [-] BO : bug in BO translations when Windows OS 
[-] BO : bug in BO translations when Windows OS

Impossible to translate the strings of the back office in the directory override/controllers/admin/...
under windows environment.

The statement " $parent_class = explode(DIRECTORY_SEPARATOR,..) " returns wrong result under windows environment. because the path name has '/' and '\' chars.

$parent_class contains bad values and the string "override" is not found.
 2013-04-29 16:00:55 +03:00
Rémi Gaillard dc7f1ceddf [-] BO: Fix #PSCFV-8957 order creation when id_cart=0 is present in database but should normally not happen 2013-04-29 13:47:46 +02:00
Rémi Gaillard bfc8a0ad02 [-] BO: Fix #PSCFV-8957 order creation when id_cart=0 is present in database but should normally not happen 2013-04-29 13:47:46 +02:00
Vincent Augagneur d0f6f2b6c7 Merge pull request #389 from ccauw/patch-5 
[*] BO : Add block "override_form_extra"
 2013-04-29 03:11:40 -07:00
Vincent Augagneur e036d47d13 Merge pull request #389 from ccauw/patch-5 
[*] BO : Add block "override_form_extra"
 2013-04-29 03:11:40 -07:00
Damien Metzger 527f87a691 // Fixed directory creation in translation #PSCFV-8212 2013-04-29 12:08:45 +02:00
Damien Metzger 94090e2a39 // Fixed directory creation in translation #PSCFV-8212 2013-04-29 12:08:45 +02:00
Damien Metzger 3b5591dc55 [-] FO : removed misleading label on the shipping total #PSCFV-8556 2013-04-29 11:35:47 +02:00
Damien Metzger 71c3f2e71f [-] FO : removed misleading label on the shipping total #PSCFV-8556 2013-04-29 11:35:47 +02:00
Damien Metzger c587934e25 [-] BO : fixed automatic creation of email overrides in the template #PSCFV-8785 2013-04-29 11:16:26 +02:00
Damien Metzger 43a897436a [-] BO : fixed automatic creation of email overrides in the template #PSCFV-8785 2013-04-29 11:16:26 +02:00
Damien Metzger a06b42704e [-] FO : fixed truncate and entities in the cart block #PSCFV-8870 2013-04-29 10:52:44 +02:00
Damien Metzger 49b5d3ab02 [-] FO : fixed truncate and entities in the cart block #PSCFV-8870 2013-04-29 10:52:44 +02:00
Damien Metzger 903b17979c [-] BO : fixed error message in language form #PSCFV-8890 2013-04-29 10:47:59 +02:00
Damien Metzger 459768d1ac [-] BO : fixed error message in language form #PSCFV-8890 2013-04-29 10:47:59 +02:00
Vincent Augagneur 795d7aa952 Merge pull request #259 from ldecoker/patch-3 
[*] [MO] blocksupplier - missing uninstall method
 2013-04-29 01:38:17 -07:00
Vincent Augagneur 626009d157 Merge pull request #259 from ldecoker/patch-3 
[*] [MO] blocksupplier - missing uninstall method
 2013-04-29 01:38:17 -07:00
Vincent Augagneur ad3ba5342d Merge pull request #291 from minicstudio/development 
[*] MO : blocksearch - override buttons for ajax cart
 2013-04-29 01:35:38 -07:00
Vincent Augagneur bb59365004 Merge pull request #291 from minicstudio/development 
[*] MO : blocksearch - override buttons for ajax cart
 2013-04-29 01:35:38 -07:00
Vincent Augagneur ad17dbc700 Merge pull request #310 from Patanock/patch-5 
[*] BO: Customer and carrier need to be send to the hook
 2013-04-29 01:31:16 -07:00
Vincent Augagneur 218a76c443 Merge pull request #310 from Patanock/patch-5 
[*] BO: Customer and carrier need to be send to the hook
 2013-04-29 01:31:16 -07:00
Vincent Augagneur 83bc226508 Merge pull request #411 from MyBB-Services/dev/gb/mailcolor 
[*] Mails : delete a hard-coded pink background
 2013-04-29 01:28:19 -07:00
Vincent Augagneur e4323f18f4 Merge pull request #411 from MyBB-Services/dev/gb/mailcolor 
[*] Mails : delete a hard-coded pink background
 2013-04-29 01:28:19 -07:00
Vincent Augagneur 5438a131b4 Merge pull request #330 from DrySs/patch-5 
[-] FO: CMS link to conditions should not be in SSL
 2013-04-29 01:22:21 -07:00
Vincent Augagneur fe05e1cc39 Merge pull request #330 from DrySs/patch-5 
[-] FO: CMS link to conditions should not be in SSL
 2013-04-29 01:22:21 -07:00
Grégoire Bélorgey 0fed37eecd [*] Mails : delete a hard-coded pink background 2013-04-29 10:21:53 +02:00