Michael RICOIS
|
75c8fe9e6f
|
Merge branch 'ticket-14525-parrain' into develop
|
2017-11-07 12:33:38 +01:00 |
|
Michael RICOIS
|
60e3da5380
|
Traduction
|
2017-11-07 12:33:03 +01:00 |
|
Michael RICOIS
|
6c09de8b18
|
Merge branch 'develop' of git@gitlab.antadis.net:dev-antadis/bebeboutik.git into develop
|
2017-11-07 12:18:12 +01:00 |
|
Michael RICOIS
|
c2c55f1302
|
Merge remote-tracking branch 'origin/ticket-14525-parrain' into develop
|
2017-11-07 12:18:00 +01:00 |
|
Michael RICOIS
|
7dfa4d7cbe
|
Remove replacement
|
2017-11-07 12:17:20 +01:00 |
|
Marion Muszynski
|
284d7fc187
|
Merge branch 'ticket-14436-WP' into develop
|
2017-11-06 17:44:10 +01:00 |
|
Marion Muszynski
|
b67c3f7300
|
fixe comma
|
2017-11-06 17:44:02 +01:00 |
|
Marion Muszynski
|
7d06b3c212
|
Merge branch 'ticket-14436-WP' into develop
|
2017-11-06 17:41:16 +01:00 |
|
Marion Muszynski
|
62485e0888
|
fix date format
|
2017-11-06 17:41:05 +01:00 |
|
Marion Muszynski
|
7b61800173
|
Merge branch 'ticket-14436-WP' into develop
|
2017-11-06 17:37:05 +01:00 |
|
Marion Muszynski
|
d782b3e157
|
fix format and more
|
2017-11-06 17:36:53 +01:00 |
|
Marion Muszynski
|
9c4b8164e3
|
Merge branch 'ticket-14436-WP' into develop
|
2017-11-06 16:52:06 +01:00 |
|
Marion Muszynski
|
6a95069481
|
search in attributes
|
2017-11-06 16:51:48 +01:00 |
|
Michael RICOIS
|
6adcecc54b
|
Merge branch 'ticket-14525-parrain' into develop
|
2017-11-03 10:29:59 +01:00 |
|
Michael RICOIS
|
f6b3425af3
|
Remove notice
|
2017-10-31 17:37:49 +01:00 |
|
Michael RICOIS
|
bee38c462b
|
Add condition following number of orders
|
2017-10-31 16:45:07 +01:00 |
|
Marion Muszynski
|
ead1bf052e
|
Merge branch 'Task-Caching_2' into develop
|
2017-10-31 16:04:53 +01:00 |
|
Marion Muszynski
|
d0c298f20b
|
caching menu
|
2017-10-31 16:04:36 +01:00 |
|
Michael RICOIS
|
12086ed19b
|
Merge branch 'ticket-14273-voucher' into develop
|
2017-10-31 14:59:44 +01:00 |
|
Michael RICOIS
|
eed1052304
|
Email translation
|
2017-10-31 14:58:54 +01:00 |
|
Marion Muszynski
|
a5e58e2114
|
Merge branch 'ticket-White_2' into develop
|
2017-10-31 14:48:43 +01:00 |
|
Marion Muszynski
|
bf636c7617
|
fix skinstatic
|
2017-10-31 14:48:32 +01:00 |
|
Marion Muszynski
|
ef54c025ad
|
Merge branch 'ticket-White_2' into develop
|
2017-10-31 13:11:14 +01:00 |
|
Marion Muszynski
|
0a775574f8
|
Merge branch 'ticket-14436-WP' into develop
|
2017-10-31 12:44:27 +01:00 |
|
Marion Muszynski
|
233559e439
|
fix count nex products
|
2017-10-31 12:44:11 +01:00 |
|
Marion Muszynski
|
e72bdef669
|
Merge branch 'ticket-14436-WP' into develop
|
2017-10-31 12:41:21 +01:00 |
|
Marion Muszynski
|
d8a4e94113
|
fix filename
|
2017-10-31 12:41:11 +01:00 |
|
Marion Muszynski
|
f0cc764b16
|
Merge branch 'ticket-14436-WP' into develop
|
2017-10-31 12:32:53 +01:00 |
|
Marion Muszynski
|
caf88c2c7e
|
correction of formulae
|
2017-10-31 12:32:41 +01:00 |
|
Michael RICOIS
|
7bd7624200
|
Add sponsor from backoffice
|
2017-10-31 12:24:29 +01:00 |
|
Marion Muszynski
|
2f20adc1e6
|
Merge branch 'ticket-14436-WP' into develop
|
2017-10-30 15:45:42 +01:00 |
|
Marion Muszynski
|
a6ebb26af0
|
fix when product not found
|
2017-10-30 15:45:23 +01:00 |
|
Marion Muszynski
|
cd2bf20ae9
|
uncache sale for backoffice
|
2017-10-30 15:11:20 +01:00 |
|
Marion Muszynski
|
5ea49b53b4
|
Merge branch 'Task-Caching' into develop
|
2017-10-30 14:41:52 +01:00 |
|
Marion Muszynski
|
c25d0551cd
|
remove console log
|
2017-10-30 14:41:37 +01:00 |
|
Marion Muszynski
|
0b78ebc2f3
|
Merge branch 'Task-Caching' into develop
|
2017-10-30 13:42:08 +01:00 |
|
Marion Muszynski
|
07dd8ab9c9
|
test flush cache sale
|
2017-10-30 13:41:50 +01:00 |
|
Marion Muszynski
|
6f3b5615dc
|
Merge branch 'ticket-12868-WhiteBG'
|
2017-10-30 11:35:14 +01:00 |
|
root
|
690a60f4ad
|
fix from prod for payment modules
|
2017-10-30 11:34:13 +01:00 |
|
Marion Muszynski
|
b7830f009e
|
Merge branch 'ticket-14309-fixAlreadyPaid' into develop
|
2017-10-30 10:27:59 +01:00 |
|
Marion Muszynski
|
356a2ab034
|
test if cart is already transformed
|
2017-10-30 10:27:20 +01:00 |
|
Marion Muszynski
|
0f810abd18
|
fix fraud paybox when i is empty
|
2017-10-27 16:19:20 +02:00 |
|
Michael RICOIS
|
4af87fd2ec
|
Merge branch 'ticket-14273-voucher' into develop
|
2017-10-27 15:21:23 +02:00 |
|
Michael RICOIS
|
6b15c279b9
|
Date
|
2017-10-27 15:20:43 +02:00 |
|
Michael RICOIS
|
0716c6a878
|
Merge branch 'develop' of git@gitlab.antadis.net:dev-antadis/bebeboutik.git into develop
|
2017-10-27 14:46:59 +02:00 |
|
Michael RICOIS
|
7854985496
|
Merge branch 'ticket-14273-voucher' into develop
|
2017-10-27 14:46:36 +02:00 |
|
Michael RICOIS
|
d193722c18
|
Change date calc
|
2017-10-27 14:45:36 +02:00 |
|
Marion Muszynski
|
c3ea5cd75f
|
Merge branch 'ticket-14436-WP' into develop
|
2017-10-27 13:16:11 +02:00 |
|
Marion Muszynski
|
b6700ea7ce
|
add module
|
2017-10-27 13:16:02 +02:00 |
|
Marion Muszynski
|
aac4da9c0a
|
Merge branch 'ticket-14436-WP' into develop
|
2017-10-27 13:12:23 +02:00 |
|