Marion Muszynski
|
54427ea473
|
new delay added in choice in ps management
|
2016-11-07 15:35:15 +01:00 |
|
Marion Muszynski
|
853ae921ec
|
fix conflict
|
2016-11-07 15:30:22 +01:00 |
|
Marion Muszynski
|
ef7467f787
|
addition of a new delay for xmas
|
2016-11-07 15:28:43 +01:00 |
|
Marion Muszynski
|
10c666cc1b
|
Merge branch 'ticket-ChangeDeliveryAddress'
|
2016-11-07 10:59:02 +01:00 |
|
Marion Muszynski
|
e4f6d284a1
|
Merge branch 'ticket-AideContact-SAV' into develop
|
2016-11-04 15:02:04 +01:00 |
|
Marion Muszynski
|
4add8caca1
|
modif
|
2016-11-04 15:01:46 +01:00 |
|
Marion Muszynski
|
938d7ead76
|
Merge branch 'ticket-AideContact-SAV' into develop
|
2016-11-04 14:56:51 +01:00 |
|
Marion Muszynski
|
ed05b99b65
|
bug fixes
|
2016-11-04 14:56:33 +01:00 |
|
Marion Muszynski
|
c8c40f93dd
|
Merge branch 'ticket-AideContact-SAV'
|
2016-11-04 13:08:16 +01:00 |
|
Marion Muszynski
|
537eb9f490
|
other fix
|
2016-11-04 13:08:00 +01:00 |
|
Marion Muszynski
|
8836f67ef6
|
Merge branch 'ticket-AideContact-SAV'
|
2016-11-04 13:05:40 +01:00 |
|
Marion Muszynski
|
576e99292e
|
good fix this time
|
2016-11-04 13:05:25 +01:00 |
|
Marion Muszynski
|
9ec6071f71
|
Merge branch 'ticket-AideContact-SAV'
|
2016-11-04 13:03:46 +01:00 |
|
Marion Muszynski
|
21b2da29d6
|
fix for front
|
2016-11-04 13:03:15 +01:00 |
|
Marion Muszynski
|
2d7ce553b1
|
Merge branch 'ticket-AideContact-SAV'
|
2016-11-04 12:55:18 +01:00 |
|
Marion Muszynski
|
306111c390
|
addition of address changement
|
2016-11-04 12:54:57 +01:00 |
|
Marion Muszynski
|
985eab5cb7
|
Merge branch 'ticket-AideContact-SAV' into develop
|
2016-11-04 12:50:55 +01:00 |
|
Marion Muszynski
|
84ab26a49b
|
fix and addition of address modification
|
2016-11-04 12:50:34 +01:00 |
|
Marion Muszynski
|
2c9d14a627
|
Merge branch 'ticket-philea3'
|
2016-11-04 10:24:17 +01:00 |
|
Marion Muszynski
|
04a004954c
|
addition of checking if product sale cache cron is processing
|
2016-11-04 10:24:04 +01:00 |
|
Marion Muszynski
|
03f8ea2f07
|
Merge branch 'ticket-philea3'
|
2016-11-03 17:20:25 +01:00 |
|
Marion Muszynski
|
5686b5395c
|
bug fixes
|
2016-11-03 17:20:09 +01:00 |
|
Marion Muszynski
|
056bcaa62f
|
Merge branch 'ticket-philea3'
|
2016-11-03 12:00:02 +01:00 |
|
Marion Muszynski
|
ea9b87ee1c
|
Merge branch 'master' of gitlab.antadis.net:dev-antadis/bebeboutik into ticket-philea3
|
2016-11-03 11:58:32 +01:00 |
|
Marion Muszynski
|
830246cb5d
|
allowing of cron sync auto
|
2016-11-03 11:58:23 +01:00 |
|
Marion Muszynski
|
6ca9aad5fc
|
Merge branch 'ticket-philea3'
|
2016-11-03 11:28:18 +01:00 |
|
Marion Muszynski
|
45a39353ab
|
addition of shipping number in admin order
|
2016-11-03 11:27:56 +01:00 |
|
Marion Muszynski
|
876f49d15b
|
Merge branch 'ticket-philea3'
|
2016-11-03 10:29:16 +01:00 |
|
Marion Muszynski
|
b744f47d4d
|
fixes
|
2016-11-03 10:28:57 +01:00 |
|
Marion Muszynski
|
2cd37d6012
|
Merge branch 'ticket-philea3'
|
2016-11-02 17:41:19 +01:00 |
|
Marion Muszynski
|
b991eaa016
|
modif
|
2016-11-02 17:41:06 +01:00 |
|
Marion Muszynski
|
c7754309fe
|
Merge branch 'ticket-AideContact-SAV'
|
2016-11-02 17:04:44 +01:00 |
|
Marion Muszynski
|
b915ed8649
|
Merge branch 'ticket-AideContact-SAV' into develop
|
2016-11-02 17:04:16 +01:00 |
|
Marion Muszynski
|
5b95689b06
|
small updating
|
2016-11-02 17:03:58 +01:00 |
|
Marion Muszynski
|
3946f6ceac
|
fix conflict
|
2016-11-02 12:43:27 +01:00 |
|
Marion Muszynski
|
d669382ec0
|
Merge branch 'ticket-AideContact-SAV' into develop
|
2016-11-02 12:29:45 +01:00 |
|
Marion Muszynski
|
1fa6860786
|
allowing sending of mails
|
2016-11-02 12:29:20 +01:00 |
|
Marion Muszynski
|
ede0f691a8
|
fix conflicts
|
2016-11-02 12:11:44 +01:00 |
|
Marion Muszynski
|
f9f3f329f6
|
Merge branch 'ticket-philea2'
|
2016-11-02 11:26:40 +01:00 |
|
Marion Muszynski
|
0b744bb04a
|
fixes
|
2016-11-02 11:26:25 +01:00 |
|
Marion Muszynski
|
dff70fac60
|
fix vim bug
|
2016-11-02 10:31:47 +01:00 |
|
Marion Muszynski
|
e2f3cc3804
|
ftp connection
|
2016-11-02 10:31:03 +01:00 |
|
Marion Muszynski
|
7ffd4a7f8f
|
Merge branch 'ticket-philea2'
|
2016-11-02 10:27:09 +01:00 |
|
Marion Muszynski
|
8384d69056
|
css adjusting
|
2016-11-02 10:26:40 +01:00 |
|
Marion Muszynski
|
f038f52798
|
Merge branch 'ticket-AideContact-SAV' into develop
|
2016-10-31 14:38:55 +01:00 |
|
Marion Muszynski
|
f90f499f00
|
css adjusting
|
2016-10-31 14:38:37 +01:00 |
|
Marion Muszynski
|
4215b9dc82
|
Merge branch 'ticket-AideContact-SAV' into develop
|
2016-10-31 13:09:18 +01:00 |
|
Marion Muszynski
|
8e37d90b44
|
fix update reason
|
2016-10-31 13:09:02 +01:00 |
|
Marion Muszynski
|
4820d3e962
|
Merge branch 'update-payboxAndPaypal'
|
2016-10-31 12:22:53 +01:00 |
|
Marion Muszynski
|
644ecd0593
|
Merge branch 'update-payboxAndPaypal' into develop
|
2016-10-31 11:52:28 +01:00 |
|