Lucio Maranta 94361f9444 Merge branch 'develop' into feature/FixToolTable ...

# Conflicts:
#	Step.Model/Constants.cs

2019-03-07 12:38:49 +01:00

..

AlarmsController.cs

Fix alarm & added autodelete

2019-02-12 16:58:20 +01: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

WIP maintenances with password

2019-03-04 17:23:13 +01:00

MaintenancesController.cs

Added password to cms maintenances

2019-03-07 12:28:59 +01:00

NcToolManagerController.cs

Added new tool&family id management

2019-02-25 17:24:02 +01:00

QueueController.cs

Added magazines names, auto open cms client...

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

RedisController.cs

Fix M154 codes on SIEMENS

2019-02-26 14:01:42 +01:00

SessionsController.cs

WriteM155 response

2018-11-16 12:06:22 +01:00

UsersController.cs

Fix users

2019-02-20 17:02:29 +01:00

UserSoftkeysController.cs

Fix merge

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