Commit Graph
5655 Commits
Author SHA1 Message Date
vChabot cbf6cd352e // remove var dump
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15712 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-28 13:52:36 +00:00
rMalie cc179c3a49 // Allow to force routes #PSCFV-2592
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15711 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-28 13:41:00 +00:00
mDeflotte 2c3b45ff44 [-] FO : #PSCFV-2580 - Fix bug with customisation and increasing/decreasing qty
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15710 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-28 13:16:59 +00:00
rGaillard 96305382c2 [*] Core: Upgrade of ajaxfileupload library
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15708 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-28 12:37:11 +00:00
mDeflotte afcda15b61 [-] MO : #PSCFV-2587 - Fix slidedown duration
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15707 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-28 12:24:27 +00:00
mDeflotte 01537675fc [-] MO : #PSCFV-2587 - Fix bug with sliding up block cart
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15706 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-28 09:32:23 +00:00
mDeflotte 0133338989 [-] Project : #PSCFV-2594 - Allow accent in URL
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15705 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-28 09:13:26 +00:00
vChabot 4171dd3230 [-] FO : BugFix : #PSCFV-2541 : TECHNICAL ERROR : unable to save addresses
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15704 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-28 08:31:00 +00:00
rMalie a7b4c666ac // Fix products image duplication on multishop mode #PSCFV-2572
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15703 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-28 08:26:33 +00:00
mDeflotte e3b23ce851 [-] MO : #PSCFV-2587 - Remove "white line" when shopping cart is empty.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15702 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-28 07:53:02 +00:00
rGaillard 5a7b603bca // Miss commit...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15701 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-25 17:14:43 +00:00
rGaillard b953186dbd [-] BO: Fix multishop employee restriction on cart and catalog price rules PSCFV-2505
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15700 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-25 17:12:55 +00:00
rGaillard 21d5cfab87 [-] BO : Delete backslashes quotes on the BackOffice search
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15699 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-25 16:21:03 +00:00
mMarinetti c2f8ecf583 // replaced Tools::file_exists_cache by file_exists()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15697 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-25 15:16:43 +00:00
lLefevre 858bcdac4d [-] BO : fix #PSCFV-2578 : Not duplicate customers with the CSV file
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15696 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-25 15:12:02 +00:00
mMarinetti c0c3986e7f // next version will be 1.5.0.13 :)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15695 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-25 15:11:58 +00:00
mDeflotte 401a1ebcaa [-] BO : #PSCFV-2530 - Change warning message
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15694 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-25 14:51:33 +00:00
rGaillard c9e28d8bf6 [-] BO: Add feedback on backoffice order when the minimal quantity is not reached
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15693 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-25 14:00:16 +00:00
mMarinetti 7faa0b74b1 // fix #PSCFV-905 fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15692 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-25 13:43:41 +00:00
rMalie 34d80f945a // Improve multishop code
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15691 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-25 13:37:43 +00:00
gCharmes aadfad0659 [-] INSTALLER : Add missing key on image product
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15689 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-25 13:16:36 +00:00
lLefevre ae3e40b0b7 // Revert deutsch translation "Kaufen" by "Bestellen"
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15688 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-25 13:11:33 +00:00
lLefevre a9e892e928 [-] BO : fix #PSCFV-2564 : imported customers with a CSV file
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15686 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-25 12:51:55 +00:00
mMarinetti 8bc3badf03 // add missing licence
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15685 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-25 12:23:09 +00:00
dMetzger 75430a0b30 // Fixed cart rules analysis for empty carts
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15684 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-25 11:37:43 +00:00
dMetzger 272906de5f [-] FO : Cart products cache fixed (when you remove a product from the cart)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15683 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-25 11:27:33 +00:00
rMalie 4182732c2a // Clean hooks name cache when a hook is added
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15682 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-25 09:52:59 +00:00
mDeflotte 0aa17da9fd // Remove unusefull "unregisterhook" from the method uninstall of the module homeslider
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15681 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-25 09:41:14 +00:00
aFolletete cd9f202c8c // clean code
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15680 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-25 09:39:49 +00:00
rMalie 30c7ce6255 // Fix id_shop in cart fixtures
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15679 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-25 09:38:13 +00:00
mDeflotte 27ca8f5481 [-] MO : #PSCFV-2567 - Module CMS block was not merged with new shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15678 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-25 08:58:11 +00:00
vAugagneur 81f87e0bfe //now PrestaShop need at least PHP 5.1.3 to run
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15677 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-25 06:53:32 +00:00
mBertholino e161b995a7 //readme-en.txt and readme-fr.txt update
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15676 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-24 21:27:27 +00:00
mDeflotte 1912c4b543 [-] BO : #PSCFV-2562 - Select all categories on creating a new shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15673 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-24 16:44:00 +00:00
lLefevre 598ffaee32 // Fix translations error
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15672 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-24 16:27:16 +00:00
fBrignoli 1c980c9fce [-] BO : Total tax doesn't appear on the invoice
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15671 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-24 16:16:09 +00:00
fBrignoli cc880e2186 // Installer
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15670 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-24 16:01:40 +00:00
mMarinetti ebcbb1b628 [-] upgrader : Fix #PSCFV-2563, thanks to Olea for the report
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15669 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-24 15:56:50 +00:00
lLefevre 62e33d3ca3 // Fix translations error
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15668 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-24 15:47:39 +00:00
lLefevre 11fdfe87d5 [-] BO : fix #PSCFV-2544 : delete selected manufacturers
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15667 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-24 15:25:05 +00:00
aFolletete fbf58446c9 // fixed add order payment
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15666 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-24 14:45:25 +00:00
lLefevre b96ca0977c // Remove comment
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15664 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-24 13:56:45 +00:00
lLefevre daa22a31cd // Fix Message in AdminTranslationsController when use sprintf()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15663 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-24 13:52:49 +00:00
mDeflotte 874e8924e7 [-] BO : #PSCFV-2556 #PSCFV-2550 - Fix password alert message "é"
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15662 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-24 13:20:50 +00:00
fGaillard 49965e89fe // Bug fix payment module (with previous commit)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15661 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-24 13:04:14 +00:00
fGaillard 989f3b46c1 // Bug fix for payment modules (shops informations on validate order)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15660 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-24 13:01:35 +00:00
tDidierjean 0cea293761 [-] TR : fix #PSCFV-2543
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15659 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-24 12:39:28 +00:00
lLefevre 0517f5438d // Fix translations mails errors for each languages
// Now, Subject for reply_msg.html is translated
// Now use sprintf() in subject mails

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15658 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-24 09:57:48 +00:00
fBrignoli 3efd3f7c01 [-] Installer : Specific price could now be equal to 0
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15657 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-24 09:11:40 +00:00
mDeflotte 89509c07f3 // Fix undefined variable when profiling is at on
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15656 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-24 07:10:52 +00:00