Commit Graph

2980 Commits

Author SHA1 Message Date
Alessandro Francia 42f07cb84c Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-05-31 14:34:10 +02:00
Alessandro Francia 2eec75b2cb merge 2018-05-31 14:33:56 +02:00
Nicola Carminati c658d156c5 Fix Depot Icons Error 2018-05-31 14:32:12 +02:00
Alessandro Francia 85e5de9e80 get fix icon after merge 2018-05-31 14:28:47 +02:00
Nicola Carminati b9c316e8d0 Fix Shanks behaviour 2018-05-31 12:57:38 +02:00
Nicola Carminati 6af1d7e562 Tools Image Fix - Depot 2018-05-31 12:41:19 +02:00
Alessandro Francia a48cd66016 merge 2018-05-31 12:12:26 +02:00
Alessandro Francia 0ec77fdd51 fix delete tool from multitool and load/unload tool to/from depot 2018-05-31 12:07:52 +02:00
Nicola Carminati 73469f995a Fix Tooling Icons 2018-05-31 11:09:41 +02:00
Lucio Maranta 5b7997ec14 FIx demo options 2018-05-31 10:40:51 +02:00
Alessandro Francia 41d676f5b4 info-equipment 2018-05-31 08:54:42 +02:00
Alessandro Francia 56a3e6fec5 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-05-31 08:20:48 +02:00
Alessandro Francia 26f835f412 depot 2018-05-31 08:20:29 +02:00
Nicola Carminati 8bf628f1a3 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-05-31 07:58:51 +02:00
Nicola Carminati 4c549c6cdd Fix center-screen when select a magpos 2018-05-31 07:58:24 +02:00
Paolo Possanzini 403d15e896 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-05-30 17:42:56 +02:00
Paolo Possanzini 5b3a7c85f0 validations 2018-05-30 17:42:50 +02:00
Lucio Maranta 0d8b897385 Added response into load/unload 2018-05-30 16:50:44 +02:00
Paolo Possanzini 14477965f8 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-05-30 15:58:48 +02:00
Paolo Possanzini 268ed5abe7 animation fix 2018-05-30 15:58:44 +02:00
Paolo Possanzini 733b33c153 animation fix 2018-05-30 15:58:17 +02:00
Alessandro Francia 33a43a713a Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-05-30 15:54:28 +02:00
Paolo Possanzini adf6db531a Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-05-30 15:53:01 +02:00
Paolo Possanzini bb787c1ea7 selected list 2018-05-30 15:52:57 +02:00
Alessandro Francia ae190d26f8 fix deleteEdge and addEdge 2018-05-30 15:52:12 +02:00
Lucio Maranta b3b2632e8e Fix siemens library
Change load/unload in magazine API
2018-05-30 15:09:24 +02:00
Alessandro Francia e3476cd122 fix multitool in tooling 2018-05-30 14:54:05 +02:00
Alessandro Francia ec61a8deb1 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-05-30 14:30:03 +02:00
Alessandro Francia 5fde01f574 max values and multitooloptions 2018-05-30 14:29:21 +02:00
Paolo Possanzini 05a39012fd style fix 2018-05-30 14:00:00 +02:00
Paolo Possanzini 29282c6835 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-05-30 13:17:36 +02:00
Paolo Possanzini 3a4512b193 drag & drop base functions 2018-05-30 13:17:31 +02:00
Alessandro Francia d40ddd9a6d fix 2018-05-30 12:57:20 +02:00
Alessandro Francia 8337abcffd Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-05-30 12:27:18 +02:00
Alessandro Francia 74bfd366c1 maxedges 2018-05-30 12:26:48 +02:00
Nicola Carminati a298f4d8a0 Fix 2018-05-30 12:26:21 +02:00
Alessandro Francia 9f81f63ae6 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-05-30 12:07:21 +02:00
Alessandro Francia 1875ba14b4 fix cancel restore tool and maxTools 2018-05-30 12:05:46 +02:00
Nicola Carminati 2dfacc61d9 Fix UI select-box 2018-05-30 11:51:41 +02:00
Nicola Carminati ecb47c9e07 Show tool-life-params only if needed 2018-05-30 11:36:50 +02:00
Lucio Maranta 6a8d98b606 Fix siemens available tools 2018-05-30 11:19:24 +02:00
Alessandro Francia 2991229381 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-05-30 09:27:06 +02:00
Alessandro Francia b89576f719 info-equipment 2018-05-30 09:26:11 +02:00
Lucio Maranta 696587a22d Fix demo library 2018-05-29 16:25:31 +02:00
Alessandro Francia 92fab26ae9 fix 2018-05-29 16:05:36 +02:00
Alessandro Francia 7e7fe5abe3 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-05-29 15:55:19 +02:00
Alessandro Francia 1f0eaf134f get fix Lucio 2 2018-05-29 15:54:55 +02:00
Lucio Maranta 9503670a0c Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-05-29 15:54:13 +02:00
Lucio Maranta db83cb898e Fix demo library 2018-05-29 15:53:24 +02:00
Alessandro Francia 1ba7f38d04 get fix Lucio 2018-05-29 15:48:42 +02:00