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

..

App_Start

Fix scada folder

2019-06-19 16:35:31 +02:00

Attributes

Fix tool table

2019-05-22 17:33:01 +02:00

Controllers

Merge branch 'develop' into integratedFileEditor

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

Desktop_Link

Added Adaptive Step Controller

2019-04-05 17:21:33 +02:00

Listeners

Added mounted tool data

2019-05-08 17:23:47 +02:00

Properties

1.2 VERSION

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

Provider

Fix signalR auth

2019-05-17 13:04:43 +02:00

Utility

Fix alarm tables

2019-05-24 13:08:07 +02:00

wwwroot

Merge branch 'develop' into integratedFileEditor

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

ACTIVE_ICONA.ico

Fix SCM/CSM UI

2019-04-05 12:04:27 +02:00

App.config

Added import-export tool table

2019-03-28 13:03:35 +01:00

App.Debug.config

Self Hosting con Windows di avvio e controllo del server su systray

2017-11-21 16:39:22 +01:00

app.manifest

Fix SCM/CSM UI

2019-04-05 12:04:27 +02:00

App.Release.config

Self Hosting con Windows di avvio e controllo del server su systray

2017-11-21 16:39:22 +01:00

CMS_Icon.ico

Fix Application Icons & Names

2018-10-31 17:00:46 +01:00

MultipartHandler.cs

WP10

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

packages.config

Fix scada

2019-05-13 17:19:14 +02:00

program.cs

Fix scada folder

2019-06-19 16:35:31 +02:00

SetupActive.iss

Fix - removed focus from inputs after enter button press

2019-07-08 16:37:48 +02:00

Step.csproj

WIP custom main program

2019-06-18 15:43:45 +02:00

Step.csproj.user

Fix project options & setup

2019-04-10 17:22:55 +02:00

WebApiUnhandledExceptionHandler.cs

added maintainer data to closed maintenances

2018-12-17 16:11:46 +01:00