Commit Graph

8 Commits

Author SHA1 Message Date
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
Lucio Maranta c3bc730982 Fix tool manager Osai update functions
Fix UI
2018-08-01 16:54:54 +02:00
Lucio Maranta d7d61ae00e Added abrasiveIsActive in heads data 2018-07-05 17:22:46 +02:00
Lucio Maranta cf8b3035e4 Fix processes data models 2018-03-26 14:48:01 +02:00
Lucio Maranta e40d9cd64e Fix heads IDs
Fix head WJ
2018-03-26 10:41:40 +02:00
Lucio Maranta d8848e45f0 Fix waterjet heads
Added IsActive, IsSelected fields to heads model
2018-03-26 10:27:57 +02:00
Lucio Maranta d94bcff103 Added overrideEditable field into heads signalR push 2018-03-15 15:05:04 +01:00
Lucio Maranta b0b7659ada * Refactored configuration
* Added Selected process and select process action
* Added Heads signalR and configuration
2018-03-14 17:36:13 +01:00