Egalware/cms_thermo_active
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,980 Commits 24 Branches 19 Tags
807e225de8aace7cf528fb94de08e88568dd86cd
Commit Graph

167 Commits

Author SHA1 Message Date
Samuele Locatelli ed8f87c6d3 Pretty bin for active client! 2020-06-22 13:19:01 +02:00
Samuele Locatelli 5b2841c01b Executed code-cleanup on solution 2020-06-19 19:28:07 +02:00
Samuele Locatelli ed74fb9b37 Fix compilation path for client 2020-06-17 16:58:16 +02:00
Samuele Locatelli e65ba32e09 Start integration for S7Net NC 2020-05-18 17:25:56 +02:00
Lucio Maranta 3199ad99d5 Fix password maintenances 
Added new machine number config field
 2020-02-24 16:42:47 +01:00
Nicola Carminati 61987e4e20 Merge branch 'feature/NewContacts' into develop 
# Conflicts:
#	Libs/CMS_CORE_Library.dll
#	Step.Utils/languages/IT.xml
#	Step.Utils/languages/de.xml
#	Step.Utils/languages/el.xml
#	Step.Utils/languages/en.xml
#	Step.Utils/languages/fr.xml
#	Step.Utils/languages/hr.xml
#	Step.Utils/languages/nl.xml
#	Step.Utils/languages/pl.xml
#	Step.Utils/languages/ro.xml
#	Step.Utils/languages/ru.xml
#	Step/wwwroot/assets/styles/style.css
 2019-12-10 09:26:52 +01:00
Nicola Carminati 50bae02c63 Fix Client Behaviour 2019-11-27 16:37:59 +01:00
Nicola Carminati 1114f238a3 Fix Show-Prod window in Client 2019-11-25 09:45:24 +01:00
Lucio Maranta 8e92a1277d Fix client timeout exception when searching networks 2019-11-06 12:35:39 +01:00
Lucio Maranta a8fe58dac6 Open external browser 2019-10-21 16:46:47 +02:00
Lucio Maranta 4ca49051be Fix tool validation 
Added Languages
 2019-10-07 09:45:10 +02:00
Lucio Maranta 256536df2f Fix siemens assisted tooling 
Fix client show task bar
 2019-10-02 16:52:37 +02:00
Lucio Maranta e98c082629 Fix 2019-09-17 16:17:39 +02:00
Lucio Maranta 25a0d10d98 Fix integrated file edito 
Refactor file names in constants
Fix fanuc upload images
 2019-09-03 16:25:08 +02:00
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
Lucio Maranta 8240fa9c0e WIP 2019-08-27 17:02:53 +02:00
Lucio Maranta 04c710d1d4 Added ask-confirm layer on file manager 2019-08-27 10:28:38 +02:00
Lucio Maranta a0b2efba38 WIP last uploaded files 
And refactor
 2019-08-26 17:01:00 +02:00
Lucio Maranta af3eabbbc2 Fix reload page on file editor 2019-08-22 12:44:37 +02:00
Lucio Maranta f708b43cc0 Refactor 2019-08-21 15:59:16 +02:00
Lucio Maranta a216bff621 Added reload file after changes 
Fix modal style & translations
 2019-08-21 15:06:38 +02:00
Lucio Maranta fd9e08a0d2 WIP file editor 2019-08-20 16:40:15 +02:00
Lucio Maranta 0524cade83 Fix siemens blank screen bug 
& fix siemens startup icon
 2019-07-30 10:46:53 +02:00
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
Lucio Maranta 4624c47f32 Fix external program opening 2019-07-09 10:18:47 +02:00
Lucio Maranta c7ac5de54e WIP custom main program 2019-06-18 15:43:45 +02:00
Nicola Carminati dde6f68123 Revert "First Commit (not clean, only for test)" 
This reverts commit 931f595f3e.
 2019-05-20 16:28:54 +02:00
Nicola Carminati 931f595f3e First Commit (not clean, only for test) 2019-05-20 11:38:54 +02:00
Nicola Carminati c2e8df0c09 Fix NC Window behaviour 2019-05-17 14:27:39 +02:00
Nicola Carminati 43b3d87ad6 Changed Client manager on Server 2019-05-17 09:33:53 +02:00
Nicola Carminati 1b377d0e36 Fix Osai Window Behaviour 2019-05-17 07:59:13 +02:00
Nicola Carminati 31dad61b1b Fix error in NC Window 2019-05-15 16:16:07 +02:00
Nicola Carminati 9335942679 First commit 2019-05-14 15:09:36 +02:00
Nicola Carminati b443bdc44a RollBack MetroFramework 2019-05-14 15:07:56 +02:00
Lucio Maranta 3a386849a3 Fix scada 
WIP upload tool from NC
 2019-05-13 17:19:14 +02:00
Nicola Carminati de19d41987 Filtered Path when select files in OSAI. Nc mapped drive can't be loaded 2019-05-09 11:38:01 +02:00
Nicola Carminati b8748c81fd Fix UI for Marcolin 2019-05-08 08:26:51 +02:00
Nicola Carminati 796f674dce fix other problems 2019-05-05 21:38:42 +02:00
Nicola Carminati 690eb0e4e8 FIx Marcolin Problems 2019-05-04 20:07:54 +02:00
Nicola Carminati 3b638be6db Fix Maestro Acive Logo CNC 2019-05-02 07:43:40 +02:00
Nicola Carminati 35573b2bf8 Fix INP in OSAI 2019-04-30 09:24:05 +02:00
Nicola Carminati 05aab2600f Fix Client exception when "showNcHMI" option is False 2019-04-17 18:51:23 +02:00
Nicola Carminati 86f85b051b Added close method SignalR 2019-04-17 15:24:04 +02:00
Nicola Carminati 22d5da7790 Lauch client on CNC Connected 2019-04-17 11:17:20 +02:00
Nicola Carminati 330cfb68a1 Fix Client stuffs 2019-04-16 16:32:25 +02:00
Nicola Carminati eb98081712 Added close server when close client if the option "autoOpenCmsClient" in server is TRUE 2019-04-11 11:46:19 +02:00
Lucio Maranta 8d6c1fd39a Fix project options & setup 2019-04-10 17:22:55 +02:00
Nicola Carminati 22c1410a29 Added multiple upload PP 2019-04-09 15:50:36 +02:00
Nicola Carminati ab9bfd3602 Self adaptive Path Step 2019-04-08 17:36:56 +02:00
Nicola Carminati eab983d469 Fix SCM/CSM UI 2019-04-05 12:04:27 +02:00