Lucio Maranta 29c4747785 Merge branch 'feature/Remove_autoinc_from_db' into develop ...

# Conflicts:
#	Step.Database/Migrations/201809181022557_InitMigration.Designer.cs
#	Step.Database/Migrations/201809181022557_InitMigration.cs
#	Step.Database/Migrations/201810041521424_InitMigration.Designer.cs
#	Step.Database/Migrations/201810041521424_InitMigration.cs
#	Step.Database/Migrations/201810100646276_InitMigration.Designer.cs
#	Step.Database/Migrations/201810100646276_InitMigration.cs
#	Step.Database/Step.Database.csproj
WIP Alarm

2018-10-16 16:57:46 +02:00

..

AlarmsController.cs

Merge branch 'feature/Remove_autoinc_from_db' into develop

2018-10-16 16:57:46 +02:00

FunctionsAccessController.cs

Library refactor, divided model by type

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

MachinesController.cs

Fix Nc Data API

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

MachinesUsersController.cs

Added:

2018-06-19 11:13:48 +02:00

MaintenancesController.cs

Fix siemens path

2018-10-04 17:30:47 +02:00

NcToolManagerController.cs

WIP removed autoincrement

2018-09-25 15:27:58 +02:00

QueueController.cs

Added magazines names, auto open cms client...

2018-09-24 15:28:19 +02:00

SessionsController.cs

Merge branch 'feature/Remove_autoinc_from_db' into develop

2018-10-16 16:57:46 +02:00

UsersController.cs

WIP alarms storaging

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

UserSoftkeysController.cs

Fix merge

2018-08-03 13:16:07 +02:00