rMalie
|
14542fea44
|
// Merge -> revision 9124
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9125 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-10-07 09:54:43 +00:00 |
|
vChabot
|
23c5f297ce
|
// little fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9072 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-10-05 15:45:01 +00:00 |
|
rMalie
|
b4d436ca21
|
// Merge -> revision 9061
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9069 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-10-05 15:21:55 +00:00 |
|
lBrieu
|
fce8c6a4e0
|
[*] FO : Hide the download link if the virtual product do not have files associated with it
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9062 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-10-05 14:27:30 +00:00 |
|
vChabot
|
8fcc94e777
|
[*] Registration type is now in 2 steps or all in one
// refactoring AuthController.php (front)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8941 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-30 15:48:20 +00:00 |
|
rMalie
|
227e13680b
|
// Refacto of CategoryController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8898 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-29 16:31:32 +00:00 |
|
mDeflotte
|
093c743141
|
[-] FO : BugFix - Ajax error on editing address durring ordering process
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8896 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-29 16:19:33 +00:00 |
|
rMalie
|
8b59a8dd04
|
// Fix authentification gender
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8895 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-29 16:13:50 +00:00 |
|
rMalie
|
42c5603cc3
|
[+] Classes: Add ObjectModel::hydrateCollection() in order to transform arrays from sql queries return in list of objects
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8877 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-29 13:23:54 +00:00 |
|
mDeflotte
|
a40968d40e
|
// Add error message in order details
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8871 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-29 12:29:29 +00:00 |
|
mDeflotte
|
590fbe0ef0
|
//OrderReturnController : Refacto done
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8868 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-29 09:05:03 +00:00 |
|
rMalie
|
be8d2136be
|
// Merge -> revision 8851
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8854 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-28 16:03:30 +00:00 |
|
vChabot
|
966250e202
|
// cleaning code (norm / perf)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8837 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-28 09:37:29 +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 |
|
rMalie
|
1b6d0d1be3
|
// Merge -> revision 8800
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8808 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-27 14:30:06 +00:00 |
|
mDeflotte
|
d277791787
|
[-] FO : URL for page "Forgot your password" is not correct
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8806 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-27 14:23:18 +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 |
|
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 |
|