Commit Graph

2980 Commits

Author SHA1 Message Date
Alessandro Francia f9caf99fa1 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-05-07 12:21:12 +02:00
Alessandro Francia ac60252c8d families add 2018-05-07 12:20:52 +02:00
Nicola Carminati 2cb4ba1101 Fix disabled-ui for input-boxes 2018-05-07 09:23:25 +02:00
Alessandro Francia e496dd5800 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-05-07 08:50:53 +02:00
Alessandro Francia f014084df2 fix 2018-05-07 08:49:41 +02:00
Lucio Maranta d2b88a6992 Added new shanks data
Added isEnabled tool field
2018-05-04 17:06:25 +02:00
Alessandro Francia 17370e29c9 fix 2018-05-04 15:44:50 +02:00
Alessandro Francia 75c5227ff6 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-05-04 13:00:18 +02:00
Alessandro Francia 23f0fb009c taglienti 2018-05-04 12:59:52 +02:00
Nicola Carminati 51d18cf96a Swipe-up Fix 2018-05-04 08:04:11 +02:00
Alessandro Francia bf16bfd165 fix 2018-05-03 16:03:52 +02:00
Lucio Maranta 75f33d0f69 Fix edges config 2018-05-03 15:35:24 +02:00
Alessandro Francia e78fb30c57 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-05-03 15:28:01 +02:00
Alessandro Francia 149ca07ed1 manine magpos 2018-05-03 15:27:42 +02:00
Lucio Maranta 591b9b9293 Fix edges config 2018-05-03 15:19:55 +02:00
Lucio Maranta 147e7cc912 Added Edges CRUD 2018-05-03 14:44:48 +02:00
Alessandro Francia ab2d550012 add categories 2018-05-03 14:38:14 +02:00
Alessandro Francia 558d89092d Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-05-03 13:19:34 +02:00
Alessandro Francia 7147a7ce69 fix 2018-05-03 13:19:18 +02:00
Nicola Carminati 3e08d05a05 Added swipe-up gesture on footer 2018-05-03 12:57:27 +02:00
Lucio Maranta 88e58d7693 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-05-03 12:44:07 +02:00
Lucio Maranta 53555803fd Fix magazine positions Api 2018-05-03 12:43:14 +02:00
Alessandro Francia e5d96e18da fix 2018-05-03 12:14:27 +02:00
Alessandro Francia 486121d062 mod families e codoli 2018-05-03 11:56:53 +02:00
Alessandro Francia b85a8d715a tab bar families 2018-05-03 08:34:44 +02:00
Alessandro Francia 1826225867 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-05-02 14:54:55 +02:00
Alessandro Francia ee3bc6b446 families tab and category equipment 2018-05-02 14:49:54 +02:00
Nicola Carminati 138bce5b09 Fix Nc-softkey Name 2018-05-02 12:40:25 +02:00
Alessandro Francia 034ec3eaad merge 2018-05-02 09:11:09 +02:00
Alessandro Francia 02f7f8ef6b families, shanks 2018-05-02 08:37:01 +02:00
Lucio Maranta e1e467f2c4 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-05-02 08:29:28 +02:00
Lucio Maranta fa9ecb441e Fix missing DTOSiemensModel 2018-05-02 08:28:38 +02:00
Nicola Carminati a208f5884f Fix Hmi menu javascript-error 2018-05-02 08:23:39 +02:00
Lucio Maranta 70ba5b9045 Fix 2018-04-27 17:51:54 +02:00
Lucio Maranta d775ffbe3a Added:
- Delete tool
- Delete shank
- Delete family

Demo api
2018-04-27 17:31:47 +02:00
Alessandro Francia 26bbb25f9b Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-04-27 17:07:58 +02:00
Alessandro Francia c3830df3ca codoli, famiglie e manine 2018-04-27 17:07:29 +02:00
Lucio Maranta a7c488a630 Added:
- Add/Update tool api
- Update family/magazines positions
2018-04-27 16:48:55 +02:00
Nicola Carminati f1200106bd End of Tool-Manager Configuration 2018-04-27 15:59:47 +02:00
Nicola Carminati 2dc79a1311 Added Tools and Families configuration 2018-04-27 14:45:43 +02:00
Paolo Possanzini 6d16c8ad9b test 2018-04-27 13:28:13 +02:00
Nicola Carminati ac77686c63 Client: Siemens-Tested and fixed HMI-commands 2018-04-27 10:38:38 +02:00
Lucio Maranta 68d7986e9f Fixed matching between tools configuration and its data 2018-04-27 09:57:11 +02:00
Lucio Maranta 144994535a Added category to tool fields in configuration 2018-04-27 09:42:14 +02:00
Nicola Carminati d9694c8aa3 Fux hmi-buttons style 2018-04-26 14:45:56 +02:00
Nicola Carminati 75f002b923 Fix Vendor-hmi send commands 2018-04-26 14:20:06 +02:00
Paolo Possanzini 024540f792 aggancio server 2018-04-26 14:00:24 +02:00
Alessandro Francia 34604c67b2 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-04-26 13:45:49 +02:00
Alessandro Francia 2ad1765cd9 utensili 2018-04-26 13:45:30 +02:00
Nicola Carminati 690884f91f Added buttons over the Vendor-hmi in under-the-hood area. 2018-04-26 12:25:36 +02:00