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

..

LoadingForm.cs

Added client SCM/CMS options

2019-04-04 18:33:44 +02:00

LoadingForm.Designer.cs

Fix Maestro Acive Logo CNC

2019-05-02 07:43:40 +02:00

LoadingForm.resx

Fix SCM/CSM UI

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

MainForm.cs

Revert "First Commit (not clean, only for test)"

2019-05-20 16:28:54 +02:00

MainForm.Designer.cs

Changed Client manager on Server

2019-05-17 09:33:53 +02:00

MainForm.resx

Fix SCM/CSM UI

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

NcForm.cs

Added client SCM/CMS options

2019-04-04 18:33:44 +02:00

NcForm.Designer.cs

Added client SCM/CMS options

2019-04-04 18:33:44 +02:00

NcForm.resx

Client Revert Commit - Solution is not working

2018-06-27 12:10:50 +02:00

NcWindow.cs

Merge branch 'develop' into integratedFileEditor

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

OpeningForm.cs

Added close server when close client if the option "autoOpenCmsClient" in server is TRUE

2019-04-11 11:46:19 +02:00

OpeningForm.Designer.cs

Added client SCM/CMS options

2019-04-04 18:33:44 +02:00

OpeningForm.resx

Fix SCM/CSM UI

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

ProdForm.cs

Added client SCM/CMS options

2019-04-04 18:33:44 +02:00

ProdForm.Designer.cs

Added client SCM/CMS options

2019-04-04 18:33:44 +02:00

ProdForm.resx

First commit

2019-03-21 17:52:55 +01:00