Commit Graph

5561 Commits

Author SHA1 Message Date
tDidierjean c3bdc25d32 // fix url redirection with multishop secondary urls
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15601 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-22 09:33:24 +00:00
dMetzger 654b7069c5 // Translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15600 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-22 09:20:26 +00:00
fSerny b59423bc94 // Small fix on home
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15598 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-22 09:03:10 +00:00
aFolletete 93ccf3e36e // fixed title in AdminLogin page
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15597 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-22 08:39:24 +00:00
dMetzger 8e035d44c7 // Translation...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15596 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-22 08:17:32 +00:00
aKorczak 4f0ae05ba0 [-] WS : id_group_shop is not mandatory
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15595 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-22 08:01:54 +00:00
dMetzger 6ad6434f4a // Translation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15594 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-22 08:01:26 +00:00
dMetzger d8f7f585c6 // Missing translation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15593 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-22 07:42:37 +00:00
dMetzger 27d833d8de // Translation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15592 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-22 07:29:07 +00:00
vAugagneur c333db6fec //small fix on advertising module link
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15591 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-22 07:17:08 +00:00
dMetzger d981448483 // Missing icon
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15590 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-22 07:14:57 +00:00
rMalie 5bc76bbd14 // Fix share customer on shops
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15589 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 22:03:34 +00:00
rGaillard 2f4cf5f0bc // Fix simple_xml_warnings
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15588 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 21:49:25 +00:00
dMetzger 0f3cdba473 // Initialize english translations for back office search
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15587 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 21:44:07 +00:00
rMalie f969e341c0 // Fix context in multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15585 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 19:33:02 +00:00
dMetzger b63325917c // FreeOrder is now "active"
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15584 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 19:26:43 +00:00
tDidierjean a3fc84b2e2 // move icon
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15583 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 19:18:36 +00:00
rMalie cb4527a95b // Fix multishop in objectModel (langs were not correctly generated when an employee has not all auths on shops)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15582 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 19:12:35 +00:00
tDidierjean 7c77223b23 // add missing icon
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15581 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 19:11:59 +00:00
aNiassy 2c08710938 [-] BO : Modified a translation in French
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15580 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 19:07:16 +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
mMarinetti 2929279f5a // remove deprecated table
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15578 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 19:03:44 +00:00
rMalie 233caca6e6 // Fix default context in shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15576 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 18:57:51 +00:00
dMetzger f1b7e0b834 // Fixed warning when calculating the order total of an empty cart
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15575 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 18:56:19 +00:00
dMetzger 231a924e31 // Cart display for free shipping
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15574 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 18:53:30 +00:00
rMalie dee40a32b1 // Fix default access for profiles in installer
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15573 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 18:48:14 +00:00
aNiassy e5e53d54bb [-] BO : Fixed a bug which did not permitted to found a customer in the creation of order in the back office
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15572 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 18:34:36 +00:00
vAugagneur db90962422 //preview picture
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15571 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 18:19:37 +00:00
fBrignoli 8d60b64c43 // retrocompatibility theme 1.4 + carrier
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15570 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 18:09:16 +00:00
dMetzger 021b46c3e1 // Translation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15569 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 18:08:56 +00:00
lLefevre e956560ac4 // fix css
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15568 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 18:07:43 +00:00
aNiassy ced31aa0ac [-] BO : Modified a translation in French
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15567 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 18:07:30 +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
fSerny e70fbf89dc // Missing french translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15564 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 18:02:21 +00:00
tDidierjean a84328a595 // fix image file upload for IE
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15563 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 17:49:28 +00:00
rMalie 9291b9ad1f // Fix list of customers in multishop #PSCFV-2499
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15562 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 17:44:38 +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
dMetzger 477bcc6b58 // Cart display improved with free shipping
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15560 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 17:33:51 +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
mDeflotte 4b1cce7054 // Fix bug with gift products and multishipping
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15558 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 17:31:43 +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
mMarinetti 42e1a25ec0 // remove not useful comments
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15556 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 17:19:52 +00:00
mMarinetti a36c0d5776 [-] Installer : fix missing columns, #PSCFV-2464
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15555 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 17:18:03 +00:00
mMarinetti c735c84ea9 // additional fix for cms feature and blockcms module
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15554 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 17:17:08 +00:00
aFolletete 6a56d02c1f [-] FO : fixed bug #PSCFV-2382 - Your shopping cart is empty not appear and the right column go to the left side
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15553 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 17:16:36 +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
dMetzger 19b486d1e4 // Norm
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15550 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 17:09:21 +00:00
dMetzger fc33b24f3d [-] FO : wrong calcul of the free shipping in multi-shipping
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15548 b9a71923-0436-4b27-9f14-aed3839534dd
2012-05-21 17:08:16 +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