 lBrieu
|
97aa51eb20
|
[+] BO : Add translations for notifications messages
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8528 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-13 09:06:46 +00:00 |
|
|
lBrieu
|
36ffc04d26
|
[*] BO : Allows to get more details on the notification (customer name, total paid real, etc...)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8527 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-13 09:06:17 +00:00 |
|
|
lBrieu
|
bf480eb45e
|
[*] BO : Shows more details for each notification
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8525 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-13 09:05:30 +00:00 |
|
|
rMontagne
|
0c2521c568
|
Fix Classe FileUploader
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8523 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-13 08:25:52 +00:00 |
|
|
vChabot
|
8c23f118f1
|
// assign variables to display cart from payment method choice
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8522 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-13 08:24:40 +00:00 |
|
|
tDidierjean
|
74f7dda09e
|
// fix ajax fileuploader error with duplicate positions
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8521 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-13 08:21:26 +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 |
|
|
vChabot
|
602bfdfdec
|
// conflict removed
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8517 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-13 07:13:25 +00:00 |
|
|
lBrieu
|
da410fa260
|
[*] BO : Shows more details for each notification
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8516 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-12 16:46:07 +00:00 |
|
|
lBrieu
|
4f3f180fdd
|
[+] BO : Allows to get more details on the notification (customer name, total paid real, etc...)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8515 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-12 16:45:18 +00:00 |
|
|
rMalie
|
3df03aa2bb
|
// Merge -> revision 8507
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8514 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-12 16:20:30 +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 |
|
|
rMontagne
|
3c6a0944fa
|
[*] BO : Update Translation Error for Multiple Upload
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8512 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-12 16:00:20 +00:00 |
|
|
rMontagne
|
712a8cd21d
|
[*] BO : Add Style Multiple Upload
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8511 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-12 15:56:22 +00:00 |
|
|
rMalie
|
467313e111
|
// Normalization
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8509 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-12 15:49:01 +00:00 |
|
|
rMontagne
|
9fbc821f61
|
[+] BO : Add Multiple Ajax Upload Image on AdminProduct
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8508 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-12 15:46:36 +00:00 |
|
|
aFolletete
|
4bacf38897
|
// revert
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8505 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-12 15:25:21 +00:00 |
|
|
fBrignoli
|
c9de718503
|
[-] Installer : Removed AdminCounty
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8501 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-12 14:37:32 +00:00 |
|
|
lLefevre
|
7869976b39
|
// fixed commit 8499 : change css to div.hint
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8500 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-12 14:01:40 +00:00 |
|
|
lLefevre
|
90724761b0
|
[*] B0 : change the tooltip (CC014)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8499 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-12 13:21:48 +00:00 |
|
|
vAugagneur
|
a318f6e081
|
//added tools/smarty/cache AND tools/smarty/compile in ignore list
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8497 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-12 12:52:57 +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 |
|
|
lLefevre
|
80d8b0a1a9
|
[*] BO : change a number of character by short description(BL007)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8489 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-12 11:57:30 +00:00 |
|
|
vAugagneur
|
fbfe491903
|
[-] Controller : fixed sql bug in contact controller
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8484 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-12 09:15:50 +00:00 |
|
|
tDidierjean
|
a3245e4093
|
[*] BO : Removed size limit for image upload (BL006, CC136)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8482 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-12 09:14:07 +00:00 |
|
|
lBrieu
|
77a4815ef0
|
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8446 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-09 13:14:47 +00:00 |
|
|
lBrieu
|
0f64fbb542
|
[+] Add translations for labels (Notifications on BO)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8445 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-09 13:14:30 +00:00 |
|
|
rMalie
|
a25f1341ea
|
// Fix discounts
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8442 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-09 11:41:02 +00:00 |
|
|
rMalie
|
a886313c61
|
// Fix discount creation (bad redirection, missing context value)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8439 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-09 09:42:55 +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
|
eacdc8d624
|
// Fix UTF-8 on install files
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8422 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-08 14:14:37 +00:00 |
|
|
rMalie
|
24e213cda8
|
// Merg// Merge -> revision 8395
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8397 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-07 16:23:13 +00:00 |
|
|
rMalie
|
5aab81dc66
|
// Fix carrier creation for multistore
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8396 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-07 15:47:45 +00:00 |
|
|
rMalie
|
7ef8474e4c
|
// Fix tryToConnect methods for DB
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8386 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-07 12:25:47 +00:00 |
|
|
rMalie
|
5a41f08c70
|
// Fix tryConnection and tryEncoding for MySQL
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8383 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-07 09:44:20 +00:00 |
|
|
aFolletete
|
18c930c28e
|
[-] Classes : fixed sql error on Combination class
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8382 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-07 08:46:05 +00:00 |
|
|
lBrieu
|
79346ead0d
|
[+] Update the CSS problem
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8381 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-07 08:34:43 +00:00 |
|
|
rMalie
|
174947be5b
|
[*] Project: MySQL::trytoconnect() and MySQL::tryUTF8() methods replaced with Db::checkConnection() and Db::checkEncoding()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8380 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-07 08:16:43 +00:00 |
|
|
rMalie
|
0c7d567451
|
// Fix carrier bug for virtual products during payment
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8368 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-06 13:34:44 +00:00 |
|
|
rMalie
|
39f2f53db2
|
// Merge -> revision 8363
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8365 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-06 12:38:55 +00:00 |
|
|
jmCollin
|
76f895c4d5
|
// Correct create product
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8361 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-06 11:38:47 +00:00 |
|
|
rMalie
|
e7b5cd5b95
|
// Fix HTML validation on URLs (replace & per &)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8355 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-06 09:58:11 +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 |
|
|
rMalie
|
371f9a5397
|
[+] Add native MySQLi support
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8341 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-05 13:55:11 +00:00 |
|
|
rMalie
|
9032e37b38
|
// Fix stock for customizable features
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8340 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-05 13:53:39 +00:00 |
|
|
rMalie
|
1e55c19726
|
// Fix getPush() for notifications
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8336 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-05 12:09:49 +00:00 |
|
|
lBrieu
|
3842a2f473
|
// Update "$this->context->employee->id" to "Context::getContext()->employee->id"
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8334 b9a71923-0436-4b27-9f14-aed3839534dd
|
2011-09-05 09:57:33 +00:00 |
|