Commit Graph

55 Commits

Author SHA1 Message Date
rMalie
9a109487a1 // French translations (by Xavier)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13761 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-29 17:21:05 +00:00
rMalie
2454cd7863 // Welcome 2012²
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13573 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-23 16:33:10 +00:00
mDeflotte
b8fbd8f98f // [-] MO : #PSFV-531 - Removing unused smarty vars
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13435 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-17 14:51:56 +00:00
mDeflotte
534009e343 [-] MO : #PSFV-531 - Fix bug on the module Loyalty with pagination links
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13432 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-17 14:49:29 +00:00
mDeflotte
0db654d8c9 [-] MO : #PSFV-532 - Fix bug on the module Loyalty - "points" are not upgrading on changing combination
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13429 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-17 13:36:29 +00:00
rMalie
7190508df7 // French translations (by Xavier)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13361 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-15 15:51:21 +00:00
rMalie
7ebff4d7ae // Modules langs files moved to modules/*/translations/ folder
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12900 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-01 14:42:15 +00:00
rMalie
9739089c32 [*] classes : new module architecture
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12872 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-31 16:57:19 +00:00
tDidierjean
f6e48114e7 // Helper::renderAdminCategorieTree refactoring
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12578 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-20 13:02:34 +00:00
rMalie
70552fb31d // Restore good page_name for controllers with - in name
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12576 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-20 10:15:45 +00:00
rMalie
4f2188b12a // Restore good page_name for controllers with - in name
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12573 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-20 09:05:31 +00:00
vChabot
87fd511314 [*] BO : Adding category management with multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12270 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-09 15:13:46 +00:00
mDeflotte
7b9b511181 // Add missing images of the loyalty module
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12213 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-05 16:48:20 +00:00
mDeflotte
0187d7b498 [-] MO : #PSTEST-280 - Removed old-way method (deprecated) + fixed problem with cartRules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12207 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-05 16:15:46 +00:00
bMancone
631309d2d2 // #PSFV-124 Licenses update
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12137 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-04 14:54:25 +00:00
rMalie
1c8d3283a1 // Fix multilang on some modules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11991 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-02 13:47:41 +00:00
rMalie
92b2d682f1 // Set $definition in ObjectModel classes for modules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11950 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-30 15:37:57 +00:00
rMalie
58433f1881 // Normalize + use $this->smarty instead of $this->context->smarty in modules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11944 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-30 14:59:57 +00:00
mDeflotte
21d4c051bd // Traductions files
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11336 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 09:25:37 +00:00
mMarinetti
203b5ae6ad // fix new theme / old php in modules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10878 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-02 16:41:22 +00:00
mMarinetti
9cc30dc3fe [+] Project : default theme added
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10862 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-02 15:24:40 +00:00
rMalie
6b61051a16 [*] MO: remove all static call of Module::display() method. Use it as a method on a Module instance.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10695 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-28 10:04:41 +00:00
rMalie
fe435bdeea // Log edited, this modification on Module::displayTemplate was reverted in a better one
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10675 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-25 16:09:13 +00:00
rMalie
9d10de0848 // Merge -> 10309
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10333 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 11:05:10 +00:00
vKham
c441358b40 // new icon for adminhome, adminmodules and header
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10318 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 09:21:26 +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
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
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
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
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
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
b50c7e4334 // Merge -> revision 8507
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8513 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-12 16:17:37 +00:00
aFolletete
3eff951265 [+] Project : adding Features detachables in order to improve performance
// clean code

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8328 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-03 17:21:32 +00:00
lCherifi
2a1e42606b integration new theme standard
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8168 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-23 14:25:09 +00:00
rMalie
0aada6cc1e // Merge -> revision 8097
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8100 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-17 16:10:20 +00:00
tDidierjean
cb3d802346 // Context part 31
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8087 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-17 10:07:12 +00:00
rMalie
49468717c2 // Fix #PSFV-48
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8032 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-11 14:42:31 +00:00
rMalie
52d1d13891 // Merge -> revision 8014
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8021 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-11 12:00:05 +00:00
rMalie
d1d4d57eca // Revert normalization
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8019 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-11 10:20:59 +00:00
rMalie
f62cdb1963 // Normalization
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8017 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-11 09:58:20 +00:00
tDidierjean
decbcc7246 // fix loyalty module
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7968 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-09 14:54:17 +00:00
rMalie
ffeb22bfb9 // Merge with revision 7841
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7844 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-02 11:43:58 +00:00
tDidierjean
5d090a25b3 // Context part 27
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7812 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-29 14:29:57 +00:00
rMalie
a875fecb20 // MERGE with 1.4 r7770
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7776 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-28 09:20:57 +00:00
rMalie
be4811aa6e // REVERT MERGE
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7761 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-27 13:35:06 +00:00
rMalie
e159c925d8 // MERGE with trunk revision 7754
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7759 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-27 12:48:42 +00:00
tDidierjean
143022e488 // Context - first commit
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7586 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-11 14:32:05 +00:00
tDidierjean
8bf1b23239 // revert previous commit
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7573 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-08 16:12:27 +00:00
tDidierjean
f085f81d23 // cancel commit
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7572 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-08 15:43:24 +00:00
rGaillard
8a59d0dc41 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7524 b9a71923-0436-4b27-9f14-aed3839534dd 2011-07-06 10:54:11 +00:00