Marion Muszynski
|
c0c99bd7e9
|
Merge branch 'ticket-13814-mailAlertUpdate' into develop
|
2017-08-22 12:26:00 +02:00 |
|
Marion Muszynski
|
2a4c9d9716
|
fix update last sent date
|
2017-08-22 12:25:47 +02:00 |
|
Marion Muszynski
|
ae6ef9393c
|
Merge branch 'ticket-13814-mailAlertUpdate' into develop
|
2017-08-22 12:21:55 +02:00 |
|
Marion Muszynski
|
ae50abd4d5
|
fix
|
2017-08-22 12:21:39 +02:00 |
|
Marion Muszynski
|
b283b18d74
|
Merge branch 'ticket-13814-mailAlertUpdate' into develop
|
2017-08-22 11:57:31 +02:00 |
|
Marion Muszynski
|
c3e6114948
|
fix param
|
2017-08-22 11:57:21 +02:00 |
|
Marion Muszynski
|
4befac4029
|
Merge branch 'ticket-13814-mailAlertUpdate' into develop
|
2017-08-22 11:44:08 +02:00 |
|
Marion Muszynski
|
e6830465e0
|
fix
|
2017-08-22 11:43:58 +02:00 |
|
Marion Muszynski
|
2c541bfd6b
|
Merge branch 'ticket-13814-mailAlertUpdate' into develop
|
2017-08-22 11:35:59 +02:00 |
|
Marion Muszynski
|
fb748dbad6
|
add models
|
2017-08-22 11:35:39 +02:00 |
|
Marion Muszynski
|
15a82bf7f0
|
Merge branch 'ticket-13814-mailAlertUpdate' into develop
|
2017-08-22 11:31:13 +02:00 |
|
Marion Muszynski
|
a4853d9043
|
updating Mail alert module
|
2017-08-22 11:30:56 +02:00 |
|
root
|
a56d8c04e8
|
fix from prod
|
2017-08-22 09:59:32 +02:00 |
|
root
|
76dee4cf4c
|
fix from prod
|
2017-08-21 17:57:02 +02:00 |
|
Marion Muszynski
|
8636efc018
|
fix reprint MR for multi parcel
|
2017-08-21 15:05:19 +02:00 |
|
Marion Muszynski
|
5573d5a98d
|
Merge branch 'ticket-13942-fixDeliveryDelay'
|
2017-08-21 12:26:57 +02:00 |
|
root
|
1efe0a509d
|
fix from prod
|
2017-08-21 12:20:02 +02:00 |
|
Marion Muszynski
|
aca897dd80
|
Merge branch 'ticket-13942-fixDeliveryDelay' into develop
|
2017-08-21 12:06:06 +02:00 |
|
Marion Muszynski
|
deebe9e910
|
fix sale delay
|
2017-08-21 12:05:51 +02:00 |
|
Marion Muszynski
|
f36246257c
|
fix conflict
|
2017-08-21 11:46:25 +02:00 |
|
Marion Muszynski
|
0e84b82114
|
remove company name for MR expe
|
2017-08-21 11:44:27 +02:00 |
|
Marion Muszynski
|
851ff949be
|
Merge branch 'ticket-13225-SpecificDelivery'
|
2017-08-21 10:46:55 +02:00 |
|
Marion Muszynski
|
89f1f6f102
|
Merge branch 'ticket-returnprocess-final' into develop
|
2017-08-17 16:09:42 +02:00 |
|
Marion Muszynski
|
1247fc2492
|
fix css
|
2017-08-17 16:09:33 +02:00 |
|
Marion Muszynski
|
a5375c2a3d
|
Merge branch 'ticket-returnprocess-final' into develop
|
2017-08-17 15:53:22 +02:00 |
|
Marion Muszynski
|
4a5aa5c7c4
|
add discount and mr shipping numbers
|
2017-08-17 15:52:58 +02:00 |
|
Marion Muszynski
|
9806fd20de
|
Merge branch 'ticket-13225-SpecificDelivery' into develop
|
2017-08-17 15:26:25 +02:00 |
|
Marion Muszynski
|
613ac55478
|
fix sentences
|
2017-08-17 15:26:06 +02:00 |
|
Marion Muszynski
|
69ece0338f
|
fix conflicts
|
2017-08-17 11:25:24 +02:00 |
|
Marion Muszynski
|
abd8e88343
|
addition of new delivery delay and cleaning of sale combination
|
2017-08-17 11:22:54 +02:00 |
|
Marion Muszynski
|
01ff39e801
|
Merge branch 'ticket-12743-SavSupplierPart2' into develop
|
2017-07-28 12:16:57 +02:00 |
|
Marion Muszynski
|
1412696156
|
addition of solution field for supplier demand
|
2017-07-28 12:16:24 +02:00 |
|
Marion Muszynski
|
1b1e303364
|
Merge branch 'ticket-13754-fixSalePosition'
|
2017-07-27 12:07:54 +02:00 |
|
Marion Muszynski
|
bd9ff4fe9e
|
fix position of sale with lock position
|
2017-07-27 12:07:35 +02:00 |
|
Marion Muszynski
|
8184784f2e
|
Merge branch 'ticket-13323-AdwordsES' into develop
|
2017-07-26 13:21:38 +02:00 |
|
Marion Muszynski
|
58b3c509b4
|
prevent multi tracking after registration
|
2017-07-26 13:21:18 +02:00 |
|
Marion Muszynski
|
3525fdc711
|
Merge branch 'ticket-13775-PreventHacking'
|
2017-07-26 11:10:12 +02:00 |
|
Marion Muszynski
|
4acbde0319
|
add module alerthack to prevent hacker to post
|
2017-07-26 11:09:47 +02:00 |
|
root
|
e75e1e61bb
|
fix from prod
|
2017-07-25 16:56:59 +02:00 |
|
root
|
9a723dcbc6
|
fix philea from prod
|
2017-07-25 16:54:35 +02:00 |
|
Marion Muszynski
|
06338522e6
|
Merge branch 'ticket-12743-SavSupplier'
|
2017-07-24 16:56:15 +02:00 |
|
Marion Muszynski
|
67aed06044
|
Merge branch 'ticket-13753-EvolBannerPromo' into develop
|
2017-07-24 11:57:58 +02:00 |
|
Marion Muszynski
|
34b55f8967
|
fix url
|
2017-07-24 11:57:47 +02:00 |
|
Marion Muszynski
|
cf80e281c7
|
Merge branch 'ticket-13753-EvolBannerPromo' into develop
|
2017-07-24 11:50:15 +02:00 |
|
Marion Muszynski
|
61cf5b99de
|
add link to banner
|
2017-07-24 11:49:58 +02:00 |
|
Marion Muszynski
|
e19e7cfae3
|
Merge branch 'ticket-13755-LogStats'
|
2017-07-24 11:07:59 +02:00 |
|
Marion Muszynski
|
a9de174730
|
fix table width
|
2017-07-24 11:07:45 +02:00 |
|
Marion Muszynski
|
7d67a3b42e
|
Merge branch 'ticket-13754-fixSalePosition'
|
2017-07-24 10:21:04 +02:00 |
|
Marion Muszynski
|
fbdc194f1a
|
fix width
|
2017-07-21 12:50:00 +02:00 |
|
Marion Muszynski
|
64f0796b94
|
fix location of data in table
|
2017-07-21 12:47:16 +02:00 |
|