rMalie
d79fcf00fb
// Merge -> revision 9352
2011-10-14 08:20:54 +00:00
rMalie
a07c14fafd
// Merge -> revision 9288
2011-10-12 16:04:28 +00:00
rMalie
eeb5b16112
// Merge -> revision 9221
2011-10-11 12:45:12 +00:00
rMalie
9510337b1d
// Remove bad _SQL_USE_SLAVE_ uses + normalize Db->executeS(), Db->execute() and Db->numRows() names
2011-10-10 12:18:56 +00:00
rMalie
d46fbbc039
// Merge -> revision 9124
2011-10-07 09:54:43 +00:00
rMalie
c4780ec67d
// Merge -> revision 8984
2011-10-03 15:48:07 +00:00
vAugagneur
e8901103e3
[+] 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
2011-09-30 13:01:10 +00:00
rMalie
91083e190c
// Merge -> revision 8800
2011-09-27 14:30:06 +00:00
vAugagneur
a154328975
[-] MO : fixed FATAL error on layered navigation module
2011-09-26 16:31:36 +00:00
rMalie
1d44d06528
// Merge -> revision 8734
2011-09-23 14:06:47 +00:00
rMalie
2180359342
// Merge -> revision 8720
2011-09-22 15:45:10 +00:00
rMalie
c0224d4958
// Merge -> revision 8624
2011-09-16 15:02:29 +00:00
rMalie
afff25956c
// Merge -> revision 8608
2011-09-15 16:10:59 +00:00
rMalie
c405e1a55b
// Merge -> revision 8589
2011-09-14 16:13:24 +00:00
rMalie
483bcc121b
// Merge -> revision 8552
2011-09-14 08:29:10 +00:00
rMalie
a1bdb7b35e
// Merge -> revision 8507
2011-09-12 16:17:37 +00:00
rMalie
714c65de56
// Merg// Merge -> revision 8395
2011-09-07 16:23:13 +00:00
rMalie
fd5388209a
// Merge -> revision 8363
2011-09-06 12:38:55 +00:00
rMalie
3d89058084
// Merge -> revision 8342
2011-09-05 14:56:02 +00:00
tDidierjean
a7ad178f28
//// Merge -> revision 8290
2011-09-01 09:53:43 +00:00
lCherifi
bf9a25fd59
integration new theme standard
2011-08-23 14:25:09 +00:00
rMalie
08a8ffdcf9
// Merge -> revision 8149
2011-08-22 16:22:16 +00:00
rMalie
ec6489a29b
// Fix all category_lang sql restrictions with multishop
2011-08-19 14:21:45 +00:00
rMalie
d0dbb5c185
// Merge -> revision 8014
2011-08-11 12:00:05 +00:00
rMalie
792ce71cd4
// Merge -> revision 7979
2011-08-10 08:36:17 +00:00
rMalie
83734c7bb9
// Merge -> revision 7875
2011-08-03 16:16:49 +00:00
rMalie
e2c8d89e41
// Merge with revision 7841
2011-08-02 11:43:58 +00:00
tDidierjean
9213581a03
// Context part 27
2011-07-29 14:29:57 +00:00
tDidierjean
cac7807513
// Context part 26
2011-07-28 16:37:50 +00:00
rMalie
c17e7c236d
// MERGE with 1.4 r7770
2011-07-28 09:20:57 +00:00
rMalie
5f6f018885
// REVERT MERGE
2011-07-27 13:35:06 +00:00
rMalie
233c0076b7
// MERGE with trunk revision 7754
2011-07-27 12:48:42 +00:00
rMalie
3f9a9e41d7
// id_shop on cart product (for links) + change Shop::sqlAsso() + share_order
2011-07-22 08:57:51 +00:00
rMalie
02a738dce1
// Context part 15
2011-07-19 16:17:14 +00:00
tDidierjean
52339502b6
// Context part 12
2011-07-19 09:28:11 +00:00
rMalie
ff81f71449
// Context in modules + Shop::sql* methods
2011-07-19 09:23:10 +00:00
tDidierjean
6551a3ece7
// Context part 11
2011-07-18 15:50:58 +00:00
rMalie
4b7dee58b7
2011-07-18 15:37:31 +00:00
rMalie
e16a8ab8d3
// Context part 10
2011-07-18 15:27:32 +00:00
rMalie
2d77925e7d
// Refactoring of shop class with new context
2011-07-12 16:28:20 +00:00
tDidierjean
139bb84f87
// Context - first commit
2011-07-11 14:32:05 +00:00
tDidierjean
9b288cecf5
// revert previous commit
2011-07-08 16:12:27 +00:00
tDidierjean
af4c7605de
// cancel commit
2011-07-08 15:43:24 +00:00
rMalie
1c7225b4dc
// Fix stats queries
2011-07-06 16:17:27 +00:00
rMalie
fc28eb57bf
// blocklayered fix
2011-07-06 13:27:41 +00:00
rGaillard
8fc7f11014
2011-07-06 10:54:11 +00:00
rGaillard
d1a13007b9
2011-07-06 10:10:43 +00:00
vAugagneur
05440b91e2
//merge 1.4 => 1.5
2011-04-29 12:34:09 +00:00
fBrignoli
b8f460ed46
// merge 1.4 => 6117
2011-04-29 09:09:38 +00:00
fBrignoli
ff49083fb6
// merge 1.4 (5397)
2011-04-22 16:00:58 +00:00
