dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
501 Commits 9 Branches 19 Tags
cfca41b0126cd2f4d9aeb77559cd75e4535d3a24
Commit Graph

52 Commits

Author SHA1 Message Date
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
rMalie 4f2a090e24 // Merge -> revision 8720 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8722 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-22 15:45:10 +00:00
rMalie 69db63f26c [*] Front: move front controllers in controllers/front/ directory 
// Refactoring of front controllers part 1

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8721 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-22 15:19:42 +00:00
vAugagneur 8b6ec916e0 [+] BO : now you can choose type of attribute group (select , color, radio) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8691 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-21 14:29:32 +00:00
rMalie 1977f1d851 // Merge -> revision 8608 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8612 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-15 16:10:59 +00:00
vChabot 34c9336b37 [*] FO : display initial price in the cart when a specific price is applied to a product 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8604 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-15 12:37:44 +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
lLefevre 01eb0bedc3 [*] BO & FO : Add image in the description of product (CC008) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8570 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-14 13:29:31 +00:00
aFolletete 59b55487be [-] Classes : Fixed bug on Feature detachables and Customizations 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8557 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-14 09:18:18 +00:00
rMalie 87df41c9d6 // Merge -> revision 8552 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8554 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-14 08:29:10 +00:00
vChabot e4a09c5222 // changing name "available_date_combi" to "available_date" and some features 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8541 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-13 14:52:42 +00:00
vChabot 7564ceb76a [*] BO : add an available date when product is out of stock 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8520 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-13 08:07:34 +00:00
vAugagneur aba41c1078 [+] FO : Messages in order detail are now stored in the Customer Service (SAV) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8518 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-13 07:18:04 +00:00
rMalie b50c7e4334 // Merge -> revision 8507 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8513 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-12 16:17:37 +00:00
vAugagneur 480678b81a [-] FO : fixed small js error 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8494 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-12 12:35:29 +00:00
vAugagneur 625920282a [-] FO : ajax request to send message in order detail now use index.php?controller=order-detail 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8492 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-12 12:21:44 +00:00
vChabot 9ccb38c2af [*] FO : Shop cart visible on payment method choice 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8437 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-09 09:22:59 +00:00
vChabot 875358dd31 [*] FO : improved tab in product page 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8429 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-08 16:22:20 +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 c2258ae8e9 //// Merge -> revision 8290 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8295 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-01 09:53:43 +00:00
rMalie 68c7be42c2 // Merge -> revision 8199 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8200 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-26 07:59:29 +00:00
rMalie b12bf222a9 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8179 b9a71923-0436-4b27-9f14-aed3839534dd 2011-08-24 15:57:10 +00:00
rMalie 22d23f8324 // Merge -> revision 8149 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8151 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-22 16:22:16 +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 2b05b5308c // Merge -> revision 8076 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8081 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-17 08:15:38 +00:00
rMalie 21ca4d15d7 // Merge -> revision 8059 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8062 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-16 09:10:40 +00:00
rMalie 0e4b7fbd72 // Fix PDF controllers + order-detail template 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8039 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-11 15:14:38 +00:00
tDidierjean 09977516c2 // fix product comparison 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8012 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-11 08:39:52 +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
rMalie 47a4f7f31e // Merge -> revision 7941 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7948 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-08-08 16:01:47 +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 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 be4811aa6e // REVERT MERGE 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7761 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-27 13:35:06 +00:00
rMalie e159c925d8 // MERGE with trunk revision 7754 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7759 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-27 12:48:42 +00:00
rMalie e62be3d793 // id_shop on cart product (for links) + change Shop::sqlAsso() + share_order 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7687 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-07-22 08:57:51 +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 ba9cdcf295 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7523 b9a71923-0436-4b27-9f14-aed3839534dd 2011-07-06 10:11:35 +00:00
mMarinetti 9ff675b1e2 // added keywords properties for tpl and js, needed for alpha 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7074 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-06-15 18:28:34 +00:00
fBrignoli 4a210f98d9 [+] Dispatcher 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7069 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-06-15 16:32:06 +00:00
gBrunier 273dc289ef [-] FO : Fixed bug #PSCFI-1718 - Categories block doesn't show categories when processing empty cart checkout. There was a javascript error. 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6133 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-05-02 08:56:16 +00:00
fBrignoli 56099fa735 // merge 1.4 => 6117 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6118 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-04-29 09:09:38 +00:00
aNiassy e60a8b9203 [-] FO : #PSCFI-1674 Display problem about tax identification with guest checkout activated 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6106 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-04-28 14:46:25 +00:00
gBrunier ab4e96b921 [-] FO : Fixed #PSCFI-1611 - Comment mistake 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6052 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-04-24 15:50:33 +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
aNiassy 16d8501d7c #PSCFI-1568 [-] FO : fixed an ajax bug concerning message in one page checkout 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6043 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-04-22 09:56:48 +00:00
tDidierjean 38cf360a0b // merge 6001,6010,6012,6013 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6018 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-04-21 08:01:09 +00:00
gBrunier 8af1e762a3 [-] FO : fixed bug PSCFI-1455 - Class "warning-inline" doesn't exist. Changed to "warning_inline" 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@5982 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-04-19 14:14:10 +00:00
gBrunier d53096c974 [-] FO : fixed bug #PSCFI-1475 - An error occured because of an undefined variable $tag. The variable has been renamed as $search_tag to fix it. 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@5932 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-04-15 15:20:42 +00:00