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

34 Commits

Author SHA1 Message Date
mDeflotte
78ddaa120c // Stock decrementation when order is shipped 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9486 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-20 09:08:59 +00:00
hAitmansour
d8509b2829 [*] FO BO MO : rename function isMultiShopActivated by isFeatureActive 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9444 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-19 09:36:12 +00:00
rMalie
42564ca3d0 // Merge -> revision 9435 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9438 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-19 08:14:42 +00:00
rMalie
577221ff08 // Remove bad _SQL_USE_SLAVE_ uses + normalize Db->executeS(), Db->execute() and Db->numRows() names 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9178 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-10 12:18:56 +00:00
rMalie
ae5fc92bf7 // Merge -> revision 8984 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8988 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-03 15:48:07 +00:00
rMalie
ef17d0b7da // Merge -> revision 8952 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8957 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-03 09:14:01 +00:00
vChabot
2045401f9e // cleaning code (norm / perf) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8810 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-27 15:08:24 +00:00
vChabot
255160292a // import OK for product feature 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8772 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-26 13:50:53 +00:00
vChabot
83fc0977c9 [*] BO : Features are now sortable. 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8751 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-23 15:45:40 +00:00
vChabot
46ba33ef92 // import csv ok for group attribute position 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8693 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-21 14:38:12 +00:00
tDidierjean
b45dd02452 // remove deprecated PS_ADMIN_DIR by _PS_ADMIN_DIR_ 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8666 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-20 15:53:57 +00:00
vChabot
58c8c71018 // import csv ok for product attribute position 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8652 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-20 08:25:50 +00:00
rMalie
03eaee9bf4 [+] Project: it's possible to create new genders, "Miss" gender is now added 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8578 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-14 15:15:51 +00:00
rMalie
79fd72e461 // Merge -> revision 8342 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8344 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-05 14:56:02 +00:00
tDidierjean
16516953fb // Merge -> revision 8206 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8210 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-26 15:52:42 +00:00
rMalie
0aada6cc1e // Merge -> revision 8097 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8100 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-17 16:10:20 +00:00
rMalie
7411db9a69 // Merge -> revision 7979 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7981 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-10 08:36:17 +00:00
tDidierjean
653ef8d115 // Context part 29 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7935 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-08 13:17:12 +00:00
rMalie
239f92eaf1 // Merge -> revision 7906 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7909 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-05 13:26:44 +00:00
rMalie
f2b5ee338b // Merge -> revision 7875 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7877 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-03 16:16:49 +00:00
rMalie
ffeb22bfb9 // Merge with revision 7841 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7844 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-02 11:43:58 +00:00
rMalie
c945049ef1 // Some fix + improve ergonomy + Tools::isMultiShopActived() moved in Shop class + 1.5.0.1 version in install script 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7842 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-02 09:54:23 +00:00
tDidierjean
d3b2ff2664 // Context part 25 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7794 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-28 14:17:58 +00:00
rMalie
a875fecb20 // MERGE with 1.4 r7770 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7776 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-28 09:20:57 +00:00
rMalie
c9ad75fe11 // Routes for dispatcher (part 3) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7743 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-26 16:47:41 +00:00
rMalie
fa2fc8b69d // No more mysql_error() hard coded ! 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7651 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-19 11:35:33 +00:00
tDidierjean
e5c68ba9ae // Context part 5 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7624 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-13 15:24:38 +00:00
rMalie
10dd3db8d4 // Refactoring of shop class with new context 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7604 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-12 16:28:20 +00:00
rMalie
3c50152c94 // Some fix + multistore for import tools 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7546 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-07 12:18:27 +00:00
rGaillard
8a59d0dc41 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7524 b9a71923-0436-4b27-9f14-aed3839534dd 2011-07-06 10:54:11 +00:00
rGaillard
69f2f09dc5 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7522 b9a71923-0436-4b27-9f14-aed3839534dd 2011-07-06 10:10:43 +00:00
vAugagneur
35ff645731 //merge 1.4 => 1.5 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6124 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-04-29 12:34:09 +00:00
fBrignoli
43b6a41bbc // merge 1.4 (5397) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6048 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-04-22 16:00:58 +00:00
aFolletete
10445ad61d // 1.5 branche creation 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@5881 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-04-12 18:24:40 +00:00