Michael RICOIS
|
092351f962
|
Merge remote-tracking branch 'origin/ticket/r13945-ads' into develop
|
2017-09-26 10:02:18 +02:00 |
|
Michael RICOIS
|
dcf683e949
|
Test
|
2017-08-30 15:59:31 +02:00 |
|
Michael RICOIS
|
22919ad8a9
|
Merge remote-tracking branch 'origin/ticket/r13944-amazonpay' into develop
|
2017-08-30 12:23:39 +02:00 |
|
Michael RICOIS
|
879b186e29
|
Add module amazon pay
|
2017-08-30 12:07:50 +02:00 |
|
Michael RICOIS
|
08602cbbed
|
Display referralprogram menu in customer account
|
2017-08-30 11:56:10 +02:00 |
|
Michael RICOIS
|
10f8211888
|
Merge remote-tracking branch 'origin/ticket/r13530-link-boutique' into develop
|
2017-08-08 17:04:47 +02:00 |
|
Michael RICOIS
|
5a2e6e0713
|
Redirect Menu "Boutique" to category 183
|
2017-08-08 17:03:54 +02:00 |
|
Michael RICOIS
|
4d1f0bbbf9
|
Replace image
|
2017-08-08 09:27:58 +02:00 |
|
Michael RICOIS
|
7e66761e52
|
Merge remote-tracking branch 'origin/ticket/r13541-h5div'
|
2017-07-21 09:35:44 +02:00 |
|
Michael RICOIS
|
282fae6b8d
|
Merge remote-tracking branch 'origin/ticket/r13706-doofinder-badgateway'
into develop
Conflicts:
themes/toutpratique/product-list.tpl
|
2017-07-11 14:31:30 +02:00 |
|
Michael RICOIS
|
bcb2c2f5a5
|
Authorization
|
2017-07-11 14:28:07 +02:00 |
|
Michael RICOIS
|
8de3efa44d
|
Replace Api Token by Authorization
|
2017-07-11 14:22:11 +02:00 |
|
Michael RICOIS
|
9247e48096
|
Typo
|
2017-07-11 14:21:40 +02:00 |
|
Nolwenn
|
28c8d500af
|
Merge branch 'ticket/r13569-venteflash' into develop
|
2017-06-29 17:10:42 +02:00 |
|
Nolwenn
|
c47b7fd7ee
|
ticket vente flash
|
2017-06-29 13:14:29 +02:00 |
|
ToutPratique
|
26b5a6a3ad
|
fix product-list
|
2017-06-29 12:49:17 +02:00 |
|
Michael RICOIS
|
a5cdbaf469
|
Merge remote-tracking branch 'origin/ticket/r13541-h5div' into develop
|
2017-06-22 11:52:48 +02:00 |
|
Michael RICOIS
|
6d8090d708
|
Close div
|
2017-06-22 11:49:04 +02:00 |
|
Michael RICOIS
|
d36ecbeb1d
|
Merge remote-tracking branch 'origin/ticket/r13541-h5div' into develop
|
2017-06-22 11:43:56 +02:00 |
|
Michael RICOIS
|
6950fdaf14
|
h5 to div
|
2017-06-22 11:43:09 +02:00 |
|
Michael RICOIS
|
8a76aea5b9
|
Revert "Remove btn-black"
This reverts commit cfcb3a2e4b.
|
2017-06-22 10:39:41 +02:00 |
|
Michael RICOIS
|
c13b069227
|
Merge remote-tracking branch 'origin/master' into develop
|
2017-06-22 10:39:31 +02:00 |
|
Michael RICOIS
|
d430d73bcd
|
Revert "Newsletter H5 to div"
This reverts commit 9452a93d64.
|
2017-06-22 10:32:14 +02:00 |
|
Michael RICOIS
|
7c8e4b5314
|
Revert "Newsletter h5 to div"
This reverts commit 951ba27913.
|
2017-06-22 10:32:11 +02:00 |
|
Michael RICOIS
|
6ba413fd18
|
Revert "CSS"
This reverts commit ac3b1c638f.
|
2017-06-22 10:30:56 +02:00 |
|
Michael RICOIS
|
cfcb3a2e4b
|
Remove btn-black
|
2017-06-22 10:16:20 +02:00 |
|
Michael
|
50e5ac74b7
|
Merge branch 'ticket/r13185-productpack' into 'master'
Ticket/r13185 productpack
See merge request !15
|
2017-06-20 10:02:04 +02:00 |
|
Michael
|
07e0cbeaf9
|
Merge branch 'ticket/r13457-flag-new-product' into 'master'
Ticket/r13457 flag new product
See merge request !14
|
2017-06-20 10:00:59 +02:00 |
|
Michael
|
2cb1f2c30e
|
Merge branch 'ticket/r13360-validate-email' into 'master'
Ticket/r13360 validate email
See merge request !13
|
2017-06-20 09:58:24 +02:00 |
|
Michael RICOIS
|
5b8377f936
|
Check before merge
|
2017-06-20 09:46:28 +02:00 |
|
Michael RICOIS
|
eaf6d4fc1f
|
Merge branch 'develop' of git@gitlab.antadis.net:dev-antadis/toutpratique.git into develop
|
2017-06-15 16:22:51 +02:00 |
|
Michael RICOIS
|
e8665a6bd6
|
Merge remote-tracking branch 'origin/ticket/r13185-productpack' into develop
|
2017-06-15 16:21:18 +02:00 |
|
Michael RICOIS
|
ac3b1c638f
|
CSS
|
2017-06-15 16:19:38 +02:00 |
|
Michael RICOIS
|
951ba27913
|
Newsletter h5 to div
|
2017-06-15 16:08:59 +02:00 |
|
Michael RICOIS
|
9452a93d64
|
Newsletter H5 to div
|
2017-06-15 16:04:39 +02:00 |
|
Romu
|
e616db6156
|
Merge branch 'ticket/r13457-flag-new-product' into develop
|
2017-06-15 01:14:40 -07:00 |
|
Romu
|
59e2be81e4
|
css
|
2017-06-15 01:14:25 -07:00 |
|
Romu
|
c7a858b3cb
|
Merge branch 'ticket/r13457-flag-new-product' into develop
|
2017-06-15 01:01:35 -07:00 |
|
Romu
|
ec1e33bcb7
|
css
|
2017-06-15 01:01:18 -07:00 |
|
Romu
|
14cd8559d1
|
Merge branch 'develop' of gitlab.antadis.net:dev-antadis/toutpratique into develop
|
2017-06-15 00:58:37 -07:00 |
|
Romu
|
d4ea4823b2
|
Merge branch 'ticket/r13457-flag-new-product' into develop
|
2017-06-15 00:58:24 -07:00 |
|
Romu
|
4c0bc31577
|
css
|
2017-06-15 00:58:06 -07:00 |
|
Michael RICOIS
|
06a9159c71
|
Merge branch 'ticket/r13360-validate-email' into develop
|
2017-06-13 11:44:15 +02:00 |
|
Michael RICOIS
|
b5f083a63a
|
New regex to validate email
|
2017-06-13 11:41:14 +02:00 |
|
Michael
|
abb6abb7c4
|
Merge branch 'ticket/r13185-productpack' into 'develop'
Ticket/r13185 productpack
See merge request !12
|
2017-06-13 10:29:01 +02:00 |
|
Michael RICOIS
|
b7c11c5ae5
|
h5 to h2 on product (category "marque")
|
2017-06-13 10:25:08 +02:00 |
|
Romu
|
3b06bed0af
|
Merge branch 'ticket/r13457-flag-new-product' into develop
|
2017-06-13 01:19:10 -07:00 |
|
Romu
|
1cd90dd595
|
label promo
|
2017-06-13 01:18:47 -07:00 |
|
Michael RICOIS
|
e5e0c9575b
|
Delete price product on pack
|
2017-06-13 10:11:54 +02:00 |
|
Romu
|
31f873e760
|
Merge branch 'ticket/r13457-flag-new-product' into develop
|
2017-06-13 00:59:56 -07:00 |
|