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
aNiassy
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
rMalie
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
rMalie
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
rMalie
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
rMalie
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
vAugagneur
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
rMalie
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
vAugagneur
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
rMalie
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
rMalie
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
rMalie
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
rMalie
be8d2136be
// Merge -> revision 8851
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8854 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-28 16:03:30 +00:00
bMancone
7dcd300c7d
// productcomments
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8835 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-28 09:02:51 +00:00
bMancone
96ed001ff3
// productcomments
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8833 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-28 08:50:40 +00:00
bMancone
0db92ddae5
// HomeSlider
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8832 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-28 08:45:41 +00:00
vChabot
c682a16028
// fix parse error
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8831 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-28 08:42:20 +00:00
rMalie
1b6d0d1be3
// Merge -> revision 8800
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8808 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-27 14:30:06 +00:00
vAugagneur
f7c7b6350f
[-] MO : fixed FATAL error on layered navigation module
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8781 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-26 16:31:36 +00:00
rMalie
1437dec72f
[*] MO: module cheque use the new moduleController system
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8741 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-23 14:34:18 +00:00
rMalie
7c85e104de
// Merge -> revision 8734
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8740 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-23 14:06:47 +00:00
rMalie
4181a8ea5b
// Rename Module->smartyAssign to Module->templateAssign
...
[+] Front: Add module controller + url dispatch for modules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8738 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-23 13:50:33 +00:00
tDidierjean
df5e702f5c
// fix blocknewsletter error during e-mail verification
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8731 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-23 09:10:54 +00:00
fBrignoli
a7b62a9520
[*] MO : blocknewsletter : double opt-in
...
[*] MO : newsletter : filter on active only
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8729 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-23 08:44:49 +00:00
rMalie
d8b6693264
// Fix strict standard on controllers + modules header / footer include
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8727 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-23 08:05:31 +00:00
rMalie
4f2a090e24
// Merge -> revision 8720
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8722 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-22 15:45:10 +00:00
rMalie
69db63f26c
[*] Front: move front controllers in controllers/front/ directory
...
// Refactoring of front controllers part 1
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8721 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-22 15:19:42 +00:00
rMalie
2dbea99b61
[+] MO: Add Module->smartyAssign method, in order to assign variables with module name as prefix in module's templates
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8718 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-22 12:05:49 +00:00
fBrignoli
56c570e4b8
// comment
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8689 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-21 14:23:11 +00:00
fBrignoli
1947e320c9
[*] MO : blockcms - Customizable footer
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8680 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-21 09:41:54 +00:00
tDidierjean
b45dd02452
// remove deprecated PS_ADMIN_DIR by _PS_ADMIN_DIR_
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8666 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-20 15:53:57 +00:00
fBrignoli
067342db32
[-] MO : statsnewsletter - SQL error
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8635 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-19 10:02:59 +00:00
rMalie
42d996ec94
// Merge -> revision 8624
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8626 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-16 15:02:29 +00:00
rMalie
1977f1d851
// Merge -> revision 8608
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8612 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-15 16:10:59 +00:00
rMalie
224b55c3c2
// Merge -> revision 8589
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8596 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-14 16:13:24 +00:00
rMalie
03eaee9bf4
[+] Project: it's possible to create new genders, "Miss" gender is now added
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8578 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-14 15:15:51 +00:00