Commit Graph

1688 Commits

Author SHA1 Message Date
vAugagneur
3359ebb347 //clean footer.tpl
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10526 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 13:39:24 +00:00
dMetzger
bb7050715b // bug fix for the cart rules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10525 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 13:38:41 +00:00
dSevere
bac9674b03 // not required anymore
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10524 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 13:30:42 +00:00
dMetzger
dce036f929 // 2 bug fixes for the cart rules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10523 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 13:24:15 +00:00
lLefevre
d764a3c2fe // Added view.tpl in AdminPaiementController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10522 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 13:22:28 +00:00
lLefevre
a6b66fb288 // Fix bug in AdminPaymentController && added toolbar
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10521 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 13:21:39 +00:00
dSevere
ad6e5b1cb8 // AdminController and stock management : some debug and updates
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10520 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 13:15:40 +00:00
tDidierjean
27e910572c // fixes to orders->view product, adminsearch->toolbar, admintaxrules hint
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10519 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 13:14:07 +00:00
rMalie
0f87f86203 // Fix some bug on multishop + improve display of shop pages
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10518 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 13:09:23 +00:00
vAugagneur
7c7eda3167 //clean header.tpl and footer.tpl
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10517 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 12:59:02 +00:00
bMancone
2dbeb55bf1 // AdminProductsController: added new array to translate tabs name. Added translations of fr/admin & SupplyOrderForm(PDF)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10516 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 11:41:25 +00:00
bMancone
9506172dd4 // AdminController: typo (?) in an error message
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10515 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 11:39:51 +00:00
fSerny
79867d0a75 [-] BO : AdminModules fix on Addons Connection
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10514 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 11:31:39 +00:00
vAugagneur
aed1e77b94 //clean header.tpl
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10513 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 11:28:31 +00:00
rGaillard
ddcdcd571d // Warning is now displayed for shop without url
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10512 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 11:11:45 +00:00
vSchoener
130cf8ed11 // Update accounting controller due to last commit
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10511 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 10:57:07 +00:00
dMetzger
ca68421dae // Translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10510 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 10:49:44 +00:00
rGaillard
3790730861 // Little fix on carts tab filters
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10509 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 10:37:33 +00:00
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