Lucio Maranta 724ac2afb8 Merge branch 'feature/Scada' into develop ...

# Conflicts:
#	Client.Utils/Constants.cs
#	Client/View/NcWindow.cs
#	Libs/CMS_CORE_Library.dll
#	Step.Config/Config/serverConfig.xml
#	Step.Core/ThreadsFunctions.cs
#	Step.Model/Constants.cs
#	Step.Model/DTOModels/AlarmModels/DTOAlarmHistoricModel.cs
#	Step.Model/DatabaseModels/NcMagazinePositionModel.cs
#	Step.Model/Step.Model.csproj

2019-01-15 16:58:18 +01:00

..

ApiAlarmController.cs

Fix alarm note/file foreign keys and query

2019-01-14 14:57:30 +01:00

ApiMaintenanceController.cs

Added maintener in perform API

2019-01-11 11:48:10 +01:00

AuthorizationController.cs

Fix Nc Data API

2018-06-06 16:23:36 +02:00

ConfigurationController.cs

Added alarm notes

2018-10-23 17:33:00 +02:00

FavoriteUserSoftKeyController.cs

Fanuc TT

2018-11-21 17:26:58 +01:00

LanguageController.cs

Fix translations on plc messages

2019-01-11 11:09:17 +01:00

NcApiController.cs

Library refactor, divided model by type

2018-09-27 17:30:37 +02:00

NcFileController.cs

Fix Siemens active file

2018-11-07 17:27:44 +01:00

NcToolManagerController.cs

Fix siemens library

2018-12-04 16:51:12 +01:00

ScadaController.cs

WIP Scada

2019-01-14 11:30:53 +01:00

SiemensToolManagerController.cs

Library refactor, divided model by type

2018-09-27 17:30:37 +02:00

UserController.cs

WIP alarms storaging

2018-10-09 17:29:06 +02:00