Commit Graph

2980 Commits

Author SHA1 Message Date
Lucio Maranta 7ed87452a4 Fix ACTIVE error management
Fix tool table cancel buttons
Removed deleted button in edit
2019-03-26 17:01:29 +01:00
Nicola Carminati 463e24a2d2 Fix Window Behaviour 2019-03-26 15:44:26 +01:00
Lucio Maranta 3573c95f1a Merge branch 'Prod_Window_Integrated' into develop 2019-03-26 14:48:50 +01:00
Nicola Carminati 3286f4963a Fix OSAI Window behaviour 2019-03-26 12:40:24 +01:00
Lucio Maranta 4d80694ee1 Refactoring NcHandler.cs in multiple classes
Fix tool table block
2019-03-25 17:02:33 +01:00
Giacomo Canonico 2b5ec22f94 Auto stash before merge of "develop" and "origin/develop" 2019-03-25 11:30:09 +01:00
Lucio Maranta 081bbee48d Fix 2019-03-25 11:24:46 +01:00
Nicola Carminati c519d82f1b Added configurations 2019-03-22 16:57:38 +01:00
Nicola Carminati 461a083ded Fix Window Behaviour 2019-03-22 14:40:41 +01:00
Nicola Carminati a511203552 Merge remote-tracking branch 'origin/develop' into Prod_Window_Integrated 2019-03-22 14:16:01 +01:00
Lucio Maranta 3eba8f1ab7 Fix Osai
Added images management to scada
2019-03-22 12:47:21 +01:00
Nicola Carminati 03e953bbf1 First commit 2019-03-21 17:52:55 +01:00
Nicola Carminati 7ae6237248 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2019-03-21 12:43:21 +01:00
Nicola Carminati 5fe808dfdb Fix Radius/Diameter configuration 2019-03-21 12:42:26 +01:00
Lucio Maranta 63ecfc2820 Fix alarms user
Loadin magazine
2019-03-21 11:28:37 +01:00
Lucio Maranta f34220a59a Added new field in tooltableconfig 2019-03-21 11:04:40 +01:00
Nicola Carminati a2aa8630f6 Merge branch 'User_Manager' into develop 2019-03-20 17:05:04 +01:00
Nicola Carminati 20d6297c28 Fix password change 2019-03-20 17:01:29 +01:00
Lucio Maranta 0ed9ef5fde fix magazine translations 2019-03-20 17:00:45 +01:00
Lucio Maranta 4892340a26 Assistedtooling fix
Fix siemens tool table
Added dynamic tool in spindle
2019-03-20 16:56:10 +01:00
Nicola Carminati 647ed68bad Fix last commit 2019-03-20 16:42:48 +01:00
Nicola Carminati e499ea7ada Merge remote-tracking branch 'origin/develop' into User_Manager 2019-03-20 16:37:30 +01:00
Lucio Maranta d05fe23a25 Fix osai 2019-03-20 16:36:22 +01:00
Nicola Carminati ea4420dff7 Merge branch 'develop' into User_Manager 2019-03-20 16:28:19 +01:00
Nicola Carminati 023b688c43 Added info on selected process 2019-03-20 16:22:59 +01:00
Lucio Maranta a29d5b0755 Fix osai lib 2019-03-20 16:20:08 +01:00
Nicola Carminati ec020e4b8e added "change password" feature 2019-03-20 15:41:00 +01:00
Nicola Carminati 5ad4f7f909 Fix reading U.measure of selected process 2019-03-20 15:39:45 +01:00
Nicola Carminati 9a9c7e0982 Rollback token reading 2019-03-20 08:37:41 +01:00
Nicola Carminati d6cea4d302 Export of Alarm History 2019-03-19 18:12:34 +01:00
Lucio Maranta cd817220d7 Fix 2019-03-19 17:19:55 +01:00
Lucio Maranta 5e25896c32 WIP Assisted tooling 2019-03-19 17:14:42 +01:00
Nicola Carminati ac66236eaa Fixing: Loading images, translations, alarm source 2019-03-19 11:18:34 +01:00
Nicola Carminati 3dae3fdbac First commit of alarm-history translation 2019-03-18 18:46:51 +01:00
Nicola Carminati 8ff5769e3b Fix users translations 2019-03-18 18:28:38 +01:00
Nicola Carminati 13f5932754 Added configuration 2019-03-18 18:03:52 +01:00
Nicola Carminati e96010e8e6 Added functionality to User Manager 2019-03-18 17:18:16 +01:00
Lucio Maranta 8183e30a69 Added rotation type into heads
WIP Assisted tooling
2019-03-18 16:53:22 +01:00
Nicola Carminati 3225276560 Merge branch 'develop' into User_Manager 2019-03-17 17:09:21 +01:00
Giacomo Canonico ba72e68a6a Merge branch 'feature/grafici_wp10' into develop 2019-03-15 16:24:20 +01:00
Giacomo Canonico 2fad484fc1 Merge remote-tracking branch 'origin/feature/grafici_wp10' into feature/grafici_wp10 2019-03-15 16:21:55 +01:00
Giacomo Canonico 4ebe8f0828 last update to align the graphic to zeplin 2019-03-15 16:21:49 +01:00
Alessandro 402311c02e fix 2019-03-15 16:17:36 +01:00
Alessandro dc58c0db55 Merge remote-tracking branch 'origin/feature/grafici_wp10' into feature/grafici_wp10 2019-03-15 15:23:17 +01:00
Alessandro b1db51e154 fix machine status 2019-03-15 15:22:50 +01:00
Giacomo Canonico 412d3efc85 chart improve 2019-03-15 15:12:20 +01:00
Lucio Maranta 436c9efb21 FIX assisted tooling
Fix maintenances
2019-03-15 12:49:18 +01:00
Giacomo Canonico 72c66e5d48 Merge remote-tracking branch 'origin/feature/grafici_wp10' into feature/grafici_wp10 2019-03-15 11:54:45 +01:00
Giacomo Canonico 94c41553d1 timeline tooltip 2019-03-15 11:54:42 +01:00
Alessandro e0ff30fc44 style tooltip production 2019-03-15 10:44:17 +01:00