Michael RICOIS
|
df11669618
|
Prepare Front
|
2017-11-09 15:53:45 +01:00 |
|
Nolwenn J
|
2c1241e7ef
|
Merge branch 'ticket/r14647-welcome-mail' into develop
|
2017-11-09 15:28:10 +01:00 |
|
Nolwenn J
|
186251f813
|
img mails
|
2017-11-09 15:27:02 +01:00 |
|
Nolwenn J
|
7e64b3a2ab
|
gitigbore img mail
|
2017-11-09 15:26:19 +01:00 |
|
Nolwenn J
|
1daf1744fe
|
modif git ignore
|
2017-11-09 15:22:42 +01:00 |
|
Marion Muszynski
|
c208067f4e
|
Merge branch 'ticket-14436-WP'
|
2017-11-09 14:52:52 +01:00 |
|
Marion Muszynski
|
6330105f81
|
big inte of adminOrder view
|
2017-11-09 14:51:48 +01:00 |
|
Nolwenn J
|
0943d97a0f
|
mails
|
2017-11-09 14:33:57 +01:00 |
|
Michael RICOIS
|
7b003901a8
|
List sub categories
|
2017-11-08 16:48:18 +01:00 |
|
Michael RICOIS
|
eb4ee2af4a
|
Admin
|
2017-11-08 16:47:54 +01:00 |
|
Michael RICOIS
|
ccd3ebb1df
|
Merge branch 'ticket-14666-appli-discount'
|
2017-11-08 10:35:44 +01:00 |
|
Michael RICOIS
|
cda38086b5
|
Design
|
2017-11-08 10:35:12 +01:00 |
|
Michael RICOIS
|
d9bd62dba7
|
Merge branch 'ticket-14525-parrain'
|
2017-11-08 09:52:16 +01:00 |
|
Michael RICOIS
|
5b6adf98f0
|
Select content
|
2017-11-08 09:50:45 +01:00 |
|
Michael RICOIS
|
4573467338
|
Admin image storage
|
2017-11-08 09:49:24 +01:00 |
|
Michael RICOIS
|
f15d094753
|
Display image
|
2017-11-08 09:49:09 +01:00 |
|
Michael RICOIS
|
9963cbee23
|
Spaces
|
2017-11-08 09:48:45 +01:00 |
|
Michael RICOIS
|
731d431be1
|
New rewrite rules
|
2017-11-08 09:48:29 +01:00 |
|
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 |
|
Michael RICOIS
|
3cf9de8772
|
Integrate on front
|
2017-11-07 11:51:19 +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 |
|
Michael RICOIS
|
3a9ea5aab1
|
Add module in displayLeft
|
2017-11-06 17:21:23 +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
|
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 |
|
Marion Muszynski
|
4e84124e85
|
Merge branch 'inte-white-fix'
|
2017-11-06 12:23:49 +01:00 |
|
Michael RICOIS
|
69d36c6c07
|
Merge remote-tracking branch 'origin/ticket-14666-appli-discount' into develop
|
2017-11-06 12:22:31 +01:00 |
|
Marion Muszynski
|
5a83607b98
|
Merge branch 'inte-white-fix' into develop
|
2017-11-06 12:15:01 +01:00 |
|
Marion Muszynski
|
d2614d471f
|
fix
|
2017-11-06 12:14:54 +01:00 |
|
Marion Muszynski
|
0cf41a41b1
|
Merge branch 'inte-white-fix' into develop
|
2017-11-06 12:07:27 +01:00 |
|
Marion Muszynski
|
6036bfd280
|
fix css carrier table
|
2017-11-06 12:06:14 +01:00 |
|
Michael RICOIS
|
2fb0bd187d
|
Discount only for applications
|
2017-11-06 12:00:30 +01:00 |
|
Marion Muszynski
|
a53ea90104
|
fix conflicts
|
2017-11-06 11:58:06 +01:00 |
|
Marion Muszynski
|
f31e4d5fd6
|
fix style order conf detail tpl
|
2017-11-06 11:45:20 +01:00 |
|
Michael RICOIS
|
3eab7df2ef
|
Front integration
|
2017-11-06 10:26:53 +01:00 |
|
root
|
cd73ae71a8
|
change bg and mtn img
|
2017-11-03 16:22:44 +01:00 |
|
root
|
ca67d6026a
|
Merge branch 'master' of gitlab.antadis.net:dev-antadis/bebeboutik
|
2017-11-03 16:21:03 +01:00 |
|
root
|
90cccba602
|
fix header swift from prod
|
2017-11-03 16:20:41 +01:00 |
|
Michael RICOIS
|
cc35d92d83
|
Delete
|
2017-11-03 10:51:26 +01:00 |
|
Michael RICOIS
|
2eb955f6d2
|
Change tpl path
|
2017-11-03 10:49:38 +01:00 |
|