Marion Muszynski
|
18259bfaa0
|
Merge branch 'add-module-ant_creationcategories' into develop
|
2016-12-15 17:48:51 +01:00 |
|
Marion Muszynski
|
e4d330e372
|
addition of info
|
2016-12-15 17:48:34 +01:00 |
|
Marion Muszynski
|
7f34c09cf7
|
Merge branch 'add-module-ant_creationcategories' into develop
|
2016-12-15 17:30:25 +01:00 |
|
Marion Muszynski
|
a23e7dc2c2
|
add module
|
2016-12-15 17:30:05 +01:00 |
|
Marion Muszynski
|
c75677fcb7
|
Merge branch 'add-module-ant_creationcategories' into develop
|
2016-12-15 17:12:36 +01:00 |
|
Marion Muszynski
|
79a1d1ec71
|
Merge branch 'ticket-11201-SlowCategoryCreation' into develop
|
2016-12-15 17:12:09 +01:00 |
|
Marion Muszynski
|
da45380893
|
addition of module for mutiple category creation
|
2016-12-15 17:11:31 +01:00 |
|
Marion Muszynski
|
a8f9690ecf
|
Merge branch 'ticket-12052-PreventDelivery'
|
2016-12-15 12:10:30 +01:00 |
|
Marion Muszynski
|
b3b9d7313f
|
Merge branch 'ticket-12052-PreventDelivery' into develop
|
2016-12-15 12:02:48 +01:00 |
|
Marion Muszynski
|
a13396baa8
|
restriction for delivery to ceuta and melina
|
2016-12-15 12:02:32 +01:00 |
|
Marion Muszynski
|
9500f86e9d
|
changement
|
2016-12-15 11:47:40 +01:00 |
|
Marion Muszynski
|
3756a2d4b7
|
modification regenerateTree to limit to active categories
|
2016-12-14 18:12:08 +01:00 |
|
Marion Muszynski
|
d8da391eec
|
Merge branch 'ticket-10657-PhileaOptimization'
|
2016-12-14 16:04:27 +01:00 |
|
Marion Muszynski
|
c3ff8d4935
|
changement visuel
|
2016-12-14 16:04:08 +01:00 |
|
Marion Muszynski
|
2a833ef331
|
Merge branch 'ticket-10657-PhileaOptimization'
|
2016-12-14 15:17:50 +01:00 |
|
Marion Muszynski
|
7f724c2012
|
css changement and optimisation db philea_sent
|
2016-12-14 15:17:32 +01:00 |
|
Marion Muszynski
|
199c56337b
|
Merge branch 'ticket-10657-PhileaOptimization'
|
2016-12-14 11:30:42 +01:00 |
|
Marion Muszynski
|
692cfc1d20
|
prevent multi same update of order state
|
2016-12-14 11:30:09 +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
|
b5f2e365ad
|
fix conflicts
|
2016-12-12 16:09:07 +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
|
ce40fc52c7
|
fix conflict
|
2016-12-08 13:28:32 +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
|
a4752145fa
|
fix conflicts
|
2016-12-07 14:36:59 +01:00 |
|