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

307 Commits

Author SHA1 Message Date
Lucio Maranta e1d6bd1f91 Fix duplicated user in alarms history 2020-02-25 11:35:44 +01:00
Lucio Maranta 3199ad99d5 Fix password maintenances 
Added new machine number config field
 2020-02-24 16:42:47 +01:00
Lucio Maranta d9e9c60315 First implementation of watchdog 2020-01-27 16:20:32 +01:00
Lucio Maranta 95e87f2ceb Fix installation date 2020-01-22 15:08:44 +01:00
Lucio Maranta 7f5b049f18 Merge remote-tracking branch 'origin/feature/Maintenance-Machine-Counter' into develop 
# Conflicts:
#	Step.Utils/languages/IT.xml
#	Step.Utils/languages/da.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/pt.xml
#	Step.Utils/languages/ro.xml
#	Step.Utils/languages/ru.xml
#	Step.Utils/languages/sv.xml
 2019-12-11 15:13:16 +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
Lucio Maranta 024d32e5c9 Added integrity check field to tools data 2019-12-03 14:31:19 +01:00
Nicola Carminati b16a978588 Fix behaviour 2019-12-03 12:49:02 +01:00
Nicola Carminati c20060f0a7 added features 2019-12-02 18:16:22 +01:00
Nicola Carminati 9fd63c0eac Merge remote-tracking branch 'origin/feature/SiemensKeyboard' into develop 2019-11-27 16:40:27 +01:00
Nicola Carminati 4c2a0c1c91 End of feature developing 2019-11-26 17:13:37 +01:00
Lucio Maranta dabedcff84 Fix isInUse siemens fields 2019-11-26 11:56:22 +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
Lucio Maranta 787582958c Fix style & renamed contacts 2019-10-23 16:48:02 +02:00
Lucio Maranta 1ea597af13 Fix Family Name (automatic) 2019-10-18 10:48:43 +02:00
Lucio Maranta 95a6d19cb1 1.3Version 2019-10-16 09:44:55 +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 80057fc3ec Fix siemens tool table 2019-10-03 13:01:36 +02:00
Lucio Maranta 4be7e1c736 Fix head style 
Added Siemens tool mounted data
Fix fanuc getFileList()
 2019-09-24 16:21:50 +02:00
Lucio Maranta 9d9161c6c8 Added siemens mounted tool data 
Fix siemens tool table
 2019-09-23 16:26:52 +02:00
Lucio Maranta f256a4e0f3 Added horizontal scroll to user softkey for long texts 2019-09-11 11:03:04 +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 5d2544a2ae Added redis-Setup for Alarms 2019-08-28 11:57:05 +02:00
Nicola Carminati 563bcdb60f Wip Server & Client 2019-08-26 17:12:27 +02:00
Nicola Carminati 457192c032 WIP 2019-08-22 18:03:54 +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 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 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 cd03649e6c Added new box which enter from right to left 
& New icon
 2019-07-29 14:16:29 +02:00
Lucio Maranta 3c00401e61 WIP tool mounted in spindle data 2019-07-26 13:01:33 +02:00
Lucio Maranta e940d3d632 WIP selected tool sub menu 2019-07-25 12:19:38 +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 95f0ec3e25 Added feed overrides 2019-07-23 15:54:51 +02:00
Lucio Maranta a256c3633d VERSION 1.2.1 
Fix scada
Fix axes unit measure
 2019-07-18 18:05:40 +02:00
Lucio Maranta 7b7399182a Fix production scada 
Fix delete alarm attachment
Fix reload page after login
Added delete alarm-history
 2019-06-29 16:10:42 +02:00
Lucio Maranta c7ac5de54e WIP custom main program 2019-06-18 15:43:45 +02:00
Lucio Maranta a7f6b70111 Fix frontend 
Added Override chart (OSAI FANUC)
Added Offsets data
Update languages
 2019-06-12 17:02:32 +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 708f958b0f Fix build version & scada 2019-05-27 17:15:44 +02:00
Lucio Maranta 306fa43593 Fix error messages 
Fix frontend assistedTooling
Fix application closure
 2019-05-15 17:28:21 +02:00
Lucio Maranta 8519c60e81 Fix scada textbox alignment 
Added autoload tool from NC when database is created
WIP check option consistency
 2019-05-14 17:27:16 +02:00