Egalware/cms_thermo_active
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,122 Commits 24 Branches 19 Tags
edd3d4f4a64efbc05f21d5f98b0facecd4cd2dbe
Commit Graph

1777 Commits

Author SHA1 Message Date
Lucio Maranta edd3d4f4a6 Added fanuc scripts 2019-05-10 08:32:20 +02:00
Lucio Maranta 94eaebc95d Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2019-05-09 13:04:08 +02:00
Lucio Maranta 6334f29814 Centered scada 
Fix assisted tooling modals
Added Fanuc scripts
 2019-05-09 13:03:42 +02:00
paolo possanzini 1e8f865978 prod 2019-05-09 12:45:49 +02:00
paolo possanzini 528ec091f0 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2019-05-09 11:51:28 +02:00
paolo possanzini 094ebc255f production environment 2019-05-09 11:51:23 +02:00
Nicola Carminati de19d41987 Filtered Path when select files in OSAI. Nc mapped drive can't be loaded 2019-05-09 11:38:01 +02:00
paolo possanzini 6137890760 build process 2019-05-09 11:26:07 +02:00
Lucio Maranta fb521a76d8 Added mounted tool data 
Added start needed modal
 2019-05-08 17:23:47 +02:00
Lucio Maranta 6926edb981 Fix offsets 2019-05-07 17:08:50 +02:00
Lucio Maranta 297179cc14 Fix null reference 
FIx frontend
Added modal on assistede tooling
 2019-05-06 17:11:09 +02:00
Nicola Carminati 796f674dce fix other problems 2019-05-05 21:38:42 +02:00
Nicola Carminati 690eb0e4e8 FIx Marcolin Problems 2019-05-04 20:07:54 +02:00
Lucio Maranta 68c088206a Fix setup script 
Added new feature "Delete programs before load"
 2019-05-02 17:45:50 +02:00
Lucio Maranta 5a8e09bbca Added DIS messages, 
Fix setup SCM icons
 2019-04-30 17:45:55 +02:00
Lucio Maranta 470c620421 Fix signalR auth 2019-04-30 10:19:02 +02:00
Lucio Maranta 202e4352d4 Fix shanks 
Osai: on startup check directory
 2019-04-29 16:52:17 +02:00
Nicola Carminati 3d68ac9b26 Other fixes in shanks 2019-04-27 18:25:26 +02:00
Nicola Carminati c9d31331b0 Fix Multitool Option 2019-04-27 18:11:54 +02:00
Nicola Carminati 680d9e2692 Fix Translation & behavoiur on Families & tools 2019-04-27 12:05:08 +02:00
Nicola Carminati 796f0b32f3 Advanced User Management 2019-04-26 19:22:54 +02:00
Lucio Maranta 839fae6bd6 Fix user login 2019-04-26 11:46:44 +02:00
Lucio Maranta 617586d4bd Added: Restore magazine table lock on startup 
Added tool table import status
 2019-04-24 17:33:28 +02:00
Lucio Maranta 84904a3bb5 Fix fanuc macro write 
Fix tool table
 2019-04-23 15:22:03 +02:00
Lucio Maranta e91d7ad524 Fix setup script 2019-04-23 08:31:29 +02:00
Lucio Maranta c3da370a01 Fix loading tools in magazine controls 2019-04-19 13:16:04 +02:00
Lucio Maranta fa2082209e Added SCM icons 2019-04-18 12:55:03 +02:00
Nicola Carminati 05aab2600f Fix Client exception when "showNcHMI" option is False 2019-04-17 18:51:23 +02:00
Nicola Carminati 86f85b051b Added close method SignalR 2019-04-17 15:24:04 +02:00
Nicola Carminati e504daa532 Fix problems Token 2019-04-17 14:57:28 +02:00
Nicola Carminati 28e6ae68ad Added question on close + FIx SCADA pages 2019-04-17 14:36:43 +02:00
Lucio Maranta c26d700775 Merge branch 'feature/Fix_Log_JWT' into develop 2019-04-17 14:06:48 +02:00
Lucio Maranta 15b5ba8ca0 FIX WebApi bearer token authorization 2019-04-17 14:05:13 +02:00
Nicola Carminati 7ab4f17f9e Reverse commit CNC-DIsconnected 2019-04-17 11:19:01 +02:00
Nicola Carminati 22d5da7790 Lauch client on CNC Connected 2019-04-17 11:17:20 +02:00
Nicola Carminati cab9a446d8 Fix styles 2019-04-16 10:39:35 +02:00
Nicola Carminati 0194b3ed7c Added modal for CNC disconnected 2019-04-13 17:05:13 +02:00
Lucio Maranta a5cc072d4e Fix setup: 
Added mariaDb installation
 2019-04-12 13:05:27 +02:00
Lucio Maranta 56bf12dcb3 Added in installation setup: 
- Siemens compatibility
- .Net installer
- WIP MariaDB
 2019-04-11 12:58:42 +02:00
Nicola Carminati eb98081712 Added close server when close client if the option "autoOpenCmsClient" in server is TRUE 2019-04-11 11:46:19 +02:00
Lucio Maranta 285fdf3fe2 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2019-04-11 11:29:29 +02:00
Lucio Maranta 333f906522 Fix function access API 2019-04-11 11:28:57 +02:00
Nicola Carminati 7c09bfb600 Fix UI for production 2019-04-11 11:25:33 +02:00
Lucio Maranta 8d6c1fd39a Fix project options & setup 2019-04-10 17:22:55 +02:00
Lucio Maranta cef729a0ef Added iss setup 2019-04-09 17:27:09 +02:00
Lucio Maranta 4f07caa81c Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2019-04-09 16:56:43 +02:00
Lucio Maranta aa917bfc01 FIx siemens tooltable 2019-04-09 16:56:24 +02:00
Nicola Carminati 22c1410a29 Added multiple upload PP 2019-04-09 15:50:36 +02:00
Nicola Carminati ab9bfd3602 Self adaptive Path Step 2019-04-08 17:36:56 +02:00
Lucio Maranta 5fb8e1b4e9 Fix siemens tool 
Osai fix
 2019-04-08 17:25:57 +02:00