Lucio Maranta bbd4535dbf Merge branch 'feature/Osai_ToolTable' into develop ...

# Conflicts:
#	Libs/CMS_CORE_Library.dll
#	Step.Core/ThreadsFunctions.cs
#	Step.Core/ThreadsHandler.cs
#	Step.Database/DatabaseContext.cs
#	Step.Database/Migrations/201806220920193_InitMigration.Designer.cs
#	Step.Database/Migrations/201806220920193_InitMigration.cs
#	Step.Database/Migrations/201807120908403_InitMigration.Designer.cs
#	Step.Database/Migrations/201807120908403_InitMigration.cs
#	Step.Database/Migrations/201807120908403_InitMigration.resx
#	Step.Database/Migrations/201807251330036_InitMigration.Designer.cs
#	Step.Database/Migrations/201807251330036_InitMigration.cs
#	Step.Database/Step.Database.csproj
#	Step.Model/Constants.cs
#	Step.NC/NcHandler.cs
#	Step/Listeners/ListenersHandler.cs
#	Step/Step.csproj

2018-08-03 12:59:14 +02:00

..

Controllers

Merge branch 'feature/Osai_ToolTable' into develop

2018-08-03 12:59:14 +02:00

docs

Added Bearer oAuth Authentication:

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

Migrations

Merge branch 'feature/Osai_ToolTable' into develop

2018-08-03 12:59:14 +02:00

Properties

Added Bearer oAuth Authentication:

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

App.config

* Added Logger and Exception manager

2017-12-05 17:21:10 +01:00

DatabaseContext.cs

Merge branch 'feature/Osai_ToolTable' into develop

2018-08-03 12:59:14 +02:00

packages.config

Added Bearer oAuth Authentication:

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

Step.Database.csproj

Added 8 bit status

2018-07-25 17:47:33 +02:00