Commit Graph

216 Commits

Author SHA1 Message Date
aFolletete 082d404597 // revert send to friend module
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10110 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-14 16:18:58 +00:00
aFolletete f1d63980e1 // revert blockbestseller.tpl file from revision 10093
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10099 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-14 13:03:03 +00:00
aFolletete 5553d55063 // Module changes for new native template
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10093 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-14 10:56:15 +00:00
rMalie 874a67141f [*] MO: Set default config for blockcms, editorial and moneybookers in their install method
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10038 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-10 14:25:15 +00:00
vChabot 568327849c [*] FO : combination link from product page are now the same as the combination link from blocklayered
// Cart is now accepting the combination link

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10028 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-10 10:45:19 +00:00
rMalie 58a1a5b919 [*] MO: Blockadvertising is now installed only on leftColumn
[*] MO: Editorial module now install default text for each language

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10027 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-10 10:28:59 +00:00
lLefevre f864d987fd [*] BO #PSFV-94 : Added AdminStatsConfController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10012 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-09 16:58:49 +00:00
lLefevre baba250ba6 [*] BO #PSFV-94 : Added AdminStatsController && AdminStatsTabController && norm of statistic modules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10005 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-09 15:50:00 +00:00
lLefevre dc716baa05 [*] BO #PSFV-94 : Added AdminStatsController && AdminStatsTabController && norm of statistic modules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10004 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-09 15:48:15 +00:00
rMalie cff850ed51 // Normalize blocksearch + remove left / right hook during install
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9993 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-09 15:12:04 +00:00
rMalie 14c94558a6 // Some fix on objectModel children classes (fields not valid, etc.)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9985 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-09 12:16:37 +00:00
mMarinetti 4d9c71b4a6 // bugfix vatnumber
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9867 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-03 18:03:29 +00:00
vSchoener ca584c730c // Merge 1.4 -> 1.5
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9835 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-03 13:51:52 +00:00
vSchoener a93440dfa1 // Merge 1.4 => 1.5
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9831 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-03 13:38:12 +00:00
hAitmansour 68694bde19 [-] MO - gsitemap : Fixed bug preventing the generation of sitemap
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9820 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-03 10:11:15 +00:00
vSchoener 1fbf610497 // Merge 1.4 => 1.5
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9819 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-03 10:07:19 +00:00
vSchoener d5900c22f1 // Merge 1.4 => 1.5
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9812 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-03 09:14:25 +00:00
dMetzger 17a8dbc05b // Retro compatibility and updater improved for Discount/CartRules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9798 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-02 14:23:44 +00:00
dMetzger b475167130 // Birthdaypresent is deprecated - no longer supported
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9791 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-02 11:01:58 +00:00
fSerny 0ba4fe9c7e [*] PROJECT : New Module API (part 1)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9790 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-02 10:49:01 +00:00
dMetzger 486622522c [+] Project : Vouchers are now replaced by cart rules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9771 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-01 18:50:42 +00:00
vSchoener a73ff13321 [-] MO : Fixed bug PSCFI-3940
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9748 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-31 13:08:51 +00:00
vSchoener c5dd56aa5f // update paypal version
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9720 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-28 14:11:13 +00:00
vSchoener 6b32d53742 [+] MO : Update Paypal to use the new system to store payment cc details
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9718 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-28 14:07:57 +00:00
vSchoener 7371c301ae // Little fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9708 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-28 12:32:04 +00:00
vSchoener 5e6c8f4b2d [+] MO : Update Moneybookers to use the new system to store payment cc details
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9703 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-28 09:48:07 +00:00
vSchoener 99981ffb51 [+] MO : Update Ogone to use the new system to store payment cc details
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9686 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-27 15:28:58 +00:00
vSchoener 7a453863f9 // update version number of the modules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9685 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-27 15:26:02 +00:00
vSchoener 8a67500a4a [+] MO : Uptdate module to store payment cc information
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9683 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-27 15:15:30 +00:00
vSchoener 2804ac0d2a [+] CORE: Add a way to add easily transaction details (last method changed)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9663 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-27 00:58:24 +00:00
mDeflotte eb08f69f7b // Blocklayered for PS 1.5 - no modifications for the moment
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9654 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-26 13:12:57 +00:00
dSevere e6dfc34e68 // stocks : debug and optimisations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9644 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-25 16:31:26 +00:00
vSchoener e19fdabc20 - Authorieaim : Change format of the stored credit card
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9628 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-25 13:33:28 +00:00
vSchoener 4afc9fbd23 // Delete debug function
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9603 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-24 15:18:43 +00:00
vSchoener e7f323d549 [-] MO: Add infos to Payment_cc table after validate payment and fix test account test, url generation)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9602 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-24 15:17:07 +00:00
mMarinetti 0598f561b7 // temporary fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9514 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-20 15:21:04 +00:00
mDeflotte 9d1650ca0a // fixing bad code indentation for module block layered
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9488 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-20 09:12:20 +00:00
mDeflotte 693e7c05bf // Add mssing translation files
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9487 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-20 09:10:28 +00:00
rGaillard 2a22c9a502 [*] Core: Upgrade smarty to version 3.1.3
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9469 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-19 15:16:52 +00:00
hAitmansour d8509b2829 [*] FO BO MO : rename function isMultiShopActivated by isFeatureActive
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9444 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-19 09:36:12 +00:00
rMalie 42564ca3d0 // Merge -> revision 9435
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9438 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-19 08:14:42 +00:00
rMalie 336fb68ef4 // Merge -> revision 9385
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9386 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-17 09:55:33 +00:00
rMalie a7bc16dadd // Replace shop->sqlAsso(), shop->sqlLang() and shop->sqlRestriction() with shop->addSqlAssociation(), shop->addSqlRestrictionOnLang() and shop->addSqlRestriction()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9384 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-17 09:46:08 +00:00
rMalie 45645f1f50 // Merge -> revision 9352
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9354 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-14 08:20:54 +00:00
mDeflotte 205e54c31c // Add stock avaibility
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9327 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-13 15:58:29 +00:00
rMalie 798de9aaea // Merge -> revision 9288
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9289 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-12 16:04:28 +00:00
vChabot 8e659eb701 [*] BO : carriers are now sortable by position
// Carriers class is now normalized
// Attribute class is now normalized

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9254 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-11 16:29:34 +00:00
rMalie 7db309c819 [+] Classes: Add Xcache support
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9242 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-11 14:28:21 +00:00
rMalie de69396a04 // Merge -> revision 9221
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9226 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-11 12:45:12 +00:00
rMalie ca010e3a20 [-] MO: fix blocktopmenu install
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9220 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-11 11:28:31 +00:00