Michael RICOIS
|
281f8399f0
|
Merge branch 'develop' of git@gitlab.antadis.net:dev-antadis/bebeboutik.git into develop
|
2017-11-22 11:29:41 +01:00 |
|
Michael RICOIS
|
0685f70903
|
Merge branch 'ticket-14698-sensefuel' into develop
Conflicts:
themes/site/css/style.css
themes/site_mobile/css/style.css
|
2017-11-22 11:29:11 +01:00 |
|
Marion Muszynski
|
be7625d4a9
|
Merge branch 'ticket-14829-FixEmails' into develop
|
2017-11-21 17:38:43 +01:00 |
|
Marion Muszynski
|
577323636c
|
fix email address when letters are missing
|
2017-11-21 17:38:25 +01:00 |
|
Michael RICOIS
|
77ae796785
|
Merge branch 'ticket-10393-guide-achat' into develop
|
2017-11-21 16:17:28 +01:00 |
|
Michael RICOIS
|
0e97f87299
|
Hook sensefuel
|
2017-11-21 14:55:52 +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 |
|
Michael RICOIS
|
89cfe1499d
|
Intégration sensuel, barre de recherche et modification infomrations
login
|
2017-11-20 11:18:23 +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 |
|
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 |
|
Michael RICOIS
|
be2fff2665
|
Merge branch 'ticket-14698-sensefuel' into develop
|
2017-11-15 17:36:00 +01:00 |
|
Michael RICOIS
|
98f7319989
|
Intégration sensefuel
|
2017-11-15 17:31:44 +01:00 |
|
Michael RICOIS
|
dd3b834e44
|
Merge branch 'ticket-14666-appli-discount' into develop
|
2017-11-13 11:14:30 +01:00 |
|
Michael RICOIS
|
339e5b4b18
|
Add function to detect request from api
|
2017-11-13 11:13:45 +01:00 |
|
Michael RICOIS
|
ab97adac66
|
Prepare Front
|
2017-11-10 15:25:44 +01:00 |
|
Michael RICOIS
|
3cf9de8772
|
Integrate on front
|
2017-11-07 11:51:19 +01:00 |
|
Michael RICOIS
|
3a9ea5aab1
|
Add module in displayLeft
|
2017-11-06 17:21:23 +01:00 |
|
Michael RICOIS
|
8d24b036e5
|
Merge remote-tracking branch 'origin/ticket-14666-appli-discount' into develop
|
2017-11-06 12:26:16 +01:00 |
|
Michael RICOIS
|
7c2864d4a1
|
Fix forget check
|
2017-11-06 12:25:16 +01:00 |
|
Michael RICOIS
|
3eab7df2ef
|
Front integration
|
2017-11-06 10:26:53 +01:00 |
|
Marion Muszynski
|
96a0f240f2
|
Merge branch 'add-CacheRedis'
|
2017-10-25 14:31:25 +02:00 |
|
Marion Muszynski
|
df52811ada
|
Merge branch 'ticket-14526-LoyaltyPaymentError' into develop
|
2017-10-19 17:13:41 +02:00 |
|
root
|
9c97f5ff94
|
fix and translation from prod
|
2017-10-18 12:10:35 +02:00 |
|
Marion Muszynski
|
d38c7816ff
|
Merge branch 'ticket-14486-MRinvoice' into develop
|
2017-10-12 15:03:33 +02:00 |
|
Marion Muszynski
|
ff34c7b32e
|
add mr and dropshipping sended check for invoice
|
2017-10-12 15:03:08 +02:00 |
|
Marion Muszynski
|
e300ed0dfc
|
Merge branch 'ticket-14460-BugReturnProcess' into develop
|
2017-10-11 16:15:14 +02:00 |
|
Marion Muszynski
|
5600a6da36
|
fix returnable qty
|
2017-10-11 16:14:59 +02:00 |
|
Marion Muszynski
|
e7af6fd655
|
limit address characters
|
2017-10-09 16:00:13 +02:00 |
|
Marion Muszynski
|
2a5b0712e9
|
Merge branch 'update-CreationCat' into develop
|
2017-10-04 13:25:50 +02:00 |
|
Marion Muszynski
|
73e88054bd
|
fix when customer is deleted
|
2017-10-04 12:58:54 +02:00 |
|
Marion Muszynski
|
008f049633
|
Merge branch 'ticket-14392-BugUploadImg' into develop
|
2017-10-04 11:07:16 +02:00 |
|
Marion Muszynski
|
d762e3e613
|
fix delete thumb image when uploading image cat
|
2017-10-04 11:06:59 +02:00 |
|
Marion Muszynski
|
635e984d67
|
Merge branch 'add-CacheRedis' into develop
|
2017-09-25 12:29:11 +02:00 |
|
Marion Muszynski
|
cab30809b1
|
add option to load the good db for redis
|
2017-09-25 12:24:44 +02:00 |
|
Marion Muszynski
|
80c6a3db16
|
Merge branch 'task-ImgMobileCategories' into develop
|
2017-09-25 10:59:58 +02:00 |
|
Marion Muszynski
|
801cb2af23
|
add delete function for category mobile image
|
2017-09-25 10:59:34 +02:00 |
|
Marion Muszynski
|
4b985fb501
|
Merge branch 'ticket-13943-ResetBOpassword'
|
2017-09-21 15:40:57 +02:00 |
|
Marion Muszynski
|
2add8ce479
|
Merge branch 'ticket-13943-ResetBOpassword' into develop
|
2017-09-21 15:28:25 +02:00 |
|
Marion Muszynski
|
c962994c82
|
Merge branch 'ticket-14161-UncombinableSale'
|
2017-09-20 16:53:52 +02:00 |
|
Michael RICOIS
|
2bb6aeaeae
|
Merge remote-tracking branch 'origin/ticket-13149' into develop
|
2017-09-18 17:49:37 +02:00 |
|
Michael RICOIS
|
e35c4042ad
|
Forget Category override
|
2017-09-18 17:49:08 +02:00 |
|
Marion Muszynski
|
9ec62bab45
|
Merge branch 'ticket-14161-UncombinableSale' into develop
|
2017-09-18 11:51:38 +02:00 |
|
Marion Muszynski
|
2c4ff88262
|
fix
|
2017-09-18 11:51:23 +02:00 |
|
Marion Muszynski
|
cf246105b7
|
Merge branch 'ticket-14161-UncombinableSale' into develop
|
2017-09-18 11:47:40 +02:00 |
|
Marion Muszynski
|
0f5228f6e8
|
update error mess from add to cart
|
2017-09-18 11:47:26 +02:00 |
|
Marion Muszynski
|
d8c2c369c9
|
reset password
|
2017-09-18 11:00:12 +02:00 |
|
Marion Muszynski
|
08c76ed5a2
|
Merge branch 'ticket-14197-ConstantSale' into develop
|
2017-09-13 10:48:13 +02:00 |
|