Commit Graph

1602 Commits

Author SHA1 Message Date
dMetzger 061cfb7f5c // Changed default limit of file upload
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15891 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-07 07:43:30 +00:00
rGaillard 2bce691ae8 // Improve performance and bug fixes
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15882 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-06 16:22:48 +00:00
fBrignoli f18ffe592e [-] BO : Bug Fixed #PSCFV-2677 - You shouldn't be allowed to put spaces in virtual url
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15860 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-05 16:18:48 +00:00
dMetzger 9e6341df71 // Code cleaning
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15849 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-05 11:51:46 +00:00
mDeflotte 0fc967b388 // Trads
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15843 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-05 08:59:29 +00:00
aFolletete b734c47616 [-] BO : fixed bug #PSCFV-2584 - fix translations issue in product page
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15836 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-04 15:53:43 +00:00
rMalie b6f84715b6 // Hide checkbox in configuration multishop when employee manage only 1 shop #PSCFV-2649
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15800 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-04 07:49:20 +00:00
lLefevre dd8abfe708 [-] BO : #PSCFV-2660 : Fix bug in regex for parse translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15799 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-04 07:41:01 +00:00
mDeflotte d02787dc97 [-] Project : #PSCFV-2633 #PSCFV-2622 - Fix problems with multishipping and order payment & invoice
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15797 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-01 15:40:32 +00:00
lLefevre fa93f8f025 // Update translations key
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15793 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-01 14:58:25 +00:00
rGaillard 1334a89e95 [-] BO: Hide birthday date on BackOffice order when empty
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15791 b9a71923-0436-4b27-9f14-aed3839534dd
2012-06-01 14:23:33 +00:00
dMetzger a6ca0bb1b2 // Code cleaning
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15770 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-30 16:18:10 +00:00
dMetzger 5ea6aca2ca // Added a link to Addons instead of a simple text
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15757 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-30 09:54:39 +00:00
rMalie 01e43be9b8 // Fix Maxence's text
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15751 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-30 08:35:42 +00:00
dMetzger 1b3127a61f // Template cleaning
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15727 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-29 09:38:19 +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 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
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 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
lLefevre 47e5d492a4 // small fix in CSV import controller
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15648 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-23 16:13:27 +00:00
vSchoener f7c208851d [-] BO : Update assign value
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15633 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-23 08:19:32 +00:00
lLefevre c87dedb522 // Fix link troubleshoting for CSV file
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15626 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-22 14:08:24 +00:00
dMetzger 88156e6eaf // fix issue in AdminPayment
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15624 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-22 13:54:46 +00:00
tDidierjean 4fcc657a56 [-] BO : fix bug #PSCFV-2522 - Unable to switch a product from virtual to normal
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15621 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-22 13:23:35 +00:00
rMalie 3c41954293 // Improve multishop page ergonomy
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15620 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-22 13:16:48 +00:00
lLefevre d8569a1ab1 // Fix small bug
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15579 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 19:04:58 +00:00
aFolletete 545abdbc24 [-] BO : fixed bug #PSCFV-2503 - fix issue on stock update when product line edition in order
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15566 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 18:04:07 +00:00
rGaillard 18160ffa65 // Little fix on order page
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15561 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 17:38:55 +00:00
lLefevre 9c00c0eb1e [-] BO : fix #PSCFV-2366 : check if an sentence use an specific syntax
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15559 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 17:31:48 +00:00
fSerny d3c4a7a617 // Small fix on Admin
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15557 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 17:25:26 +00:00
vAugagneur b67a4fdd77 //fixed #PSCFV-2432 part 3 for IE :p
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15552 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 17:15:51 +00:00
rGaillard 8b589b02c0 [*] BO: Add free shipping to BackOffice Order
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15551 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 17:11:00 +00:00
vAugagneur 4b4f1be743 //fixed #PSCFV-2432 part 2 for IE
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15547 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 17:07:51 +00:00
vAugagneur 0f91f91030 //fixed #PSCFV-2432
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15546 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 17:01:22 +00:00
rGaillard d1e74ce3be // Display warning if no address is available in backoffice order
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15529 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 15:27:11 +00:00
rGaillard ac08ba378b // Product is now correctly inserted in product_shop for existant products
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15484 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 09:46:53 +00:00
rGaillard c22c0d97f7 // Add information on BackOffice Order
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15475 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 08:48:55 +00:00
lLefevre 56690036fb [-] BO : fix #PSCFV-2365 : add message for using the sprintf() in yours translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15473 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 08:10:20 +00:00
bLeveque 6bd5e1dce6 [-] BO : Fixed an issue with htmlentities()
[-] BO : Fixed the Sample file for Categories Import - #PSCFV-1960

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15463 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 22:15:58 +00:00
jObregon 4476b69cac [-] BO : Fixed bug #PSCFV-2288. _PS_ADMIN_DIR_ was not defined
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15462 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 22:03:35 +00:00
bLeveque 6f00731fba [-] INSTALLER : Fixed a missing "echo" at Step 3 in the SMTP configuration
[-] BO : Fixed a French hardcoded page (Favorites Views)
[-] BO : Fixed a typo ("Informations" => "Information")
[*] BO : Improved the UI of the Combinations generator and added some explanations - #PSCFV-770
[*] MO : Added a # before the order number in the e-mail sent to the merchant when an order is placed

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15461 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 20:55:05 +00:00
rGaillard 1bd51177f8 [-] Core: Fix PSCFV-2109 specific prices when updating product
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15451 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 14:55:28 +00:00
lLefevre c344ae2385 [-] BO : fix #PSCFV-2381 : now count translations fields are good and translations...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15443 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 13:26:27 +00:00
aFolletete 098e0fbc35 [-] BO : fixed bug #PSCFV-2436 - fix bug on product adding on order page
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15425 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 10:52:04 +00:00
rMalie 5781694b9f // Fix multishop checkbox on theme selection
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15423 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-19 10:43:01 +00:00
vChabot 98ff09c8ee // removing shop associations from product page
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15391 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-18 15:13:36 +00:00
rMalie a37dbc1e44 // Fix lot of multishop bugs (updateAssoShop reworked, remove multishop property for country / zone / currency / carrier, getList())
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15386 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-18 14:54:37 +00:00
rGaillard 66c9b52d43 // Fix product stocks on multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15379 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-18 14:32:29 +00:00
tDidierjean 7670c2d207 [-] BO : fix bug #PSCFV-2387 - z-index fixes
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15366 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-18 09:20:53 +00:00
fSerny 63041b0b31 [-] BO : Fix scroll when errors occurred on modules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15358 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-17 00:07:03 +00:00