Marion Muszynski
|
3756a2d4b7
|
modification regenerateTree to limit to active categories
|
2016-12-14 18:12:08 +01:00 |
|
Marion Muszynski
|
715db47da4
|
add manually generation of ntree
|
2016-12-14 10:28:03 +01:00 |
|
Marion Muszynski
|
cb8ec32ad3
|
Merge branch 'add-ConfSectionForAntadis'
|
2016-12-13 14:53:54 +01:00 |
|
Marion Muszynski
|
124f7ebaed
|
addition of js
|
2016-12-13 14:53:30 +01:00 |
|
Marion Muszynski
|
ff56848987
|
optimization
|
2016-12-13 14:52:58 +01:00 |
|
Marion Muszynski
|
f8b1556ad6
|
Merge branch 'add-ConfSectionForAntadis'
|
2016-12-13 10:29:30 +01:00 |
|
Marion Muszynski
|
eb837ac915
|
addidtion of simpleDate for helperFormBootstrap
|
2016-12-13 10:15:43 +01:00 |
|
Marion Muszynski
|
4aa99c4bfb
|
changements
|
2016-12-12 18:27:45 +01:00 |
|
Marion Muszynski
|
c93bf04685
|
Merge branch 'add-ConfSectionForAntadis'
|
2016-12-12 16:24:04 +01:00 |
|
Marion Muszynski
|
32f18fe6af
|
show nb orders to update
|
2016-12-12 16:23:50 +01:00 |
|
Marion Muszynski
|
abe4483a6c
|
Merge branch 'add-ConfSectionForAntadis'
|
2016-12-12 16:12:39 +01:00 |
|
Marion Muszynski
|
01a632cd40
|
Merge branch 'ticket-11987-DeliveryInfoProductTpl'
|
2016-12-12 15:46:20 +01:00 |
|
Marion Muszynski
|
809cc513a4
|
addition of delivery info in product tpl mobile version
|
2016-12-12 15:45:59 +01:00 |
|
Marion Muszynski
|
0ccd7ae611
|
add new section for antadis administration
|
2016-12-12 15:35:45 +01:00 |
|
Marion Muszynski
|
8c5dec2293
|
beginning
|
2016-12-09 15:26:22 +01:00 |
|
Marion Muszynski
|
38f6a0daba
|
fix
|
2016-12-08 15:48:08 +01:00 |
|
Marion Muszynski
|
f4e2256c65
|
fix conflicts
|
2016-12-08 15:46:19 +01:00 |
|
Marion Muszynski
|
3352dfb3e3
|
last changements for prod
|
2016-12-08 15:23:33 +01:00 |
|
Marion Muszynski
|
e807437a10
|
finition
|
2016-12-08 13:25:39 +01:00 |
|
Marion Muszynski
|
d4f4452c43
|
changement
|
2016-12-08 12:31:06 +01:00 |
|
Marion Muszynski
|
93c766dc57
|
Merge branch 'ticket-10657-ExportCMD'
|
2016-12-08 11:54:19 +01:00 |
|
Marion Muszynski
|
e55202c0d0
|
addition of help sentence
|
2016-12-08 11:54:04 +01:00 |
|
Marion Muszynski
|
5984fba9dd
|
Merge branch 'ticket-10657-ExportCMD'
|
2016-12-08 11:46:51 +01:00 |
|
Marion Muszynski
|
0569cdea43
|
addition of data in export
|
2016-12-08 11:46:35 +01:00 |
|
Marion Muszynski
|
6bac6b55fe
|
Merge branch 'ticket-10657-ExportCMD'
|
2016-12-08 11:30:11 +01:00 |
|
Marion Muszynski
|
bf7666a730
|
restriction for testing
|
2016-12-08 11:29:31 +01:00 |
|
Marion Muszynski
|
b6e13fc8c8
|
adjusting extract
|
2016-12-08 11:28:05 +01:00 |
|
Marion Muszynski
|
08a2023fb8
|
addition of new export
|
2016-12-08 10:34:49 +01:00 |
|
Marion Muszynski
|
662e11149f
|
Merge branch 'ticket-11988-backgroundVPLogo'
|
2016-12-07 15:39:18 +01:00 |
|
Marion Muszynski
|
ee8cd5807a
|
remove background of vp logo in product tpl
|
2016-12-07 15:39:03 +01:00 |
|
Marion Muszynski
|
7cb36d6b0d
|
changement for pack gestion
|
2016-12-07 14:29:33 +01:00 |
|
Marion Muszynski
|
0a9afab232
|
pack gestion at expedition reception
|
2016-12-07 10:36:03 +01:00 |
|
Marion Muszynski
|
1a60d5e59e
|
Merge branch 'ticket-10657-PhileaLogBlocant'
|
2016-12-06 16:11:25 +01:00 |
|
Marion Muszynski
|
ef4a76b327
|
log with mail sending
|
2016-12-06 16:11:12 +01:00 |
|
Marion Muszynski
|
58776438d1
|
continuing
|
2016-12-06 15:45:47 +01:00 |
|
Marion Muszynski
|
8db1dda6fb
|
Merge branch 'ticket-11957-removePersonalData'
|
2016-12-06 12:10:35 +01:00 |
|
Marion Muszynski
|
655a7515d7
|
remove other personal datas
|
2016-12-06 12:07:23 +01:00 |
|
Marion Muszynski
|
a509d4f0ab
|
remove personal data in ga module
|
2016-12-06 11:53:34 +01:00 |
|
Marion Muszynski
|
22d5994ee4
|
remove console log
|
2016-12-06 11:48:56 +01:00 |
|
Marion Muszynski
|
82fdce66ce
|
remove personal data from url before sending to GA
|
2016-12-06 11:22:25 +01:00 |
|
Marion Muszynski
|
5bd20c72d3
|
continuing
|
2016-12-06 10:07:54 +01:00 |
|
Marion Muszynski
|
8df93121a8
|
continuing pack management
|
2016-12-05 10:13:27 +01:00 |
|
Marion Muszynski
|
1f8b74264a
|
Merge branch 'ticket-11935-SuiviConversation'
|
2016-12-02 16:31:48 +01:00 |
|
Marion Muszynski
|
2b5fbe4bb7
|
fix link for es
|
2016-12-02 16:26:34 +01:00 |
|
Marion Muszynski
|
966d6fa2d2
|
if statement according the id_contact
|
2016-12-02 16:18:19 +01:00 |
|
Marion Muszynski
|
7ce5c6905c
|
adjust link reply
|
2016-12-02 16:12:31 +01:00 |
|
Marion Muszynski
|
4b10e0f6e4
|
change reply link
|
2016-12-02 16:00:14 +01:00 |
|
Marion Muszynski
|
192cd79a6b
|
continuing packs
|
2016-12-02 15:34:57 +01:00 |
|
Marion Muszynski
|
19158cc3f5
|
Merge branch 'ticket-11933-bugSaleCombination'
|
2016-12-02 12:07:06 +01:00 |
|
Marion Muszynski
|
6964d4fb69
|
fix
|
2016-12-02 12:06:52 +01:00 |
|