Commit Graph

2315 Commits

Author SHA1 Message Date
Lucio Maranta fbe511ce3d Fix SCM config on installation 2020-02-07 16:15:00 +01:00
Lucio Maranta 98fe230a78 Added new logger
Fix thread time counters
2020-01-30 12:28:06 +01:00
Lucio Maranta 2251e63d67 Fix siemens scada input field 2020-01-28 16:38:55 +01:00
Lucio Maranta d9e9c60315 First implementation of watchdog 2020-01-27 16:20:32 +01:00
Lucio Maranta 95e87f2ceb Fix installation date 2020-01-22 15:08:44 +01:00
Lucio Maranta 0c390a1ae5 Fix toggle buttons 2020-01-17 12:14:55 +01:00
Lucio Maranta a92e375ad1 Definitive 1.4 Release 2020-01-07 12:51:44 +01:00
Lucio Maranta ce49f86af0 Fix project translations 2019-12-19 12:59:08 +01:00
Lucio Maranta 6174daf1a3 Fix translations 2019-12-19 12:47:05 +01:00
Lucio Maranta 8ef5bed22d Removed FileHash 2019-12-18 16:00:14 +01:00
Lucio Maranta ca6cc4524c 1.4_RELEASE 2019-12-18 11:37:03 +01:00
Lucio Maranta 10a99a5d18 1.4_RELEASE 2019-12-18 09:44:46 +01:00
Nicola Carminati 17c774fd6d Fix Css 2019-12-16 16:08:27 +01:00
Nicola Carminati d99fda458b Fix maintenance Machine 2019-12-16 14:55:59 +01:00
Lucio Maranta deba431b08 Fix cooling translations
Fix configurable tool types
2019-12-12 09:13:02 +01:00
Lucio Maranta 7f5b049f18 Merge remote-tracking branch 'origin/feature/Maintenance-Machine-Counter' into develop
# Conflicts:
#	Step.Utils/languages/IT.xml
#	Step.Utils/languages/da.xml
#	Step.Utils/languages/de.xml
#	Step.Utils/languages/el.xml
#	Step.Utils/languages/en.xml
#	Step.Utils/languages/fr.xml
#	Step.Utils/languages/hr.xml
#	Step.Utils/languages/nl.xml
#	Step.Utils/languages/pl.xml
#	Step.Utils/languages/pt.xml
#	Step.Utils/languages/ro.xml
#	Step.Utils/languages/ru.xml
#	Step.Utils/languages/sv.xml
2019-12-11 15:13:16 +01:00
Lucio Maranta ea8e2683cf Merge branch 'feature/IntegrityCheckField' into develop
# Conflicts:
#	Libs/CMS_CORE_Library.dll
#	Step.NC/SiemensToolTableAdapter.cs
2019-12-11 15:06:11 +01:00
Lucio Maranta 665c8cfa54 Added new tool configuration: customizable tools types 2019-12-10 16:32:44 +01:00
Nicola Carminati 61987e4e20 Merge branch 'feature/NewContacts' into develop
# Conflicts:
#	Libs/CMS_CORE_Library.dll
#	Step.Utils/languages/IT.xml
#	Step.Utils/languages/de.xml
#	Step.Utils/languages/el.xml
#	Step.Utils/languages/en.xml
#	Step.Utils/languages/fr.xml
#	Step.Utils/languages/hr.xml
#	Step.Utils/languages/nl.xml
#	Step.Utils/languages/pl.xml
#	Step.Utils/languages/ro.xml
#	Step.Utils/languages/ru.xml
#	Step/wwwroot/assets/styles/style.css
2019-12-10 09:26:52 +01:00
Nicola Carminati e890fa136b Added Scm version of the contacts window 2019-12-06 11:39:13 +01:00
Nicola Carminati c34e8c6c1b Fix translations 2019-12-03 14:48:03 +01:00
Lucio Maranta 024d32e5c9 Added integrity check field to tools data 2019-12-03 14:31:19 +01:00
Nicola Carminati b16a978588 Fix behaviour 2019-12-03 12:49:02 +01:00
Lucio Maranta ed259254ca Fix osai axes order 2019-12-03 09:24:08 +01:00
Nicola Carminati c20060f0a7 added features 2019-12-02 18:16:22 +01:00
Nicola Carminati 9d0bcc570f Added features 2019-11-29 16:18:16 +01:00
Nicola Carminati b7a1924c4b First commit 2019-11-27 17:59:05 +01:00
Nicola Carminati 9fd63c0eac Merge remote-tracking branch 'origin/feature/SiemensKeyboard' into develop 2019-11-27 16:40:27 +01:00
Nicola Carminati 50bae02c63 Fix Client Behaviour 2019-11-27 16:37:59 +01:00
Lucio Maranta 99aa075866 Removed axes container 2019-11-27 11:04:33 +01:00
Nicola Carminati 4c2a0c1c91 End of feature developing 2019-11-26 17:13:37 +01:00
Lucio Maranta dabedcff84 Fix isInUse siemens fields 2019-11-26 11:56:22 +01:00
Lucio Maranta 0f0d650e0c Added siemens keyboard option in serverConfig
Removed nc-softkey & changed under-the hood style if the option is active
2019-11-26 11:02:52 +01:00
Nicola Carminati 6083d372a8 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2019-11-25 09:46:18 +01:00
Nicola Carminati 1114f238a3 Fix Show-Prod window in Client 2019-11-25 09:45:24 +01:00
Lucio Maranta 8ad269ed6b Fix tool table fields error
Fix modal close button position
2019-11-21 09:38:54 +01:00
Lucio Maranta 13036ccaf3 Fix translations 2019-11-19 09:21:47 +01:00
Nicola Carminati 2cb9d3d8c4 Fix Time and modal error in Alarm detail 2019-11-18 16:34:25 +01:00
Lucio Maranta e8e25820e3 Removed refresh button on NC alarms 2019-11-13 11:11:19 +01:00
Nicola Carminati 11801125d3 Added features 2019-11-11 17:10:19 +01:00
Lucio Maranta b7ec116998 Added the condition on active restore in the alarm sorting method 2019-11-11 16:26:05 +01:00
Lucio Maranta 4c71ac3f95 Added new sort method for alarms -> restorable goes before
WIP restorable tag in alarms list
2019-11-11 14:38:01 +01:00
Lucio Maranta 8e92a1277d Fix client timeout exception when searching networks 2019-11-06 12:35:39 +01:00
Lucio Maranta b3b0b90f6e Fix user permisssions 2019-11-05 17:03:44 +01:00
Lucio Maranta 63c7d1276f Fix scada with data that flickers 2019-10-28 16:30:00 +01:00
Lucio Maranta 8f7e117c80 Fix contacts 2019-10-28 16:16:11 +01:00
Lucio Maranta 31453bbd99 Fix scada with data that flickers
Fix contact page
2019-10-25 12:12:52 +02:00
Lucio Maranta 787582958c Fix style & renamed contacts 2019-10-23 16:48:02 +02:00
Lucio Maranta da6687cff1 WIP 2019-10-21 16:47:17 +02:00
Lucio Maranta a8fe58dac6 Open external browser 2019-10-21 16:46:47 +02:00