Commit Graph

2757 Commits

Author SHA1 Message Date
Samuele Locatelli cb72e13724 Merge branch 'feature/add/risk' into develop 2020-06-12 17:18:56 +02:00
Samuele Locatelli 6e5bf0888f change LiveData init 2020-06-12 17:17:33 +02:00
Samuele Locatelli 4fa253fd3b fixn recipe editing for action required too early 2020-06-12 17:17:05 +02:00
Samuele Locatelli 169c07fc1a new method for material dimension % calc 2020-06-12 17:00:15 +02:00
= fbe619e498 scrittura dati lato server (formato) 2020-06-12 16:59:03 +02:00
= e3f9a09063 layout select 2020-06-12 16:33:51 +02:00
= 097de061bf fix layout box in article 2020-06-12 16:19:19 +02:00
= 1c623cf512 Merge remote-tracking branch 'CMS/develop' into develop 2020-06-12 16:08:05 +02:00
= cbaa4bb359 fix loading stylecss 2020-06-12 16:06:05 +02:00
= 1e5fd252d4 fix layout bordered labels 2020-06-12 15:55:07 +02:00
Alessio d8580afd77 Merge remote-tracking branch 'origin/develop' into develop 2020-06-12 15:45:45 +02:00
Alessio ce5869f90a add label 2020-06-12 15:45:30 +02:00
Alessio dd8793a31d add class for the svg's labels 2020-06-12 15:44:52 +02:00
= 5c17d598bb fix import togglebutton 2020-06-12 15:29:43 +02:00
Samuele Locatelli 82a25ae070 completed test for ACK to PLC 2020-06-12 15:07:22 +02:00
= 614105c35a fix layout raffreddamento 2020-06-12 15:01:18 +02:00
= fd6648432f fix layout controstampo 2020-06-12 14:56:02 +02:00
= 4a17830c07 controstampo 2020-06-12 14:25:20 +02:00
Alessio 0b5a49122d Merge remote-tracking branch 'origin/develop' into develop 2020-06-12 14:16:08 +02:00
Alessio 407d95e8e3 add some cards in the modals 2020-06-12 14:15:55 +02:00
= 6032712414 fix imbutitura 2020-06-12 14:11:04 +02:00
= 1fb1bba657 fix layout pirometro 2020-06-12 13:59:16 +02:00
= 75b4337c75 fix riscalti rendering delay 2020-06-12 13:02:07 +02:00
= 40664d6136 fix riscaldi 2020-06-12 13:00:36 +02:00
= 73d5b93c59 Merge remote-tracking branch 'teamdev/develop' into develop 2020-06-12 12:54:13 +02:00
= bb80dc5a38 fix layout riscaldi 2020-06-12 12:52:47 +02:00
Alessio e070a6be6e add some cards in the modals 2020-06-12 12:29:06 +02:00
= 34779f5a31 fix layout ciclo 2020-06-12 12:13:51 +02:00
= c80cdb8644 fix layout quote 2020-06-12 11:48:18 +02:00
Samuele Locatelli 50d0c4a948 Added flux for recipe/risk setup conf on request 2020-06-12 11:39:26 +02:00
= a5436bb717 fix layout formato 2020-06-12 11:33:00 +02:00
Alessio 2f9dbd8111 fix 2020-06-12 11:12:02 +02:00
= 8abc6f00c0 fix modal height 2020-06-12 10:55:58 +02:00
= a282429e3c Merge remote-tracking branch 'teamdev/develop' into develop 2020-06-12 10:46:46 +02:00
Alessio 49c85f347a delete previous buttons zoom 2020-06-12 10:45:24 +02:00
Alessio f58068b4f7 Merge remote-tracking branch 'origin/develop' into develop 2020-06-12 10:41:51 +02:00
Alessio 11fb2c2355 fix binding riscaldi 2020-06-12 10:41:29 +02:00
= ba3a340815 .keyboard layout 2020-06-12 09:58:17 +02:00
= 8a1b28020e pan & zoom su riscaldi 2020-06-12 09:51:30 +02:00
= 00dcc638fc fix footer 2020-06-12 09:37:22 +02:00
Samuele Locatelli cd2f21fe01 preliminary management of config request strb/ack 2020-06-11 19:45:31 +02:00
= ebbaa76054 Merge remote-tracking branch 'teamdev/develop' into develop 2020-06-11 18:32:17 +02:00
= 8324bcf297 riscaldi 2020-06-11 18:28:50 +02:00
Alessio f9de12a971 various fix in the modals 2020-06-11 16:38:28 +02:00
Alessio 2f8c6d643a add some property 2020-06-11 15:04:35 +02:00
Samuele Locatelli b14d506eb2 Merge branch 'feature/add/risk' into develop 2020-06-11 14:33:18 +02:00
= ccf8cd265e warmers 2020-06-11 14:31:20 +02:00
Samuele Locatelli 82e400b08d COmpleted warmers read/save data 2020-06-11 14:31:03 +02:00
= dd6f280c96 Merge remote-tracking branch 'teamdev/newfeature/Warmers' into develop 2020-06-11 14:20:47 +02:00
Alessio ade296ce56 Merge remote-tracking branch 'origin/develop' into develop 2020-06-11 14:02:50 +02:00