Commit Graph

1536 Commits

Author SHA1 Message Date
Alessandro 56b7194e64 Merge branch 'feature/wp10' into develop 2019-01-25 09:32:09 +01:00
Alessandro 6513d6c416 fix card-report-timeline 2019-01-25 09:13:14 +01:00
Alessandro a5a586224e card-report-timeline 2019-01-24 17:48:12 +01:00
Alessandro 977949aed3 card-report-production, events, machinestatus 2019-01-24 16:04:15 +01:00
Nicola Carminati 7ff9364531 Fix Translations 2019-01-24 14:43:40 +01:00
Nicola Carminati 39bf408b2d Added message when try to change app in pending mode 2019-01-24 14:32:27 +01:00
Nicola Carminati 95f278ba0b Fix M155 Command 2019-01-24 11:35:04 +01:00
Paolo Possanzini 2dfc725dcc fix modale 2019-01-24 10:22:07 +01:00
Alessandro 5c59642da2 fix 2019-01-24 09:37:31 +01:00
Nicola Carminati eea7fb2403 Merge remote-tracking branch 'origin/develop' into M155_Window 2019-01-24 08:44:58 +01:00
Nicola Carminati 000cad3884 First Commit of M155 2019-01-23 17:57:14 +01:00
Alessandro bd35d6467e more card-report events alarms machine status 2019-01-23 17:02:26 +01:00
Lucio Maranta 50b6e65f90 Fix 2019-01-23 16:59:09 +01:00
Alessandro d00cc5efc1 fix modal-report-select-column 2019-01-23 15:11:28 +01:00
Alessandro 9ef6d77ab8 card-report-production 2019-01-23 11:39:12 +01:00
Alessandro 9c6b79d18e start refactoring 2019-01-23 10:30:51 +01:00
Nicola Carminati 16d4ab959a Fix tool manager Modal call 2019-01-23 09:39:02 +01:00
Alessandro 11abeb96c8 fix 2019-01-23 09:04:11 +01:00
Nicola Carminati 76ed13b91a Fix Route SCADA & removed "Old style" Loader 2019-01-23 08:26:32 +01:00
Paolo Possanzini 38c303633c Merge branch 'feature/scada-ui' into develop 2019-01-22 17:35:26 +01:00
Paolo Possanzini 5432014a17 fix rendering scada 2019-01-22 17:34:57 +01:00
Paolo Possanzini 4581e07a12 fix scada 2019-01-22 16:38:44 +01:00
Nicola Carminati ac180398ce Changed Softkey Blk/Blk Behaviour in Osai 2019-01-22 16:25:01 +01:00
Paolo Possanzini cd82ed78f0 fix allarmi 2019-01-22 15:41:41 +01:00
Paolo Possanzini 7bdd326a00 Merge remote-tracking branch 'origin/develop' into feature/scada-ui 2019-01-22 13:06:10 +01:00
Alessandro 5f3c1f8688 fix alarms 2019-01-22 13:03:40 +01:00
Paolo Possanzini e9bbe1410d fix scada rendering 2019-01-22 13:01:54 +01:00
Nicola Carminati dbbbecd2e5 Fix Tool manager Siemens 2019-01-22 13:00:00 +01:00
Paolo Possanzini ef81835936 Merge branch 'develop' into feature/scada-ui 2019-01-22 11:33:36 +01:00
Nicola Carminati 303ea4df9d Merge branch 'magazine_size' into develop 2019-01-21 16:20:30 +01:00
Nicola Carminati 1fb2250235 Fix tool Siemens Things 2019-01-21 16:16:56 +01:00
Nicola Carminati cebf58ee38 Changed Tool Names 2019-01-21 12:25:43 +01:00
Paolo Possanzini d5ed1c954f fix 2019-01-21 12:20:29 +01:00
Alessandro 33b3ea3914 Merge remote-tracking branch 'origin/feature/scada-ui' into feature/scada-ui 2019-01-21 11:19:05 +01:00
Alessandro 73115f802d production scada 2019-01-21 11:18:48 +01:00
Paolo Possanzini 7b2367e1e8 Merge branch 'develop' into feature/scada-ui 2019-01-21 09:55:37 +01:00
Alessandro 6c2ff47726 labels e progress 2019-01-21 09:37:59 +01:00
Paolo Possanzini 5e7735dcb4 layout 2019-01-18 17:40:02 +01:00
Nicola Carminati 14c829b17d First Commit of Magazine position SIze 2019-01-18 17:20:57 +01:00
Alessandro 6d25dcc55e fix 2019-01-18 17:10:27 +01:00
Paolo Possanzini 72ec4feab4 Merge remote-tracking branch 'origin/develop' into feature/scada-ui 2019-01-18 16:41:04 +01:00
Paolo Possanzini 732a4a7daa ui 2019-01-18 16:40:29 +01:00
Alessandro fa056ef6d2 Merge remote-tracking branch 'origin/develop' into develop 2019-01-18 16:33:50 +01:00
Alessandro 6152a564ba Merge branch 'feature/report_ui_table' into develop 2019-01-18 16:33:15 +01:00
Alessandro 9ab9624fb6 fix 2019-01-18 16:31:37 +01:00
Paolo Possanzini ea84a2d3f1 scada services 2019-01-18 16:18:31 +01:00
Alessandro 2fd52e9890 machine status ui 2019-01-18 16:10:35 +01:00
Alessandro 75956d9a90 select timeline ui 2019-01-18 15:56:15 +01:00
Alessandro 4ee6171db2 timeline ui 2019-01-18 15:28:29 +01:00
Paolo Possanzini b0bfc632a8 scada store 2019-01-18 14:30:05 +01:00