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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
3fdb9d9eec
[-] FO : #PSCFI-3680 deleted an extraneous slash for the path of blockstore.css
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9185 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-10 13:03:51 +00:00
577221ff08
// Remove bad _SQL_USE_SLAVE_ uses + normalize Db->executeS(), Db->execute() and Db->numRows() names
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9178 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-10 12:18:56 +00:00
14542fea44
// Merge -> revision 9124
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9125 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-07 09:54:43 +00:00
b4d436ca21
// Merge -> revision 9061
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9069 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 15:21:55 +00:00
ae5fc92bf7
// Merge -> revision 8984
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8988 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-03 15:48:07 +00:00
e3f67a1d82
//added missing icons
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8979 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-03 14:16:30 +00:00
ef17d0b7da
// Merge -> revision 8952
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8957 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-03 09:14:01 +00:00
2fbc132933
[+] Classes : added new class Media => It contains all the method related to media like CSS, JS
...
[+] Classes : added new method Media::addJquery(), Media::addJqueryUI(), Media::addJqueryPlugin()
[~] Deprecated : All method related to CCC has been moved in class Media
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8926 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-30 13:01:10 +00:00
3620f0837f
// Merge -> 8910
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8917 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-30 08:17:25 +00:00
227e13680b
// Refacto of CategoryController
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8898 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-29 16:31:32 +00:00
42c5603cc3
[+] Classes: Add ObjectModel::hydrateCollection() in order to transform arrays from sql queries return in list of objects
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8877 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-29 13:23:54 +00:00
mMarinetti