 rMalie
|
90fcde2539
|
// Merge -> revision 7906
|
2011-08-05 13:26:44 +00:00 |
|
|
rMalie
|
83734c7bb9
|
// Merge -> revision 7875
|
2011-08-03 16:16:49 +00:00 |
|
|
rMalie
|
5c849dfa6d
|
// Move theme choice from AdminTheme page to Shop page
|
2011-08-02 13:47:34 +00:00 |
|
|
rMalie
|
e2c8d89e41
|
// Merge with revision 7841
|
2011-08-02 11:43:58 +00:00 |
|
|
rMalie
|
3c8c85b1cd
|
// Some fix + improve ergonomy + Tools::isMultiShopActived() moved in Shop class + 1.5.0.1 version in install script
|
2011-08-02 09:54:23 +00:00 |
|
|
rMalie
|
66eab15a18
|
// Routes for dispatcher (part 4) + some fix
|
2011-08-01 13:28:02 +00:00 |
|
|
dMetzger
|
33bbb70bfa
|
[+] BO : you can now set detailed permissions for each module in the back end
|
2011-07-31 16:39:53 +00:00 |
|
|
tDidierjean
|
55c1a0afeb
|
// Context part 28
|
2011-07-29 15:06:20 +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
|
b59d2200f6
|
// Fix #PSFV-30 + context part 24
|
2011-07-28 14:12:17 +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
|
8bb4c75411
|
// Fix #PSFV-21
|
2011-07-27 08:15:21 +00:00 |
|
|
rMalie
|
03b5d8ae50
|
// Fix #PSFV-20
|
2011-07-27 08:12:31 +00:00 |
|
|
tDidierjean
|
a96064b13d
|
// Context part 19
|
2011-07-25 16:42:48 +00:00 |
|
|
rMalie
|
0aba3ba000
|
// Carrier association + discount association
|
2011-07-22 15:53:07 +00:00 |
|
|
rMalie
|
8d3e36c904
|
// Fix strict standard on paymentModule + fix stats SQL bug
|
2011-07-22 09:49:29 +00:00 |
|
|
rMalie
|
3f9a9e41d7
|
// id_shop on cart product (for links) + change Shop::sqlAsso() + share_order
|
2011-07-22 08:57:51 +00:00 |
|
|
tDidierjean
|
a264942b1a
|
// removing cookie from product customization
|
2011-07-21 14:38:04 +00:00 |
|
|
rMalie
|
766a38dcd7
|
// Add config/alias.php file + refactoring of DB / MySQL classes
|
2011-07-20 16:10:12 +00:00 |
|
|
rMalie
|
73d6f4267b
|
// Context part 16 (shops)
|
2011-07-20 12:08:15 +00:00 |
|
|
rMalie
|
02a738dce1
|
// Context part 15
|
2011-07-19 16:17:14 +00:00 |
|
|
tDidierjean
|
c620f4ce09
|
// Context part 14
|
2011-07-19 12:28:30 +00:00 |
|
|
rMalie
|
0060d1edab
|
// Remove some other mysql_ in code
|
2011-07-19 11:51:12 +00:00 |
|
|
rMalie
|
ba2922a823
|
// Context part 13
|
2011-07-19 09:44:10 +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 |
|
|
rMalie
|
286a374353
|
// Context
|
2011-07-12 13:50:15 +00:00 |
|
|
tDidierjean
|
139bb84f87
|
// Context - first commit
|
2011-07-11 14:32:05 +00:00 |
|
|
rMalie
|
923269001b
|
// Fix shop association on new object + some strict standard for Franck
|
2011-07-11 13:18:17 +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 |
|
|
rGaillard
|
858bb539c8
|
|
2011-07-06 13:52:30 +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 |
|
|
fBrignoli
|
1bb4a61a42
|
[+] Dispatcher
|
2011-06-15 16:32:06 +00:00 |
|
|
gBrunier
|
5f0fb35a1d
|
[-] MO : Not correct display of "date_add" for the discounts
|
2011-05-03 08:53:37 +00:00 |
|
|
dMetzger
|
27cbda53ff
|
[-] MO : modules exceptions stability improved
|
2011-05-02 12:36:27 +00:00 |
|
|
dMetzger
|
3742084b84
|
[*] MO : theme installer can now manage module exceptions
|
2011-04-29 13:41:10 +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 |
|
|
fSerny
|
9fd096df84
|
[-] MO : Changing url in Dibs module
|
2011-04-28 11:48:24 +00:00 |
|