Commit Graph

1670 Commits

Author SHA1 Message Date
mDeflotte 6f6f13a4e0 // BugFix : "Please accept Terms of Service" always displayed
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10508 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 10:32:29 +00:00
rGaillard fd06e5c1a1 // Fix online visitors on carts tab
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10507 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 10:32:13 +00:00
rGaillard ccaa0542a0 // Configuration feedback is now not displayed when changing shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10505 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 10:19:27 +00:00
rMalie faa6dda362 // Multishop: redirect 301 to main URL with request uri when a non main URL is triggered
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10504 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 10:18:42 +00:00
rGaillard 06ab93a8f6 // ajax process off adminaccess is now in the controller
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10503 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 10:01:22 +00:00
mDeflotte 4261dbc0df // Multishipping : Refresh carrier list
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10502 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 09:57:21 +00:00
rMalie c45a172559 // Fix admin toolbar: don't go anymore on top page when clicking on toolbar submit actions
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10501 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 09:42:53 +00:00
rGaillard 335d5cf93d // Fix displaying name of shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10500 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 09:35:30 +00:00
lLefevre 4427b9a377 // Fix bug in AdminCartsController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10499 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 09:28:36 +00:00
vKham 95de65c92f //
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10496 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 09:15:27 +00:00
vKham 772083c15d //
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10495 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 09:14:42 +00:00
fSerny 8bec694c94 [-] MO : Tnt Carrier (1.2.1) - Small fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10494 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 09:13:25 +00:00
rMalie 21666cf39d // Fix html entities on admin template list_footer.tpl for bulkaction
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10490 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 08:49:19 +00:00
dMetzger 63436b787b // CartRule fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10489 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 08:49:05 +00:00
dMetzger b854caf867 // Avoid some crashes
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10488 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 08:39:49 +00:00
vAugagneur 2a0dcf9692 //remove debug
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10486 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 08:35:38 +00:00
lLefevre 76f3457e2f // fix added translation for controllers
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10485 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 05:59:34 +00:00
fSerny 48a8719d2f [-] MO : TNT Carrier (1.2)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10484 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 00:54:51 +00:00
fSerny e718fb9c02 [-] MO : TNT Carrier (1.1)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10483 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 00:29:59 +00:00
rGaillard a02f6983f0 // Add multishop association for blocktag module
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10482 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 23:02:24 +00:00
rGaillard 1278a064b6 // blockstores is now multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10481 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 22:30:12 +00:00
rGaillard 48776271fd // blockstores is now multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10480 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 22:21:05 +00:00
vAugagneur c827a9af0e //
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10479 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 22:09:22 +00:00
vAugagneur 9aa523fb4d //remove debug
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10478 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 22:03:52 +00:00
vAugagneur 9756801649 [+] BO : added new input type tags
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10477 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 21:48:07 +00:00
rGaillard e02cc320ee // CMS - Add shop filters
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10476 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 21:18:24 +00:00
rGaillard ad9bf8d324 // Fix blockmanufacturers
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10475 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 20:51:40 +00:00
rGaillard 13f63f53f7 // Update blockcontactinfos
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10474 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 20:38:45 +00:00
rGaillard 9d6ab8e70b BlockContact update
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10473 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 20:35:48 +00:00
rGaillard ef75f20a63 // miss file on last commit
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10471 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 20:22:29 +00:00
rGaillard e84dec5c4a // Blocktopmenu is now compliant with multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10470 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 20:21:58 +00:00
vAugagneur 0242329b30 //
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10468 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 19:33:19 +00:00
dSevere 844b0f4055 // Product Admin Controller : update toolbar + bugs fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10467 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 19:17:41 +00:00
bMancone 933d1e4d86 // Stock/Supply order : added french translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10466 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 18:51:23 +00:00
bMancone 699ee23d94 // AdminStockMvt : ergonomy
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10465 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 18:50:53 +00:00
lLefevre 5f91af9c4e // fix display AdminLogsController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10459 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 17:21:41 +00:00
mDeflotte 5532f12d80 // Multishipping : on opc, on putting multi-shipping to off, the cart is set to one address delivery
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10458 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 17:18:30 +00:00
tDidierjean 4dc0ebb2de // fix AdminStatsTab::displayStats() when no module is active
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10457 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 17:17:19 +00:00
lLefevre a848e82ae9 // fix bug AdminTranslationsController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10456 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 17:14:11 +00:00
lLefevre cbea65eb66 // fix bug in AdminController method initView()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10455 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 17:00:09 +00:00
lLefevre 41d593618d // fix bug in HelperView
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10454 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 16:59:03 +00:00
tDidierjean c5c479dcb7 // Added toolbar to AdminModulesPositions and added full products list on AdminProducts
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10453 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 16:49:52 +00:00
fBrignoli cb92bacb97 // Strict standard on initView
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10452 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 16:45:47 +00:00
dSevere 1934e2ef6a // Product Admin Controller : update interfaces for quantities, suppliers and warehouses + bugs fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10451 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 16:41:42 +00:00
lLefevre 3ceff1df09 // delete multiple button save in AdminStatsTabController and added juery ui datepicker
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10450 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 16:36:10 +00:00
rMontagne f00820e090 //fix UpdateShopAssocImage
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10449 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 16:29:10 +00:00
bMancone 6d46e7dced // Supply Orders : prices are now correctly converted, depending on the currency of the order/warehouse
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10448 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 16:23:00 +00:00
rMontagne 3439de9ef9 //fix Image.tpl for unique shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10447 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 16:22:23 +00:00
mDeflotte 49922799e1 // BugFix : Problem with token
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10446 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 16:09:49 +00:00
lLefevre 40d2a6282b // fix added toolbar in AdminInformationController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10445 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 16:05:08 +00:00