Commit Graph

1643 Commits

Author SHA1 Message Date
Giacomo Canonico ead9bbcb80 Merge remote-tracking branch 'origin/feature/grafici_wp10' into feature/grafici_wp10 2019-03-15 09:07:41 +01:00
Giacomo Canonico 00263ae522 card report timeline 2019-03-15 09:07:33 +01:00
Alessandro c723be2b2f Merge remote-tracking branch 'origin/feature/grafici_wp10' into feature/grafici_wp10
merge card.less
2019-03-15 08:56:34 +01:00
Alessandro 4a1975b71e bar chart and fix pie chart 2019-03-15 08:53:09 +01:00
Giacomo Canonico 2c3f25f29c Merge remote-tracking branch 'origin/feature/grafici_wp10' into feature/grafici_wp10 2019-03-14 13:04:42 +01:00
Giacomo Canonico 7c0816dfc3 timeline chart 2019-03-14 13:04:09 +01:00
Alessandro 35c24f5294 tooltip 2019-03-12 16:50:49 +01:00
Alessandro a187759882 Merge branch 'develop' into feature/grafici_wp10 2019-03-12 10:05:03 +01:00
Alessandro d00b604e50 fix barchart 2019-03-12 09:58:21 +01:00
Lucio Maranta 09b6e4e009 Fix timeline date 2019-03-12 09:56:58 +01:00
Lucio Maranta c391a161c5 Fix tooltable
WIP Assisted tooling
2019-03-11 17:17:24 +01:00
Alessandro 002897ec87 fix 2019-03-11 12:08:03 +01:00
Alessandro 38c4cc08a1 barchart 2019-03-11 12:06:58 +01:00
Lucio Maranta 6903513d0f Merge branch 'feature/FixToolTable' into develop 2019-03-11 09:27:18 +01:00
Lucio Maranta e764e48fb8 Added new family id management 2019-03-11 09:25:47 +01:00
Alessandro b32ae85adc Merge branch 'develop' into feature/grafici_wp10 2019-03-11 08:13:40 +01:00
Lucio Maranta 92becc3f94 Added new tool creation tab 2019-03-08 13:09:34 +01:00
Nicola Carminati 83f22592c8 Added Softkey "Visible" attribute + AutoIncrement Versioning 2019-03-07 16:39:09 +01:00
Lucio Maranta 94361f9444 Merge branch 'develop' into feature/FixToolTable
# Conflicts:
#	Step.Model/Constants.cs
2019-03-07 12:38:49 +01:00
Lucio Maranta dbc80f653e Added password to cms maintenances 2019-03-07 12:28:59 +01:00
Alessandro bbc940e60f production table 2019-03-06 17:17:46 +01:00
Lucio Maranta 4338e64d7d Fix frontend tool table
WIP password on maintenances
2019-03-06 17:00:56 +01:00
Alessandro 92b4471655 Merge branch 'develop' into feature/grafici_wp10 2019-03-06 14:23:16 +01:00
Alessandro ae0528daf8 production table 2019-03-06 14:22:11 +01:00
Lucio Maranta 21877760be Added pages to programs report 2019-03-06 14:15:44 +01:00
Alessandro 3bcb77d808 Merge branch 'develop' into feature/grafici_wp10 2019-03-06 08:38:54 +01:00
Lucio Maranta 321f6bd9e0 WIP maintenances with password
Fix Siemens library
2019-03-04 17:23:13 +01:00
Lucio Maranta 28b6932ee2 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2019-03-01 13:00:47 +01:00
Lucio Maranta f5e26fac77 Fix favorite softkey
Added origin & offset FANUC
2019-03-01 12:46:57 +01:00
Nicola Carminati e5494df177 Fix Style 2019-03-01 10:53:24 +01:00
Nicola Carminati c2d49d57d6 Fix visuals in tool-in-spindle 2019-02-28 16:11:29 +01:00
Lucio Maranta 290495e9c5 Fix siemens tooltable 2019-02-28 12:04:27 +01:00
Nicola Carminati 69df18cfe3 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2019-02-27 17:56:27 +01:00
Nicola Carminati c487d89af2 Fix Tool visualization in heads 2019-02-27 17:55:36 +01:00
Lucio Maranta f665316d04 Added showval 2019-02-27 17:23:20 +01:00
Nicola Carminati 9116c198cc Fix Read M155 2019-02-26 17:56:01 +01:00
Nicola Carminati c63625fb8b Fix error in Hub.ts 2019-02-26 15:21:06 +01:00
Alessandro d98aecd75b fix 2019-02-26 11:30:56 +01:00
Alessandro b96f43eb2e Merge remote-tracking branch 'origin/develop' into feature/grafici_wp10 2019-02-26 10:24:18 +01:00
Alessandro 0399e6ecb1 fix bar chart 2019-02-26 10:23:50 +01:00
Lucio Maranta 64c0c654d9 Added frequency to report 2019-02-26 10:17:33 +01:00
Alessandro 1d556ab7a4 Merge branch 'develop' into feature/grafici_wp10 2019-02-26 08:26:26 +01:00
Lucio Maranta 0ed46d2d7b Added new tool&family id management 2019-02-25 17:24:02 +01:00
Lucio Maranta 4b735db1ee WP 10 program list 2019-02-25 14:21:12 +01:00
Lucio Maranta be9c0b6a2a Fix tool table
Added installation date
Added W10 programs api
2019-02-22 12:59:08 +01:00
Nicola Carminati 1ee6c0c604 Added process-info 2019-02-22 10:52:56 +01:00
Lucio Maranta 28783d3e02 Fixes
WIP WP10
2019-02-21 13:11:16 +01:00
Lucio Maranta c4761926f4 Fix users
Added Origins & active tool offset
2019-02-20 17:02:29 +01:00
Alessandro d63cc56c46 bar chart 2019-02-20 09:41:12 +01:00
Lucio Maranta d82bf59cfb Create User API 2019-02-20 09:40:20 +01:00