Christophe LATOUR
|
cded33390c
|
fix errror 500 :
[Tue Dec 05 13:18:40.067061 2017] [:error] [pid 4904] [client 217.64.63.215:41768] exception 'ErrorException' with message 'Undefined variable: invite' in /home/www/bebeboutik.com/www/modules/invite/invite.php:1717
|
2017-12-05 16:05:54 +01:00 |
|
Michael RICOIS
|
c8a8838c58
|
Merge branch 'ticket-14904-achatexpressmobile' into develop
|
2017-12-04 17:52:56 +01:00 |
|
Michael RICOIS
|
3c19b90657
|
Arrow image
|
2017-12-04 17:42:28 +01:00 |
|
Michael RICOIS
|
f77c8a11c8
|
Fix merge
|
2017-12-04 17:27:59 +01:00 |
|
Michael RICOIS
|
cddcea6c52
|
Merge branch 'ticket-14904-achatexpressmobile' into develop
Conflicts:
themes/site_mobile/css/style.css
|
2017-12-04 16:55:31 +01:00 |
|
Michael RICOIS
|
dfe494f757
|
Merge branch 'ticket-14904-achatexpressmobile' of git@gitlab.antadis.net:dev-antadis/bebeboutik.git into ticket-14904-achatexpressmobile
|
2017-12-04 16:52:47 +01:00 |
|
Michael RICOIS
|
adc0cbaa84
|
Achat express
|
2017-12-04 16:52:19 +01:00 |
|
Michael RICOIS
|
0cb4afffe1
|
Ignore
|
2017-12-04 16:52:18 +01:00 |
|
Michael RICOIS
|
0f33b21482
|
Add link "Achate express"
|
2017-12-04 16:52:18 +01:00 |
|
Michael RICOIS
|
4af3752e1a
|
Merge branch 'ticket-14698-sensefuel' into develop
|
2017-12-04 16:49:39 +01:00 |
|
Michael RICOIS
|
25272361ee
|
Enhance sensefuel display
|
2017-12-04 16:49:09 +01:00 |
|
Michael RICOIS
|
9a95d55d06
|
Achat express
|
2017-12-04 16:33:16 +01:00 |
|
Michael RICOIS
|
38feb4d6f6
|
Merge branch 'master' of git@gitlab.antadis.net:dev-antadis/bebeboutik.git
|
2017-12-04 11:13:44 +01:00 |
|
Michael RICOIS
|
208863c779
|
Merge branch 'ticket-14974-refundvoucher'
|
2017-12-04 11:13:24 +01:00 |
|
Marion Muszynski
|
049d27980c
|
Merge branch 'ticket-14485-phileaMultiSingle'
|
2017-12-04 10:32:53 +01:00 |
|
Marion Muszynski
|
c84c8f7663
|
Merge branch 'refonte-adminOrderTpl'
|
2017-12-04 10:25:31 +01:00 |
|
Michael RICOIS
|
f992124ffb
|
Merge branch 'ticket-14698-sensefuel'
|
2017-12-04 09:56:17 +01:00 |
|
Michael RICOIS
|
4b0f5ecb96
|
Merge branch 'ticket-14698-sensefuel' into develop
|
2017-12-04 09:54:35 +01:00 |
|
Michael RICOIS
|
030d9c812d
|
global var
|
2017-12-04 09:53:55 +01:00 |
|
Michael RICOIS
|
6fbc309c2d
|
Merge branch 'ticket-14698-sensefuel' into develop
|
2017-12-04 09:48:47 +01:00 |
|
Michael RICOIS
|
0de40f3283
|
Open Sensuel to all except ES version
|
2017-12-04 09:48:14 +01:00 |
|
Michael RICOIS
|
e6f2b05632
|
Ignore
|
2017-12-04 09:36:39 +01:00 |
|
Michael RICOIS
|
d01b4a1296
|
Add link "Achate express"
|
2017-12-04 09:36:08 +01:00 |
|
Michael RICOIS
|
c970d88e64
|
Merge branch 'ticket-14974-refundvoucher' into develop
|
2017-12-01 14:47:23 +01:00 |
|
Michael RICOIS
|
933ba63dd8
|
Merge branch 'ticket-14698-sensefuel'
|
2017-12-01 14:29:38 +01:00 |
|
Michael RICOIS
|
29dbeaf402
|
Merge branch 'ticket-14698-sensefuel' into develop
|
2017-12-01 14:25:19 +01:00 |
|
Michael RICOIS
|
3f998e6771
|
Alway enable display
|
2017-12-01 12:59:51 +01:00 |
|
Michael RICOIS
|
0978716f81
|
Merge branch 'spam' into develop
|
2017-12-01 11:48:10 +01:00 |
|
Michael RICOIS
|
983284f372
|
Fix condition
|
2017-12-01 11:34:27 +01:00 |
|
Michael RICOIS
|
3c219651b0
|
Disable access to all email from qq.com
|
2017-12-01 11:30:20 +01:00 |
|
Michael RICOIS
|
54841d7cfe
|
Merge branch 'ticket-14698-sensefuel'
|
2017-11-30 17:08:39 +01:00 |
|
Michael RICOIS
|
e0a84b6ab4
|
Merge branch 'ticket-14698-sensefuel' into develop
|
2017-11-30 17:06:18 +01:00 |
|
Michael RICOIS
|
b3f6d559f3
|
Fix product_type
|
2017-11-30 17:05:34 +01:00 |
|
Michael RICOIS
|
358e9301f0
|
Test if is cli
|
2017-11-30 16:18:48 +01:00 |
|
Michael RICOIS
|
0f9d2ec206
|
Merge branch 'ticket-14698-sensefuel'
|
2017-11-30 15:30:59 +01:00 |
|
Michael RICOIS
|
f18d799bb5
|
Merge branch 'develop' of git@gitlab.antadis.net:dev-antadis/bebeboutik.git into develop
|
2017-11-30 15:30:35 +01:00 |
|
Michael RICOIS
|
6119f5efee
|
Merge branch 'ticket-14698-sensefuel' into develop
|
2017-11-30 15:30:24 +01:00 |
|
Michael RICOIS
|
8f7b808373
|
Forget disable by default
|
2017-11-30 15:29:57 +01:00 |
|
Marion Muszynski
|
1bd2788bd7
|
Merge branch 'ticket-14485-phileaMultiSingle' into develop
|
2017-11-30 14:43:45 +01:00 |
|
Marion Muszynski
|
4c4960928a
|
fix for multi only
|
2017-11-30 14:43:27 +01:00 |
|
Michael RICOIS
|
39d29960de
|
Merge branch 'ticket-14698-sensefuel'
|
2017-11-30 14:25:50 +01:00 |
|
Nolwenn J
|
6bdecf59f8
|
Merge branch 'ticket/r14647-welcome-mail' into develop
|
2017-11-30 12:45:01 +01:00 |
|
Nolwenn J
|
4079317d2c
|
images compressees
|
2017-11-30 12:42:25 +01:00 |
|
Michael RICOIS
|
1f11b19484
|
Merge branch 'develop' of git@gitlab.antadis.net:dev-antadis/bebeboutik.git into develop
|
2017-11-30 12:29:29 +01:00 |
|
Michael RICOIS
|
7a46d0099e
|
Merge branch 'ticket-14698-sensefuel' into develop
|
2017-11-30 12:29:17 +01:00 |
|
Michael RICOIS
|
e54c47815a
|
Activation/Désactivation sensefuel
|
2017-11-30 12:28:45 +01:00 |
|
Marion Muszynski
|
b7aafef91c
|
Merge branch 'ticket-14485-phileaMultiSingle' into develop
|
2017-11-30 12:03:35 +01:00 |
|
Marion Muszynski
|
7e221662a7
|
fix
|
2017-11-30 12:03:19 +01:00 |
|
Marion Muszynski
|
2c41ee7ab2
|
Merge branch 'ticket-14485-phileaMultiSingle' into develop
|
2017-11-30 12:00:38 +01:00 |
|
Marion Muszynski
|
b64e174c07
|
fix
|
2017-11-30 12:00:22 +01:00 |
|