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

..

Controllers

Fix alarm note/file foreign keys and query

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

docs

Added Bearer oAuth Authentication:

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

Migrations

Fix alarm note/file foreign keys and query

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

Properties

Added Bearer oAuth Authentication:

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

App.config

Added macros API

2018-09-20 13:03:02 +02:00

DatabaseContext.cs

First commit

2018-12-18 17:40:58 +01:00

packages.config

Added Bearer oAuth Authentication:

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

Step.Database.csproj

Fix alarm note/file foreign keys and query

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