Egalware/cms_thermo_active
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,297 Commits 24 Branches 19 Tags
develop
Commit Graph

186 Commits

Author SHA1 Message Date
Nicola 17100d2f93 Merge remote-tracking branch 'origin/Thermocamera' into develop 2020-10-23 16:31:24 +02:00
Nicola 5eb07dfaa4 Changed Client library 2020-10-23 16:23:59 +02:00
Samuele Locatelli 215452a92f Update 4.6.2 COMPILA!!! 2020-10-20 13:01:49 +02:00
Samuele E. Locatelli 5f1ca0699a Fixes 2020-10-16 11:05:23 +02:00
Samuele E. Locatelli c959946e1d Fix SSL connections 2020-10-02 09:04:24 +02:00
Samuele E. Locatelli 515c4d14b9 commit altra modifica Nicola... 2020-09-29 17:40:47 +02:00
Samuele E. Locatelli 0ea0fbd8d4 fix client problems and slider behaviour 2020-09-28 09:16:54 +02:00
Samuele E. Locatelli 287e5d1ab8 Fix client 2020-09-24 17:06:44 +02:00
Samuele E. Locatelli 816d49a08c pulizia doppia gestione eccezione 2020-09-24 08:49:17 +02:00
Samuele E. Locatelli 3aae8b0f9b added "duplicate recipe" and changed warmers color 2020-09-21 17:08:01 +02:00
Samuele E. Locatelli 1753027afd fixes on Recipe 2020-09-20 16:18:26 +02:00
Samuele E. Locatelli 0e41eb6033 fix apth x browser locale JS 2020-09-18 16:57:13 +02:00
NICOLA CARMINATI 014f63bd2b Added folder / file Manager to the Client 2020-09-09 18:03:56 +02:00
NICOLA CARMINATI 12ee118e72 Fix OnScreenKeyboard Option 2020-09-08 18:08:02 +02:00
NICOLA CARMINATI 4f863b71f0 Added file-info .RCP 2020-07-22 18:18:58 +02:00
NICOLA CARMINATI b893a9f2e0 Fix delete cache-folder on startup 2020-07-22 16:53:09 +02:00
Samuele Locatelli 06755f69a0 modifications for file type selection 2020-07-09 10:46:34 +02:00
Samuele Locatelli 0ea2c1dc54 fix client output path 2020-07-06 13:02:50 +02:00
NICOLA CARMINATI 81913ea1c4 Updated Chromium to V77 2020-07-06 09:41:57 +02:00
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