 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
|
37f81141f6
|
Fix osai files
|
2019-08-28 16:45:10 +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 |
|
|
Nicola Carminati
|
5d2544a2ae
|
Added redis-Setup for Alarms
|
2019-08-28 11:57:05 +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 |
|
|
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 |
|