Commit Graph

1085 Commits

Author SHA1 Message Date
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
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
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
Alessandro d1a3207c97 detail filter ui 2019-01-18 10:44:35 +01:00
Alessandro a3be062238 table 2019-01-17 17:29:21 +01:00
Nicola Carminati 5a40b84862 Added Position SIze check during load tools 2019-01-17 17:13:59 +01:00
Nicola Carminati 7e7f0ee6c4 Fix "Edit" button behaviour in Tooling-Equipment 2019-01-17 15:01:39 +01:00
Alessandro fb21037a79 calendar 2019-01-17 11:48:50 +01:00
Alessandro 2cfeab53c1 ui modals report 2019-01-17 10:07:30 +01:00
Alessandro 5229ca1798 ui modals report 2019-01-16 16:50:52 +01:00
Alessandro 155f037bbd ui report 2019-01-16 13:54:07 +01:00
Alessandro 4a6149bbb4 ui report 2019-01-16 11:17:36 +01:00
Lucio Maranta 58fefd3823 Minor fix siemens 2019-01-15 16:34:42 +01:00
Alessandro c85b8df4d9 Merge branch 'feature/pagination_alarms' into develop 2019-01-15 12:54:10 +01:00
Alessandro 2e36c7ccad fix scada 2019-01-15 12:37:43 +01:00
Alessandro a255f70da7 ui page 2019-01-15 11:10:48 +01:00
Alessandro 2998a7851a alarm history 2019-01-15 08:53:06 +01:00
Alessandro 72f450c6b3 Auto stash before merge of "develop" and "origin/develop" 2019-01-14 18:24:13 +01:00
Alessandro 627f5e8bcc alarms history 2019-01-14 15:30:26 +01:00
Nicola Carminati 4b02a41b59 Added confirm-box on perform maintenance actions & fix translation Bug 2019-01-11 11:50:40 +01:00
Alessandro Francia 0f556e83d0 alarms history source 2019-01-10 10:39:38 +01:00
Alessandro Francia dd90f15b87 alarms history 2019-01-09 12:46:59 +01:00
Alessandro Francia 3734d2a2be alarm history 2019-01-09 08:33:29 +01:00
Alessandro Francia 1cde27028a Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2019-01-07 12:15:49 +01:00
Alessandro Francia e62d8997ae alarm note 2019-01-07 12:13:56 +01:00
Paolo Possanzini c9ac6f55d1 fix filters 2019-01-07 11:31:08 +01:00
Alessandro Francia ceeb22f7f4 alarms 2019-01-07 09:47:06 +01:00
Paolo Possanzini ecdf8479fa fix notes 2019-01-04 12:03:17 +01:00
Paolo Possanzini 0e406f6982 debugger note 2019-01-04 10:02:18 +01:00
Paolo Possanzini d7ae5eb5b5 apertura allegati 2019-01-03 16:01:47 +01:00
Paolo Possanzini 805dc416f0 cancellazione allegati allarmi 2019-01-03 15:53:41 +01:00
Paolo Possanzini c6c3be7688 fix layout upload image 2019-01-03 11:41:19 +01:00
Paolo Possanzini abea2525fc Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2019-01-03 09:47:26 +01:00
Paolo Possanzini 8fff050126 alarms 2019-01-03 09:47:19 +01:00
Nicola Carminati d77f8b2fae Fix ToolManager Modals 2018-12-27 16:26:53 +01:00
Nicola Carminati 120dc3e343 Added zoom-image on working file-image & maintenance-attachments 2018-12-27 16:26:20 +01:00
Nicola Carminati f8a3faf47e Fix last commit 2018-12-19 17:51:25 +01:00
Nicola Carminati 43ce78d2b1 Added author for performed maintenances 2018-12-19 17:46:02 +01:00