dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,009 Commits 9 Branches 19 Tags
398f3aa8ecbfca21cb89d4e9aef80ff2bef4e65f
Commit Graph

410 Commits

Author SHA1 Message Date
bMancone
8d5ad0cb0b // Fixed #PSTEST-751 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13482 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-20 17:46:11 +00:00
dMetzger
609a45f25b [*] BO : you can now choose the combination of the free product of a cart rule 
[*] FO : the free product is now removed from the cart along with the cart rule (where applicable)

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13479 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-20 17:04:41 +00:00
mDeflotte
712ce8a688 [-] FO : #PSCFI-4762 - When cart contains virtuals products and physicals products, use only physicals to calculate shipping cost 
// Product virtuals added before upgrading need to have the column ps_product.is_virtual at 1

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13477 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-20 16:40:22 +00:00
mMarinetti
2f7d1984a3 // fix category_product index unique in upgrade process 1.4.7.0 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13440 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-17 15:34:28 +00:00
mMarinetti
650aedd44a // handle query errors in migrate_orders.php 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13438 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-17 15:06:47 +00:00
mMarinetti
74920d9a78 // fix upgrade_order_canada bug (report from 1.4 fix) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13427 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-17 12:58:52 +00:00
mMarinetti
bee21430e9 // fix bug about order_canada upgrade 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13403 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-16 15:19:11 +00:00
rMalie
3c79768737 [*] Classes : table prefix is no longer required in Db::getInstance()->delete() method 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13396 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-16 14:54:52 +00:00
rMalie
40798e75dd // Fix install when _DB_PREFIX_ is empty 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13395 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-16 14:44:09 +00:00
rMalie
27c3473887 // Prefix is not required anymore in installer 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13385 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-16 10:29:20 +00:00
rMalie
4ba8b2f6e8 // Fix display of list in installer #PSTEST-761 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13372 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-16 08:58:40 +00:00
aFolletete
fa831ba3f3 // fix 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13352 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-15 13:55:42 +00:00
aFolletete
0e84d28ce4 // fix issue on update of orders row 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13350 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-15 13:55:15 +00:00
aFolletete
890dcf85c0 // update installer for 1.5.0.6 version 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13343 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-15 13:27:06 +00:00
rMalie
d0b5c0dcf1 // Fix password storage in installer 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13341 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-15 13:21:09 +00:00
rMalie
4846d86fab // Add nice list in installer 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13340 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-15 13:06:03 +00:00
mMarinetti
07a3754958 // fix upgrade fail when blockcms was not installed 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13323 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-14 17:21:47 +00:00
vChabot
79611fef59 // fix about upgrader and position in category_shop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13319 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-14 16:54:22 +00:00
mMarinetti
58d50f2e30 // fix update_order_canada missing column display method 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13310 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-14 14:42:18 +00:00
mDeflotte
92fdfd36bb // Use id_order for reference order for old orders (1.4) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13305 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-14 14:02:42 +00:00
vChabot
6800f9f67d [-] BO : BugFix : #PSTEST-750 : upgrade sql updated (position field added to the category_shop table) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13301 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-14 13:14:07 +00:00
rMalie
4d90475bb1 // Theme installator is now installed by default 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13291 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-14 10:27:33 +00:00
dMetzger
89286d1b44 [-] Installer : set_time_limit is set to infinite then set to 300 seconds... Second one changed. 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13278 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-14 08:25:38 +00:00
rMalie
59de645ec9 // Fix last smiley in installer + some translations 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13269 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-13 16:45:43 +00:00
rMalie
3cde7ea9cd // Installer redirect to configure page instead on home page when PS is already installed 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13248 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-13 10:37:45 +00:00
rMalie
94b88f676e // Fix countries list in installer 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13241 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-13 09:38:50 +00:00
rMalie
ab913b28e5 // Add list of most used countries in top of countries list in installer #PSTEST-729 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13228 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-10 14:47:23 +00:00
rMalie
92d2df2a16 // Fix lang on installer #PSTEST-682 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13221 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-10 13:19:17 +00:00
rMalie
07856d70db // Fix french translations in installer 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13214 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-10 10:39:48 +00:00
rMalie
c05b9c6797 // Fix FO / Admin links in installer (window was open twice) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13187 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-09 15:56:45 +00:00
rMalie
2ef5f89bce // Installer can work with 18MO (under 32MO sub ajax queries are triggered) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13184 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-09 15:37:48 +00:00
mMarinetti
2e9dcf6e80 // fix upgrader drop index sql warning 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13178 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-09 14:28:03 +00:00
rMalie
6e56c8f32f // Some memory optimizations in installer 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13147 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-08 17:25:28 +00:00
rMalie
40a3a6ec51 // Fix shop association in installer with entity with delayed INSERT queries #PSFV-413 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13142 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-08 16:33:25 +00:00
rMalie
f2d8c6c700 // Add mail with identifiers in installer + some missing trad 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13140 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-08 16:07:41 +00:00
mMarinetti
eb8f07d510 // upgrader fix module_preference table created during upgrade 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13119 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-08 12:40:35 +00:00
mMarinetti
c01de935dc // fix a false positive issue in upgrade process (thanks again to Vincent Grimaud) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13112 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-08 10:15:12 +00:00
mMarinetti
88c10c66ed // now upgrade result has result=error when only php errors happens, thanks to Vincent Grimaud 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13105 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-08 09:35:45 +00:00
rMalie
7e03a9b187 // Revert test jenkins 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13099 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-08 08:43:17 +00:00
rMalie
f6d1badcc8 // test post commit jenkins 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13098 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-08 08:42:46 +00:00
rMalie
7e26fbaf4d // Improve installer 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13097 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-08 08:39:14 +00:00
rMalie
b5210b376c // Add some translations for english, spanish and italian in installer 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13084 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-07 16:28:34 +00:00
rMalie
9b63743dfd // French translation of installer 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13082 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-07 15:48:25 +00:00
mDeflotte
29002976ed // Fix bug with new logo working 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13080 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-07 15:30:23 +00:00
bMancone
07186ff3b9 // Fixed Supply Orders 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13073 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-07 14:59:56 +00:00
rMalie
84042be0f3 // Remove preactivation from installer 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13072 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-07 14:00:40 +00:00
rMalie
e88d9c39a7 // Fix bug when fixtures are disabled + move install type (fixtures or not) to configure step 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13069 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-07 13:37:37 +00:00
mDeflotte
5afa3b2dd9 // Add missing install/upgrade configuration values 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13065 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-07 10:19:20 +00:00
rMalie
2ed626b448 // Change required version to php 5.1.2 in installer 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13064 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-07 10:18:46 +00:00
rMalie
08e40dba01 // Fix potential issue in installer on XmlLoader #PSFV-357 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13059 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-07 09:48:41 +00:00