Commit Graph

2980 Commits

Author SHA1 Message Date
Lucio Maranta 5ad1f127cd Fix fanuc selected program image 2019-08-27 15:52:51 +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
Lucio Maranta f347c6f06d Fix scada 2019-08-23 09:42:49 +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
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 eab232a993 Fix abrasive style 2019-08-21 16:25:08 +02:00
Nicola Carminati baf8ca0510 Added ToString Method 2019-08-21 16:03:37 +02:00
Lucio Maranta f708b43cc0 Refactor 2019-08-21 15:59:16 +02:00
Lucio Maranta a216bff621 Added reload file after changes
Fix modal style & translations
2019-08-21 15:06:38 +02:00
Nicola Carminati c31cbf3bab Fix "Setup" void name 2019-08-21 14:06:17 +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 42eec885d0 Merge remote-tracking branch 'origin/FixMaintenanceCounters' into develop
# Conflicts:
#	Client/View/NcWindow.cs
2019-08-20 08:37:30 +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 f63d4f1134 Merge remote-tracking branch 'origin/1.2.2_BRANCH' into develop 2019-08-19 09:23:56 +02:00
Nicola Carminati 21609756a9 Fix Siemens Reading Edges + translations 2019-08-08 16:34:45 +02:00
Lucio Maranta 137f7859b2 Merge branch '1.2.2_BRANCH' into develop 2019-07-31 13:30:58 +02:00
Lucio Maranta 6e20371e5b Fix osai assisted tooling 2019-07-31 13:29:24 +02:00
Lucio Maranta 52fe35ff41 Fix preferred softkey double click bug 2019-07-31 13:02:51 +02:00
Lucio Maranta 037c312850 Re-insert Added scada validator 2019-07-31 12:00:03 +02:00
Lucio Maranta c931753fd1 Fix osai assisted tooling 2019-07-31 11:15:57 +02:00
Lucio Maranta f1540efe66 Alignment with 1.2.2_BRANCH 2019-07-30 17:14:29 +02:00
Lucio Maranta 9177338885 Fix reset counters 2019-07-30 17:01:05 +02:00
Lucio Maranta b2f7065683 Fix machine hours form 2019-07-30 16:20:04 +02:00
Lucio Maranta becffe9df3 Fix machine hours form 2019-07-30 16:16:54 +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 95bdf47230 Llibrary alignment 2019-07-30 11:28:02 +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 7a351072b2 Fix translations 2019-07-30 11:06:47 +02:00
Lucio Maranta 0524cade83 Fix siemens blank screen bug
& fix siemens startup icon
2019-07-30 10:46:53 +02:00
Nicola Carminati ac20ecd8f1 Fix Window manager Siemens 2019-07-30 10:27:02 +02:00
Lucio Maranta acac7094c9 1.2.2 Version 2019-07-29 16:50:58 +02:00
Lucio Maranta 1364371252 Fix scada 2019-07-29 14:17:29 +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
Nicola Carminati fc56b0e4c9 First Commit. Must be tested 2019-07-25 12:18:46 +02:00