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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
69f2f09dc5
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7522 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-06 10:10:43 +00:00
4a210f98d9
[+] Dispatcher
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7069 b9a71923-0436-4b27-9f14-aed3839534dd
2011-06-15 16:32:06 +00:00
fbe279894a
[-] MO : Not correct display of "date_add" for the discounts
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6148 b9a71923-0436-4b27-9f14-aed3839534dd
2011-05-03 08:53:37 +00:00
43b6a41bbc
// merge 1.4 (5397)
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@6048 b9a71923-0436-4b27-9f14-aed3839534dd
2011-04-22 16:00:58 +00:00
10445ad61d
// 1.5 branche creation
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@5881 b9a71923-0436-4b27-9f14-aed3839534dd
2011-04-12 18:24:40 +00:00
rMalie