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

83 Commits

Author SHA1 Message Date
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 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 f4d1f91699 FIx available language & 
Merge branch 'feature/SelectedToolData' into develop

# Conflicts:
#	Libs/CMS_CORE_Library.dll
#	Step/wwwroot/src/app_modules/production/components/head-production.vue
 2019-08-19 16:44:14 +02:00
Lucio Maranta 66c36eea9c Added new animation & arrow 
Added scroll bar to scada tab
 2019-08-19 16:36:16 +02:00
Lucio Maranta 037c312850 Re-insert Added scada validator 2019-07-31 12:00:03 +02:00
Lucio Maranta ffa880adfb Merge branch '1.2.2_BRANCH' into develop 
# Conflicts:
#	Libs/CMS_CORE_Library.dll
 2019-07-30 11:09:43 +02:00
Lucio Maranta 0524cade83 Fix siemens blank screen bug 
& fix siemens startup icon
 2019-07-30 10:46:53 +02:00
Lucio Maranta acac7094c9 1.2.2 Version 2019-07-29 16:50:58 +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 b096632d22 Fix scada 
Removed
 2019-06-26 15:25:57 +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 306fa43593 Fix error messages 
Fix frontend assistedTooling
Fix application closure
 2019-05-15 17:28:21 +02:00
Nicola Carminati 240f27bb76 Fix Nullreference error on Opening window, adde SCADA validator 2019-05-10 17:23:57 +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
Lucio Maranta 3750987db0 Fix tool table 
Added field  to scada images ("clickEnabled")
 2019-04-01 17:58:54 +02:00
Lucio Maranta 7ed87452a4 Fix ACTIVE error management 
Fix tool table cancel buttons
Removed deleted button in edit
 2019-03-26 17:01:29 +01:00
Nicola Carminati c519d82f1b Added configurations 2019-03-22 16:57:38 +01:00
Lucio Maranta 3eba8f1ab7 Fix Osai 
Added images management to scada
 2019-03-22 12:47:21 +01:00
Nicola Carminati 5fe808dfdb Fix Radius/Diameter configuration 2019-03-21 12:42:26 +01:00
Nicola Carminati a2aa8630f6 Merge branch 'User_Manager' into develop 2019-03-20 17:05:04 +01:00
Lucio Maranta 4892340a26 Assistedtooling fix 
Fix siemens tool table
Added dynamic tool in spindle
 2019-03-20 16:56:10 +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 ede0e5b926 Fix alarm & added autodelete 2019-02-12 16:58:20 +01:00
Lucio Maranta 9242987d76 Fix scada 
WIP M154
 2019-01-31 13:24:49 +01:00
Nicola Carminati dbbbecd2e5 Fix Tool manager Siemens 2019-01-22 13:00:00 +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
Lucio Maranta 0b63a0e0e6 WIP Scada 
Added subribe
Added thread
Fix & refactor
 2019-01-14 11:30:53 +01:00
Nicola Carminati e130d2bfa5 Fix last commit 2018-12-28 15:36:17 +01:00
Lucio Maranta ebfbfd2d9e Added API 
WIP Thread
 2018-12-20 13:18:06 +01:00
Lucio Maranta 4a27b1dba4 WIP 2018-12-19 17:10:11 +01:00
Lucio Maranta 355067e963 First commit 2018-12-18 17:40:58 +01:00
Lucio Maranta 0f15f2e367 Added OriginPosition 
Fixed fanuc TT
& Minorfixes
 2018-11-30 13:26:46 +01:00
Lucio Maranta 00c7297ee2 WIP minor fix 2018-11-26 17:26:38 +01:00
Lucio Maranta e47d48aea9 Added new alarm filter 2018-10-29 17:00:35 +01:00
Lucio Maranta 1191750fe6 WIP removed autoincrement 2018-09-25 15:27:58 +02:00
Lucio Maranta a35bce643a Added magazines names, auto open cms client... 
Fix alarm bug
 2018-09-24 15:28:19 +02:00
Nicola Carminati adc6adfc11 Added Job Editor in Client CMS 2018-09-21 11:21:45 +02:00
Lucio Maranta 13a143957f Added macros API 
WIP Job backend
 2018-09-20 13:03:02 +02:00
Lucio Maranta 3a0e1bc2a4 Fix fileManager 
Added filePath config
 2018-09-04 17:06:54 +02:00
Lucio Maranta 5f5ead4f2e Fix tools params 2018-08-21 10:42:55 +02:00