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

129 Commits

Author SHA1 Message Date
Lucio Maranta d64a84c6b3 1.4.1 Release 2020-02-27 11:54:41 +01:00
Lucio Maranta 3199ad99d5 Fix password maintenances 
Added new machine number config field
 2020-02-24 16:42:47 +01:00
Lucio Maranta ea8e2683cf Merge branch 'feature/IntegrityCheckField' into develop 
# Conflicts:
#	Libs/CMS_CORE_Library.dll
#	Step.NC/SiemensToolTableAdapter.cs
 2019-12-11 15:06:11 +01:00
Lucio Maranta 665c8cfa54 Added new tool configuration: customizable tools types 2019-12-10 16:32:44 +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 e890fa136b Added Scm version of the contacts window 2019-12-06 11:39:13 +01:00
Lucio Maranta 024d32e5c9 Added integrity check field to tools data 2019-12-03 14:31:19 +01:00
Nicola Carminati 4c2a0c1c91 End of feature developing 2019-11-26 17:13:37 +01:00
Lucio Maranta 0f0d650e0c Added siemens keyboard option in serverConfig 
Removed nc-softkey & changed under-the hood style if the option is active
 2019-11-26 11:02:52 +01:00
Nicola Carminati 11801125d3 Added features 2019-11-11 17:10:19 +01:00
Lucio Maranta 787582958c Fix style & renamed contacts 2019-10-23 16:48:02 +02:00
Lucio Maranta dfea192cf2 First commit of NewContact 2019-10-18 12:10:32 +02:00
Lucio Maranta c2c58acca6 Added languages fix 
Hided CMS connect
Fix WINDOWS 10 problems
 2019-10-08 17:13:59 +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 7c2cb28a56 Merge remote-tracking branch 'origin/CmsConnectGateway' into develop 
# Conflicts:
#	Step.Model/ConfigModels/ServerConfigModel.cs
#	Step/Controllers/WebApi/ConfigurationController.cs
 2019-08-28 14:33:54 +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
Nicola Carminati eea1ecb6d2 Added Server CMSConnect Config 2019-08-22 10:41:57 +02:00
Lucio Maranta 4bf329caee Fix scada validator & scada in production 2019-08-22 10:34:17 +02:00
Lucio Maranta fd9e08a0d2 WIP file editor 2019-08-20 16:40:15 +02:00
Lucio Maranta e3cdd83fea Added scada multilanguage & label visibility management 
WIP tool data in production page
 2019-07-24 17:03:13 +02:00
Lucio Maranta 4624c47f32 Fix external program opening 2019-07-09 10:18:47 +02:00
Lucio Maranta 09be892704 Added: 
- Empty alarms table
- Change page after login if not authorized
Fix:
- Scada
- alarm export performance
 2019-06-24 17:20:14 +02:00
Lucio Maranta c7ac5de54e WIP custom main program 2019-06-18 15:43:45 +02:00
Lucio Maranta 7ce41d51bb WIP MGI Fanuc 
WIP Override & process data
Fix maintainer
 2019-06-06 12:45:50 +02:00
Lucio Maranta a93aaba321 Added maintenances contact 
Fix offsets
 2019-06-05 16:54:20 +02:00
Lucio Maranta 96d19f4779 Added realRadius & realLength 
Added .NET heidiSQL check on setup
Fix incremental softkey x10..
 2019-06-04 17:15:58 +02:00
Lucio Maranta deb89a4a34 added overstroke 2019-05-21 16:37:04 +02:00
Lucio Maranta 3a386849a3 Fix scada 
WIP upload tool from NC
 2019-05-13 17:19:14 +02:00
Nicola Carminati 240f27bb76 Fix Nullreference error on Opening window, adde SCADA validator 2019-05-10 17:23:57 +02:00
Nicola Carminati 05aab2600f Fix Client exception when "showNcHMI" option is False 2019-04-17 18:51:23 +02:00
Lucio Maranta 7fb8c632ae Moved external programs config into "serverConfig.xml" 2019-04-04 12:18:30 +02:00
Lucio Maranta 38b138942f Added config "FixedHead" 
FIx tool table
 2019-04-02 17:12:01 +02:00
Nicola Carminati c519d82f1b Added configurations 2019-03-22 16:57:38 +01:00
Nicola Carminati 5fe808dfdb Fix Radius/Diameter configuration 2019-03-21 12:42:26 +01:00
Nicola Carminati ea4420dff7 Merge branch 'develop' into User_Manager 2019-03-20 16:28:19 +01:00
Lucio Maranta 5e25896c32 WIP Assisted tooling 2019-03-19 17:14:42 +01:00
Nicola Carminati 13f5932754 Added configuration 2019-03-18 18:03:52 +01:00
Nicola Carminati 83f22592c8 Added Softkey "Visible" attribute + AutoIncrement Versioning 2019-03-07 16:39:09 +01:00
Lucio Maranta be9c0b6a2a Fix tool table 
Added installation date
Added W10 programs api
 2019-02-22 12:59:08 +01:00
Nicola Carminati c690f175f5 First commit CMS-Connect M154 2019-02-19 20:04:31 +01:00
Lucio Maranta 0ac7982c93 Fix tooltable & maintenances 2019-02-18 12:03:40 +01:00
Lucio Maranta ede0e5b926 Fix alarm & added autodelete 2019-02-12 16:58:20 +01:00
Nicola Carminati 2a41d03716 Fix Overstroke Softkey 2019-02-12 11:07:19 +01:00
Lucio Maranta a0be095759 Fix alarm history 2019-02-08 16:41:25 +01:00
Lucio Maranta 6d22f38b77 WP10 
General data
Pie chart
TimeLine chart
 2019-02-01 13:02:33 +01:00
Nicola Carminati a599447922 Fix ServerConfig Read 2019-01-31 15:51:42 +01:00
Lucio Maranta 9242987d76 Fix scada 
WIP M154
 2019-01-31 13:24:49 +01:00
Lucio Maranta 50b6e65f90 Fix 2019-01-23 16:59:09 +01:00
Lucio Maranta d9a22655b8 Added labels to scada, 
Remove network card monitor
 2019-01-21 09:29:03 +01:00
Lucio Maranta 724ac2afb8 Merge branch 'feature/Scada' into develop 
# Conflicts:
#	Client.Utils/Constants.cs
#	Client/View/NcWindow.cs
#	Libs/CMS_CORE_Library.dll
#	Step.Config/Config/serverConfig.xml
#	Step.Core/ThreadsFunctions.cs
#	Step.Model/Constants.cs
#	Step.Model/DTOModels/AlarmModels/DTOAlarmHistoricModel.cs
#	Step.Model/DatabaseModels/NcMagazinePositionModel.cs
#	Step.Model/Step.Model.csproj
 2019-01-15 16:58:18 +01:00