Lucio Maranta bb35d1cbc1 Merge branch 'develop' into integratedFileEditor ...

# Conflicts:
#	Client/Browser_Tools/BrowserJSObject.cs
#	Step/Controllers/WebApi/NcFileController.cs

2019-07-09 11:07:32 +02:00

..

ApiAlarmController.cs

Fix production scada

2019-06-29 16:10:42 +02:00

ApiMaintenanceController.cs

1.2 VERSION

2019-07-01 17:38:33 +02:00

AuthorizationController.cs

Fix null reference

2019-05-06 17:11:09 +02:00

ConfigurationController.cs

WIP MGI Fanuc

2019-06-06 12:45:50 +02:00

FavoriteUserSoftKeyController.cs

Fix null reference

2019-05-06 17:11:09 +02:00

LanguageController.cs

Fix translations on plc messages

2019-01-11 11:09:17 +01:00

NcApiController.cs

Library refactor, divided model by type

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

NcFileController.cs

Merge branch 'develop' into integratedFileEditor

2019-07-09 11:07:32 +02:00

NcToolManagerController.cs

Added realRadius & realLength

2019-06-04 17:15:58 +02:00

ReportController.cs

Fix timeline date

2019-03-12 09:56:58 +01:00

ScadaController.cs

Added realRadius & realLength

2019-06-04 17:15:58 +02:00

SiemensToolManagerController.cs

Refactoring NcHandler.cs in multiple classes

2019-03-25 17:02:33 +01:00

UserController.cs

Fix new login modal blur

2019-06-17 11:19:28 +02:00