Commit Graph

847 Commits

Author SHA1 Message Date
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
Lucio Maranta 44b36d84e4 Fix 2018-05-29 15:47:01 +02:00
Alessandro Francia 81ba7f762d Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-05-29 14:42:50 +02:00
Alessandro Francia 8f5ffe5974 get Lucio commit info-equipment in depot 2018-05-29 14:42:17 +02:00
Lucio Maranta 8c2cf3204e Added tool data into magazines API 2018-05-29 14:36:11 +02:00
Alessandro Francia 35481be057 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-05-29 10:17:49 +02:00
Alessandro Francia 6ee2d147a9 fix and get validation filed Lucio 2018-05-29 10:17:26 +02:00
Lucio Maranta 437069e450 Added min/max value to tools/multitools configuration 2018-05-29 09:55:37 +02:00
Alessandro Francia b5be863c8c Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-05-29 08:28:59 +02:00
Alessandro Francia aa469f0aa4 fix button save/modify 2018-05-29 08:28:34 +02:00
Lucio Maranta f10aae3bc5 Added Siemens options
Fix siemens library
2018-05-28 17:39:59 +02:00
Alessandro Francia 9a3c2317f5 fix, change api magpos magazine, filter equipment depot 2018-05-28 16:55:21 +02:00
Alessandro Francia 29de7a0673 fix button tooling-equipment cancel save modify 2018-05-28 14:42:13 +02:00
Alessandro Francia ddb7b1438a fix and depot 2018-05-28 14:19:43 +02:00
Alessandro Francia 6437dcae98 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-05-28 10:58:20 +02:00
Lucio Maranta 405c25f3f8 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-05-28 10:59:17 +02:00
Lucio Maranta 41ec296678 Add single magazine API 2018-05-28 10:58:33 +02:00
Alessandro Francia 3f3eebfb0b get modify depot Lucio 2018-05-28 10:58:02 +02:00
Nicola Carminati 62745cf4e6 fix blur style on Internal Modals 2018-05-28 09:52:45 +02:00
Nicola Carminati 0e30f200e9 Added tool-manager search-boxes placeholder 2018-05-28 09:26:52 +02:00
Alessandro Francia a9089e0034 tools families magpos and shanks search improvement 2018-05-25 16:43:14 +02:00
Alessandro Francia 43ae9ac3a8 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-05-25 16:25:46 +02:00
Alessandro Francia 54ce17cfef merge 2018-05-25 16:25:37 +02:00
Paolo Possanzini c44b3921b0 search 2018-05-25 16:24:08 +02:00
Paolo Possanzini af98b7bf06 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-05-25 16:23:04 +02:00
Paolo Possanzini 1028b95071 depot 2018-05-25 16:22:59 +02:00
Alessandro Francia 1194513124 graph maintenance 2018-05-25 12:37:31 +02:00
Alessandro Francia b09538ea12 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-05-25 10:01:40 +02:00
Alessandro Francia fdd95beec7 graph maintenance and improvement header tools 2018-05-25 10:01:21 +02:00
Nicola Carminati 8389eeb2d1 Fix ui style 2018-05-25 09:29:51 +02:00
Nicola Carminati 1203def411 FIx Edit-Enabled style - Tool Manager 2018-05-25 09:07:24 +02:00
Alessandro Francia 6a298d641e Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-05-25 08:41:24 +02:00
Alessandro Francia 00a58612df graph selectedMaintenance 2018-05-25 08:41:07 +02:00
Nicola Carminati 1e63104747 Fix Behaviour create / edit / delete tools and Shanks 2018-05-24 17:17:03 +02:00