Nolwenn J
|
25f7394691
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-11-20 16:59:50 +01:00 |
|
Nolwenn J
|
8783fe760d
|
Merge branch 'ticket/r14647-welcome-mail' into develop
|
2017-11-20 16:59:36 +01:00 |
|
Nolwenn J
|
0b6c2a1533
|
fixs
|
2017-11-20 16:59:01 +01:00 |
|
Marion Muszynski
|
bc60df4a4d
|
Merge branch 'ticket-14716-AppData' into develop
|
2017-11-20 11:33:18 +01:00 |
|
Marion Muszynski
|
a9a557adf9
|
show if order comes from api or website
|
2017-11-20 11:32:59 +01:00 |
|
Marion Muszynski
|
ac0ef73170
|
Merge branch 'feature/unique_cart_web_and_app' into 'master'
Unique cart between web and application
See merge request dev-antadis/bebeboutik!8
|
2017-11-20 10:27:08 +01:00 |
|
Nolwenn J
|
b2f4864624
|
Merge branch 'ticket/r14647-welcome-mail' into develop
|
2017-11-17 14:39:18 +01:00 |
|
Nolwenn J
|
7d96ec78d4
|
fix alt
|
2017-11-17 14:36:23 +01:00 |
|
Nolwenn J
|
f0ea1f776e
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-11-17 12:59:13 +01:00 |
|
Nolwenn J
|
cd0640d15a
|
Merge branch 'ticket/r14647-welcome-mail' into develop
|
2017-11-17 12:58:56 +01:00 |
|
Nolwenn J
|
ea53eafe93
|
fixs
|
2017-11-17 12:58:36 +01:00 |
|
Christophe LATOUR
|
5a32991da8
|
Merge branch 'feature/unique_cart_web_and_app' into develop
|
2017-11-17 12:56:10 +01:00 |
|
Christophe LATOUR
|
60b585feaf
|
Unique cart between web and application
|
2017-11-17 12:55:17 +01:00 |
|
Marion Muszynski
|
104890e094
|
Merge branch 'ticket-14436-WP' into develop
|
2017-11-17 11:16:54 +01:00 |
|
Marion Muszynski
|
5a9d780365
|
add 2 columns to excel
|
2017-11-17 11:16:30 +01:00 |
|
Nolwenn J
|
7151304a41
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-11-17 10:54:23 +01:00 |
|
Marion Muszynski
|
3c838aa55c
|
Merge branch 'fix/secure_key' into 'master'
Fix secure_key error
See merge request dev-antadis/bebeboutik!7
|
2017-11-17 10:53:38 +01:00 |
|
Christophe LATOUR
|
b851050fed
|
erge branch 'fix/secure_key' into develop
|
2017-11-17 10:49:45 +01:00 |
|
Christophe LATOUR
|
d24b02706e
|
Fix secure_key error
|
2017-11-17 10:47:51 +01:00 |
|
Marion Muszynski
|
5e4e91791a
|
Merge branch 'fix/PDF_send_mail_after_order' into 'master'
fix error 500 (after validate order -> create pdf invoice) :
See merge request dev-antadis/bebeboutik!6
|
2017-11-17 10:33:52 +01:00 |
|
Christophe LATOUR
|
039ec2b225
|
fix 500 :
[Thu Nov 16 14:44:30.387531 2017] [:error] [pid 1123] [client 82.229.2.146:56843] exception 'ErrorException' with message 'Undefined offset: 1' in /home/www/bebeboutik.com/www/classes/PDF.php:552
|
2017-11-16 16:55:03 +01:00 |
|
Michael RICOIS
|
150d86bc96
|
Merge branch 'ticket-14698-sensefuel'
|
2017-11-16 10:50:19 +01:00 |
|
Michael RICOIS
|
e9d927613f
|
Merge branch 'ticket-14698-sensefuel' into develop
|
2017-11-16 10:46:00 +01:00 |
|
Nolwenn J
|
32e7239d74
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-11-16 10:44:33 +01:00 |
|
Nolwenn J
|
280480e65c
|
Merge branch 'ticket/r14647-welcome-mail' into develop
|
2017-11-16 10:44:17 +01:00 |
|
Nolwenn J
|
15425cb5de
|
fixs
|
2017-11-16 10:43:55 +01:00 |
|
Michael RICOIS
|
731857719b
|
Temporary disable sensefuel display
|
2017-11-16 10:32:18 +01:00 |
|
Michael RICOIS
|
68744ae6e0
|
Merge branch 'develop' of git@gitlab.antadis.net:dev-antadis/bebeboutik.git into develop
|
2017-11-15 17:39:37 +01:00 |
|
Michael RICOIS
|
be2fff2665
|
Merge branch 'ticket-14698-sensefuel' into develop
|
2017-11-15 17:36:00 +01:00 |
|
Michael RICOIS
|
7ef207a6e3
|
Add README
|
2017-11-15 17:32:14 +01:00 |
|
Michael RICOIS
|
98f7319989
|
Intégration sensefuel
|
2017-11-15 17:31:44 +01:00 |
|
Michael RICOIS
|
5e678c403a
|
Remove xml
|
2017-11-15 16:36:16 +01:00 |
|
Marion Muszynski
|
c612d06c8f
|
Merge branch 'ticket-14747-SaleStats'
|
2017-11-15 13:02:08 +01:00 |
|
Marion Muszynski
|
6c071a8163
|
Merge branch 'ticket-14747-SaleStats' into develop
|
2017-11-15 13:01:17 +01:00 |
|
Marion Muszynski
|
9bf6364b8a
|
add supplier ref for sale stats BDC part
|
2017-11-15 13:01:03 +01:00 |
|
Michael RICOIS
|
71899c1dfb
|
Original SenseFuel module
|
2017-11-15 12:47:01 +01:00 |
|
Marion Muszynski
|
522070b6da
|
Merge branch 'ticket-14456-BugBaliseEd'
|
2017-11-15 12:41:52 +01:00 |
|
Marion Muszynski
|
d2acbed313
|
Merge branch 'ticket-14456-BugBaliseEd' into develop
|
2017-11-15 12:41:22 +01:00 |
|
Marion Muszynski
|
1aaea6641b
|
fix for ed from es version
|
2017-11-15 12:41:02 +01:00 |
|
Nolwenn J
|
e0931e1d6b
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/bebeboutik into develop
|
2017-11-15 12:10:48 +01:00 |
|
Nolwenn J
|
7f09464c0d
|
Merge branch 'ticket/r14647-welcome-mail' into develop
|
2017-11-15 12:10:35 +01:00 |
|
Nolwenn J
|
dfe406f976
|
welcome
|
2017-11-15 12:10:14 +01:00 |
|
Marion Muszynski
|
f180727307
|
Merge branch 'ticket/r14647-welcome-mail' into develop
|
2017-11-15 11:52:44 +01:00 |
|
Marion Muszynski
|
948ed7918d
|
fix url
|
2017-11-15 11:52:28 +01:00 |
|
Marion Muszynski
|
9b9b88610c
|
Merge branch 'feature/api_return_url_paypal' into 'master'
Adding param to return paypal url instead of redirecting user
See merge request dev-antadis/bebeboutik!5
|
2017-11-15 11:48:10 +01:00 |
|
Marion Muszynski
|
fde48c205b
|
Merge branch 'feature/api_return_url_paypal' into develop
|
2017-11-15 11:44:31 +01:00 |
|
Nolwenn J
|
19b5adf9d3
|
fix conflict
|
2017-11-15 11:33:32 +01:00 |
|
Nolwenn J
|
ce105d2f1a
|
Merge branch 'ticket/r14647-welcome-mail' into develop
|
2017-11-15 11:32:13 +01:00 |
|
Nolwenn J
|
1dc80b70d0
|
mail url fixs
|
2017-11-15 11:31:46 +01:00 |
|
root
|
43a085d4ec
|
push from prod
|
2017-11-15 10:34:51 +01:00 |
|