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

# Conflicts:
#	Libs/CMS_CORE_Library.dll
#	Step.Utils/languages/IT.xml
#	Step.Utils/languages/de.xml
#	Step.Utils/languages/en.xml
#	Step.Utils/languages/fr.xml
#	Step.Utils/languages/hr.xml
#	Step.Utils/languages/ro.xml

2019-08-28 14:29:51 +02:00

..

ApiAlarmController.cs

VERSION 1.2.1

2019-07-22 16:53:38 +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 file editor

2019-08-20 16:40:15 +02:00

FavoriteUserSoftKeyController.cs

Fix null reference

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

LanguageController.cs

FIx available language &

2019-08-19 16:44:14 +02:00

NcApiController.cs

VERSION 1.2.1

2019-07-22 16:53:38 +02:00

NcFileController.cs

WIP last uploaded files

2019-08-26 17:01:00 +02:00

NcToolManagerController.cs

WIP tool mounted in spindle data

2019-07-26 13:01:33 +02:00

ReportController.cs

Fix timeline date

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

ScadaController.cs

Added feed overrides

2019-07-23 15:54:51 +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