Commit Graph

1944 Commits

Author SHA1 Message Date
= cf5737239f fix configuration 2020-03-12 17:28:07 +01:00
= a958d313ba fix migrations 2020-03-12 17:27:16 +01:00
= d326f32607 Merge branch 'thermoactive/develop' of https://teamdev-it.visualstudio.com/Professional%20Service/_git/cms_step into thermoactive/develop 2020-03-12 15:04:51 +01:00
= acf62b0aac fix client configurations 2020-03-12 15:00:01 +01:00
Paolo Possanzini 713001429a fix mariadb compatibility 2020-03-12 13:21:46 +01:00
Paolo Possanzini 528ec1f677 pulizia file demo 2020-03-12 13:05:22 +01:00
= e13b88905f refactoring accesso ai dati 2020-03-12 12:32:59 +01:00
= f90b3a9074 fix server locale 2020-03-12 10:36:22 +01:00
= 287b7f1239 Merge remote-tracking branch 'teamdev/thermoactive/develop' into thermoactive/develop 2020-03-12 10:21:13 +01:00
= 7010b62dd9 WEBPACK 2020-03-12 10:20:50 +01:00
Alessio f11d664cc4 fix 2020-03-12 09:11:35 +01:00
Alessio aa894c56ab unzip file demo 2020-03-12 08:57:48 +01:00
Alessio Giombetti 9c572c1c74 Merged PR 356: ultimate fix for cards 2020-03-11 13:26:26 +00:00
Alessio 14c953ff4c ultmate fix for cards 2020-03-11 14:24:33 +01:00
Alessio 97fa78615c other files -ts for cards 2020-03-11 12:55:23 +01:00
Alessio Giombetti e7a6fcad40 Merged PR 355: add files .ts for cards 2020-03-11 11:40:42 +00:00
Alessio 24dafeaeb1 add filed .ts for cards 2020-03-11 12:35:34 +01:00
Francesco Guerrieri 836027ec15 fix file ts 2020-03-11 11:40:43 +01:00
Francesco Guerrieri 765d7175cf refactoring vue files 2020-03-11 11:12:32 +01:00
Alessio 884d66988d add files .ts 2020-03-11 11:02:10 +01:00
= 35b9996848 riconfigurazione del progetto, aggiornamento librerie di base e compilatore ts. riconfigurazione webpack, aggiornamento webpack e piccole correzioni di typing 2020-03-10 15:07:46 +01:00
Lucio Maranta d64a84c6b3 1.4.1 Release 2020-02-27 11:54:41 +01:00
Lucio Maranta 29fd885777 Fix scada
Fix siemens tool table
2020-02-26 16:56:16 +01:00
Lucio Maranta ea20cb0fdb Fix translations
Fix Osai Axes and Feed value
2020-02-11 09:13:56 +01:00
Lucio Maranta fbe511ce3d Fix SCM config on installation 2020-02-07 16:15:00 +01:00
Lucio Maranta 98fe230a78 Added new logger
Fix thread time counters
2020-01-30 12:28:06 +01:00
Lucio Maranta 95e87f2ceb Fix installation date 2020-01-22 15:08:44 +01:00
Lucio Maranta 0c390a1ae5 Fix toggle buttons 2020-01-17 12:14:55 +01:00
Lucio Maranta ca6cc4524c 1.4_RELEASE 2019-12-18 11:37:03 +01:00
Lucio Maranta 10a99a5d18 1.4_RELEASE 2019-12-18 09:44:46 +01:00
Nicola Carminati 17c774fd6d Fix Css 2019-12-16 16:08:27 +01:00
Nicola Carminati d99fda458b Fix maintenance Machine 2019-12-16 14:55:59 +01:00
Lucio Maranta deba431b08 Fix cooling translations
Fix configurable tool types
2019-12-12 09:13:02 +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
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 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 9d0bcc570f Added features 2019-11-29 16:18:16 +01:00
Nicola Carminati b7a1924c4b First commit 2019-11-27 17:59:05 +01:00
Lucio Maranta 99aa075866 Removed axes container 2019-11-27 11:04:33 +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 6083d372a8 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2019-11-25 09:46:18 +01:00
Nicola Carminati 1114f238a3 Fix Show-Prod window in Client 2019-11-25 09:45:24 +01:00
Lucio Maranta 8ad269ed6b Fix tool table fields error
Fix modal close button position
2019-11-21 09:38:54 +01:00
Lucio Maranta 13036ccaf3 Fix translations 2019-11-19 09:21:47 +01:00