 Samuele Locatelli
|
117a6288bb
|
Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_thermo_active into develop
|
2020-05-19 16:27:21 +02:00 |
|
|
Samuele Locatelli
|
95484c7ee7
|
Update metodi preliminari signal-r
|
2020-05-19 16:23:10 +02:00 |
|
|
=
|
4db37d663f
|
fix caricamento signalr
|
2020-05-19 15:19:08 +02:00 |
|
|
=
|
bbfe28edc7
|
log delle chiamate signalr
|
2020-05-19 15:13:57 +02:00 |
|
|
=
|
180334822b
|
Merge remote-tracking branch 'teamdev/develop' into develop
|
2020-05-19 15:04:58 +02:00 |
|
|
Samuele Locatelli
|
63b09c1dfb
|
OK con S7 il thermo NC!!!
|
2020-05-19 08:55:40 +02:00 |
|
|
Samuele Locatelli
|
ea32e6b506
|
Debug on NC continues
|
2020-05-18 17:54:56 +02:00 |
|
|
Samuele Locatelli
|
e65ba32e09
|
Start integration for S7Net NC
|
2020-05-18 17:25:56 +02:00 |
|
|
Samuele Locatelli
|
426eaeea95
|
Start update for signal-r THERMO management
|
2020-05-15 18:38:49 +02:00 |
|
|
Alessio
|
026a85e5ff
|
Merge branch 'newfeature/processo' into develop
|
2020-05-07 12:22:32 +02:00 |
|
|
Alessio
|
85a387cc86
|
fix merge
|
2020-05-07 12:22:12 +02:00 |
|
|
Alessio
|
dfcaac23ba
|
Merge branch 'newfeature/paddle' into newfeature/processo
|
2020-05-07 12:08:08 +02:00 |
|
|
francesco.guerrieri
|
9c1928c7ae
|
fix button modal and binding for modal options
|
2020-05-07 11:55:31 +02:00 |
|
|
Alessio
|
506c14f82a
|
Merge branch 'newfeature/programmazione-preriscaldo' into newfeature/processo
|
2020-05-07 10:59:09 +02:00 |
|
|
Alessio
|
10835c555e
|
fix footer buttons
|
2020-05-07 10:58:56 +02:00 |
|
|
Damiano
|
c1adb138e7
|
Fix binding
|
2020-05-07 10:52:21 +02:00 |
|
|
Damiano
|
f06dac3a7b
|
Auto stash before merge of "newfeature/programmazione-preriscaldo" and "origin/newfeature/programmazione-preriscaldo"
|
2020-05-07 09:37:13 +02:00 |
|
|
Alessio
|
6545727c2f
|
fix binding and footer buttons
|
2020-05-07 09:20:29 +02:00 |
|
|
francesco.guerrieri
|
cf240405a5
|
fix binding for options and vacuum modal
|
2020-05-06 17:14:52 +02:00 |
|
|
Alessio
|
e377d7ece7
|
fix prop
|
2020-05-06 15:36:54 +02:00 |
|
|
Alessio
|
70011ed571
|
Merge branch 'newfeature/programmazione-preriscaldo' into newfeature/processo
|
2020-05-06 15:29:21 +02:00 |
|
|
Alessio
|
e4d3c5559a
|
fix binding
|
2020-05-06 15:23:42 +02:00 |
|
|
Alessio
|
7232f63094
|
Auto stash before merge of "newfeature/programmazione-preriscaldo" and "origin/newfeature/programmazione-preriscaldo"
|
2020-05-06 15:01:42 +02:00 |
|
|
Damiano
|
581dade86d
|
add "mock-variables in formato"
|
2020-05-06 14:57:53 +02:00 |
|
|
Alessio
|
84033194a6
|
fix binding quote e velocita
|
2020-05-06 14:17:59 +02:00 |
|
|
Alessio
|
0cb7833480
|
Merge remote-tracking branch 'origin/newfeature/programmazione-preriscaldo' into newfeature/programmazione-preriscaldo
|
2020-05-06 11:27:35 +02:00 |
|
|
Alessio
|
d9c892cb11
|
fix binding quote e velocita
|
2020-05-06 11:27:27 +02:00 |
|
|
Damiano
|
f08b33ebf6
|
fix "General binding"
|
2020-05-06 11:23:56 +02:00 |
|
|
Alessio
|
bdbc136638
|
fix Prop modale ciclo
|
2020-05-06 10:23:26 +02:00 |
|
|
Alessio
|
2d4ae4c0cc
|
fix binding modale Ciclo
|
2020-05-06 10:12:43 +02:00 |
|
|
Alessio
|
60e8f3da34
|
add computed for opzioni modal
|
2020-05-05 16:15:01 +02:00 |
|
|
Damiano
|
a1aed17621
|
binding "General and Cycle"
|
2020-05-05 15:34:30 +02:00 |
|
|
francesco.guerrieri
|
add63366a3
|
recipe cooling, vacuum, extraction, options
|
2020-05-05 15:15:13 +02:00 |
|
|
Alessio
|
4f9d26c536
|
fix paddle
|
2020-05-05 11:42:03 +02:00 |
|
|
Alessio
|
bfd963f8d7
|
fix paddle
|
2020-05-04 16:18:33 +02:00 |
|
|
Alessio
|
16bda5b2a9
|
format and binding of the data
|
2020-05-04 14:28:21 +02:00 |
|
|
francesco.guerrieri
|
c32f50070e
|
Auto stash before merge of "newfeature/paddle" and "origin/develop"
|
2020-05-04 11:35:13 +02:00 |
|
|
francesco.guerrieri
|
0c03082ff8
|
Merge remote-tracking branch 'origin/develop' into newfeature/paddle
|
2020-05-04 11:34:31 +02:00 |
|
|
Alessio
|
11928ef3bf
|
Auto stash before merge of "newfeature/processo" and "origin/newfeature/paddle"
|
2020-05-04 10:08:22 +02:00 |
|
|
Alessio
|
f745084d44
|
Merge remote-tracking branch 'origin/newfeature/paddle' into newfeature/processo
|
2020-05-04 10:08:00 +02:00 |
|
|
Alessio
|
ec06bf016d
|
Merge remote-tracking branch 'origin/newfeature/processo' into newfeature/processo
|
2020-05-04 09:32:18 +02:00 |
|
|
Alessio
|
7ed09443d9
|
Merge branch 'newfeature/paddle' into newfeature/processo
|
2020-05-04 09:31:55 +02:00 |
|
|
Alessio
|
d99c7b52a6
|
format and binding of the data for riscaldi modal
|
2020-05-04 09:26:26 +02:00 |
|
|
francesco.guerrieri
|
6c0cef552c
|
fix styles paddle
|
2020-05-04 09:02:04 +02:00 |
|
|
Damiano
|
87976bea45
|
Fix overview (general,position and cycle).
|
2020-04-30 17:14:26 +02:00 |
|
|
Alessio
|
93544b93a7
|
add format and binding of the data
|
2020-04-30 16:36:41 +02:00 |
|
|
Damiano
|
20a059602f
|
Merge remote-tracking branch 'origin/develop' into newfeature/programmazione-preriscaldo
|
2020-04-30 11:16:32 +02:00 |
|
|
Samuele Locatelli
|
f9586ce949
|
Fix enum json
|
2020-04-30 08:38:42 +02:00 |
|
|
Samuele Locatelli
|
46b715dd3c
|
Merge branch 'feature/add/recipeModel' into develop
|
2020-04-29 18:33:27 +02:00 |
|
|
Samuele Locatelli
|
d926a504d5
|
Aggiunto anche metodo x recipe overview
|
2020-04-29 18:31:20 +02:00 |
|