Commit Graph

3527 Commits

Author SHA1 Message Date
Samuele Locatelli 04d94b572c Ok signal-r x NOMI ASSI e tipo (da conf) 2020-09-20 12:14:17 +02:00
Samuele Locatelli 134981c2d7 Aggiunta metodi preliminari gestione dati ASSI 2020-09-20 11:54:38 +02:00
Samuele Locatelli 5da1afa0eb Prosegue gestione dati assi (da conf con XML) 2020-09-20 11:54:23 +02:00
Samuele Locatelli e42a231989 Aggiunta xsd x conf assi + update conf assi 2020-09-20 11:53:46 +02:00
Samuele Locatelli e509c83b90 start new rel 88 2020-09-20 10:19:55 +02:00
Samuele Locatelli 79f28bc415 Update datamodel in OUT 2020-09-20 10:19:22 +02:00
Samuele Locatelli 2c94761966 Merge remote-tracking branch 'origin/develop' into develop 2020-09-18 18:22:23 +02:00
Samuele Locatelli 44c6e48398 new rel 2020-09-18 18:11:52 +02:00
Samuele Locatelli 6c1aa037d5 Invio starred modifica ricetta con signal-r 2020-09-18 18:11:35 +02:00
= 3a8f702a87 Merge remote-tracking branch 'CMS/develop' into develop 2020-09-18 17:17:35 +02:00
= b21592609b modal save confirm 2020-09-18 17:17:23 +02:00
Samuele Locatelli 5a4e86f861 Merge remote-tracking branch 'origin/develop' into develop 2020-09-18 16:57:52 +02:00
Samuele E. Locatelli 0e41eb6033 fix apth x browser locale JS 2020-09-18 16:57:13 +02:00
Samuele E. Locatelli 11100544c9 aggiunta zip demo recipes 2020-09-18 16:57:00 +02:00
Samuele Locatelli 42069a2cb2 Update config parametri opzionali 2020-09-18 16:46:24 +02:00
Samuele Locatelli 5c1777a4b6 Merge remote-tracking branch 'origin/develop' into develop 2020-09-18 11:02:51 +02:00
Samuele Locatelli de81cde6ec new rel 86 2020-09-18 11:02:37 +02:00
= 7c47415d65 fix autocomplete con valori stringa.. 2020-09-18 10:25:13 +02:00
= dcceb55652 Merge remote-tracking branch 'CMS/develop' into develop 2020-09-18 09:43:40 +02:00
= 247bf212ae Merge remote-tracking branch 'CMS/develop' into develop 2020-09-18 09:43:32 +02:00
= f5b2745a87 warmers.. 2020-09-18 09:41:19 +02:00
Samuele Locatelli 6f46e5a9a5 Merge branch 'develop' into new/M156 2020-09-18 09:39:23 +02:00
Samuele Locatelli 1c0f161640 update config controller x gestione unità di misura 2020-09-18 09:36:02 +02:00
Samuele Locatelli 7a66c3d63d aggiunta unità di misura in serverConfig 2020-09-18 09:35:34 +02:00
= 23af55e1e1 riscaldi 2020-09-17 17:23:43 +02:00
Samuele Locatelli 8e3f3ec5e0 new rel 2020-09-17 13:00:59 +02:00
Samuele Locatelli cf96c67a3c Merge remote-tracking branch 'origin/develop' into develop 2020-09-17 12:55:35 +02:00
Samuele Locatelli ae8f931372 Gestione lettura ed export config parametri lastra 2020-09-17 12:55:10 +02:00
Samuele Locatelli 20d9bf716d Aggiunta XML x conf parametri lastra 2020-09-17 12:54:58 +02:00
Samuele E. Locatelli 2f6f308f19 Merge remote-tracking branch 'origin/develop' into develop 2020-09-17 12:43:59 +02:00
= 7fd2b6ca30 Merge remote-tracking branch 'CMS/develop' into develop 2020-09-17 12:07:29 +02:00
= aff9643216 riscaldi inferiori autocomposizione 2020-09-17 12:05:17 +02:00
= 465b09c176 riscaldi autocomposizione 2020-09-17 12:02:18 +02:00
Samuele E. Locatelli 1efde033b2 Update input x nuovo tipo finirestra popup 2020-09-17 11:52:15 +02:00
NICOLA CARMINATI 4a609bc35b Other behaviour fixes 2020-09-17 11:46:27 +02:00
NICOLA CARMINATI 88aa48a3d8 Fix M156 and modal Behaviour 2020-09-17 11:40:02 +02:00
Samuele E. Locatelli b280dca20f Merge remote-tracking branch 'origin/develop' into develop 2020-09-17 10:13:36 +02:00
Samuele E. Locatelli a6d6041b06 aggiunta finestra 2 2020-09-17 10:13:05 +02:00
Samuele E. Locatelli 46b7b02da9 fix check inp button null 2020-09-17 10:01:20 +02:00
= 98d3798824 fix toggle on error color 2020-09-16 16:00:26 +02:00
= dd7e9b9e19 Merge remote-tracking branch 'CMS/develop' into develop 2020-09-16 15:47:23 +02:00
= 550b448dc2 disegno piastra... mancano le dimensioni dei riscaldi 2020-09-16 15:46:42 +02:00
= afaa8f3576 fix numeric unit of measure 2020-09-16 15:46:14 +02:00
NICOLA CARMINATI 328d2ed176 Fix M155 merge 2020-09-16 12:56:32 +02:00
NICOLA CARMINATI 9bd1faf083 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_thermo_active into develop
# Conflicts:
#	Thermo.Active/wwwroot/src/app_modules/machine/components/m155-dialog.ts
#	Thermo.Active/wwwroot/src/app_modules/machine/components/m155-dialog.vue
2020-09-16 10:49:08 +02:00
NICOLA CARMINATI 6526a20d5c Fix m155 2020-09-16 10:47:21 +02:00
NICOLA CARMINATI 9f4adce366 Added M155 2020-09-16 10:46:24 +02:00
= 7d29511fdb click fuori da combo e paddle 2020-09-16 10:30:56 +02:00
= e28b736ebf fix keyboard 2020-09-16 09:54:23 +02:00
= 383b5417d4 Merge remote-tracking branch 'CMS/develop' into develop 2020-09-15 14:24:24 +02:00