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

..

ConfigModels

Fix last commit

2018-12-28 15:36:17 +01:00

DatabaseModels

Fix alarm note/file foreign keys and query

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

DTOModels

Merge branch 'feature/Scada' into develop

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

Properties

Primo commit

2017-11-15 17:36:25 +01:00

App.config

Added Bearer oAuth Authentication:

2017-11-23 16:31:30 +01:00

Constants.cs

Merge branch 'feature/Scada' into develop

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

packages.config

Added Bearer oAuth Authentication:

2017-11-23 16:31:30 +01:00

Step.Model.csproj

Merge branch 'feature/Scada' into develop

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

Step.Model.csproj.user

heads

2018-03-21 16:19:00 +01:00