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

1872 Commits

Author SHA1 Message Date
Lucio Maranta 4be7e1c736 Fix head style 
Added Siemens tool mounted data
Fix fanuc getFileList()
 2019-09-24 16:21:50 +02:00
Lucio Maranta b2c13d8d82 Remove id from Siemens tool manager 2019-09-24 10:02:07 +02:00
Lucio Maranta 9d9161c6c8 Added siemens mounted tool data 
Fix siemens tool table
 2019-09-23 16:26:52 +02:00
Lucio Maranta 95300dd843 Fix head style 2019-09-20 12:32:15 +02:00
Lucio Maranta 52247c7553 Fix heads style 
Added new family names
 2019-09-20 12:20:44 +02:00
Lucio Maranta ddd7b0a2b0 Fix siemens tool table 
WIP siemens tool data in heads
 2019-09-19 12:19:25 +02:00
Lucio Maranta 8d10c11988 Fix siemens: delete tool bug 
Fix multiprocess - selection style
Added highlighting on tool in spindle
 2019-09-18 16:53:53 +02:00
Lucio Maranta e2b01f5fcf Fix siemens self adaptive path 
Fix user softkey scrolling
 2019-09-16 16:55:48 +02:00
Lucio Maranta c75e90b55a Fix attachment multilanguage bug 2019-09-12 12:42:56 +02:00
Lucio Maranta cbafff3bb9 Fix redirect after login 2019-09-11 16:05:28 +02:00
Lucio Maranta f256a4e0f3 Added horizontal scroll to user softkey for long texts 2019-09-11 11:03:04 +02:00
Lucio Maranta 805a668791 THINCLIENT Added relogin script 2019-09-10 16:53:51 +02:00
Lucio Maranta 06d5139822 Added thinClient API 2019-09-04 12:12:15 +02:00
Lucio Maranta 721a44d947 REFACTOR - renamed handlers to adapters 2019-09-03 16:35:40 +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 f23be31a57 Fix scada & styles 2019-08-28 16:14:37 +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
Lucio Maranta 2b6ca98913 Fix 2019-08-28 10:19:31 +02:00
Lucio Maranta 654796468a Ignored Osai file error - 23/1 (syntax error) 
Hided "select all the files" toggle on "Recent" drive
 2019-08-28 09:42:15 +02:00
Lucio Maranta 8240fa9c0e WIP 2019-08-27 17:02:53 +02:00
Nicola Carminati c06d77904a Fix Initial Page 2019-08-27 15:43:22 +02:00
Lucio Maranta 04c710d1d4 Added ask-confirm layer on file manager 2019-08-27 10:28:38 +02:00
Nicola Carminati 563bcdb60f Wip Server & Client 2019-08-26 17:12:27 +02:00
Lucio Maranta a0b2efba38 WIP last uploaded files 
And refactor
 2019-08-26 17:01:00 +02:00
Nicola Carminati bb45bdf9e5 Wip Wip Wip 2019-08-23 17:15:16 +02:00
Nicola Carminati 457192c032 WIP 2019-08-22 18:03:54 +02:00
Lucio Maranta af3eabbbc2 Fix reload page on file editor 2019-08-22 12:44:37 +02:00
Lucio Maranta 4bf329caee Fix scada validator & scada in production 2019-08-22 10:34:17 +02:00
Lucio Maranta eab232a993 Fix abrasive style 2019-08-21 16:25:08 +02:00
Lucio Maranta a216bff621 Added reload file after changes 
Fix modal style & translations
 2019-08-21 15:06:38 +02:00
Nicola Carminati 5eb6ad7c7b Added functionality. Test Connection + Fix other things 2019-08-21 12:02:31 +02:00
Nicola Carminati 5b4a44dfae Fix Namespace 2019-08-20 17:38:11 +02:00
Nicola Carminati fc2ddeeb54 First Commit 2019-08-20 17:31:54 +02:00
Lucio Maranta fd9e08a0d2 WIP file editor 2019-08-20 16:40:15 +02:00
Lucio Maranta c78ad44588 Fix head detail box closing 2019-08-20 08:18:22 +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
Nicola Carminati ce20ae5780 Fix notes BTN label 2019-08-19 09:39:48 +02:00
Lucio Maranta 137f7859b2 Merge branch '1.2.2_BRANCH' into develop 2019-07-31 13:30:58 +02:00
Lucio Maranta 52fe35ff41 Fix preferred softkey double click bug 2019-07-31 13:02:51 +02:00
Lucio Maranta 57f07b60f6 Develop library alignment 
Enabled feed override
 2019-07-30 16:08:53 +02:00
Lucio Maranta 08038c33d0 Added Multilanguage on scada buttons 2019-07-30 11:58:11 +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 cd03649e6c Added new box which enter from right to left 
& New icon
 2019-07-29 14:16:29 +02:00
Nicola Carminati 82a126092f Tool Status Images 2019-07-29 08:20:45 +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