Commit Graph

1708 Commits

Author SHA1 Message Date
Nicola Carminati f8de8f9fa3 Added in frontend 2019-04-02 08:16:08 +02:00
Giacomo Canonico 5940c5daf7 Merge remote-tracking branch 'origin/develop' into develop 2019-03-26 18:17:42 +01:00
Giacomo Canonico c53d08fce4 Commit bugfix grafica WP10 2019-03-26 18:17:27 +01:00
Nicola Carminati 638b0f2118 fix Family deleting & tool selection 2019-03-26 17:06:54 +01:00
Lucio Maranta 7ed87452a4 Fix ACTIVE error management
Fix tool table cancel buttons
Removed deleted button in edit
2019-03-26 17:01:29 +01:00
Lucio Maranta 3573c95f1a Merge branch 'Prod_Window_Integrated' into develop 2019-03-26 14:48:50 +01:00
Lucio Maranta 4d80694ee1 Refactoring NcHandler.cs in multiple classes
Fix tool table block
2019-03-25 17:02:33 +01:00
Giacomo Canonico 2b5ec22f94 Auto stash before merge of "develop" and "origin/develop" 2019-03-25 11:30:09 +01:00
Nicola Carminati c519d82f1b Added configurations 2019-03-22 16:57:38 +01:00
Nicola Carminati 03e953bbf1 First commit 2019-03-21 17:52:55 +01:00
Nicola Carminati 7ae6237248 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2019-03-21 12:43:21 +01:00
Nicola Carminati 5fe808dfdb Fix Radius/Diameter configuration 2019-03-21 12:42:26 +01:00
Lucio Maranta 63ecfc2820 Fix alarms user
Loadin magazine
2019-03-21 11:28:37 +01:00
Nicola Carminati a2aa8630f6 Merge branch 'User_Manager' into develop 2019-03-20 17:05:04 +01:00
Nicola Carminati 20d6297c28 Fix password change 2019-03-20 17:01:29 +01:00
Lucio Maranta 0ed9ef5fde fix magazine translations 2019-03-20 17:00:45 +01:00
Lucio Maranta 4892340a26 Assistedtooling fix
Fix siemens tool table
Added dynamic tool in spindle
2019-03-20 16:56:10 +01:00
Nicola Carminati ea4420dff7 Merge branch 'develop' into User_Manager 2019-03-20 16:28:19 +01:00
Nicola Carminati 023b688c43 Added info on selected process 2019-03-20 16:22:59 +01:00
Nicola Carminati ec020e4b8e added "change password" feature 2019-03-20 15:41:00 +01:00
Nicola Carminati 5ad4f7f909 Fix reading U.measure of selected process 2019-03-20 15:39:45 +01:00
Nicola Carminati 9a9c7e0982 Rollback token reading 2019-03-20 08:37:41 +01:00
Nicola Carminati d6cea4d302 Export of Alarm History 2019-03-19 18:12:34 +01:00
Lucio Maranta cd817220d7 Fix 2019-03-19 17:19:55 +01:00
Lucio Maranta 5e25896c32 WIP Assisted tooling 2019-03-19 17:14:42 +01:00
Nicola Carminati ac66236eaa Fixing: Loading images, translations, alarm source 2019-03-19 11:18:34 +01:00
Nicola Carminati 3dae3fdbac First commit of alarm-history translation 2019-03-18 18:46:51 +01:00
Nicola Carminati 8ff5769e3b Fix users translations 2019-03-18 18:28:38 +01:00
Nicola Carminati 13f5932754 Added configuration 2019-03-18 18:03:52 +01:00
Nicola Carminati e96010e8e6 Added functionality to User Manager 2019-03-18 17:18:16 +01:00
Lucio Maranta 8183e30a69 Added rotation type into heads
WIP Assisted tooling
2019-03-18 16:53:22 +01:00
Nicola Carminati 3225276560 Merge branch 'develop' into User_Manager 2019-03-17 17:09:21 +01:00
Giacomo Canonico ba72e68a6a Merge branch 'feature/grafici_wp10' into develop 2019-03-15 16:24:20 +01:00
Giacomo Canonico 2fad484fc1 Merge remote-tracking branch 'origin/feature/grafici_wp10' into feature/grafici_wp10 2019-03-15 16:21:55 +01:00
Giacomo Canonico 4ebe8f0828 last update to align the graphic to zeplin 2019-03-15 16:21:49 +01:00
Alessandro 402311c02e fix 2019-03-15 16:17:36 +01:00
Giacomo Canonico 412d3efc85 chart improve 2019-03-15 15:12:20 +01:00
Lucio Maranta 436c9efb21 FIX assisted tooling
Fix maintenances
2019-03-15 12:49:18 +01:00
Giacomo Canonico 72c66e5d48 Merge remote-tracking branch 'origin/feature/grafici_wp10' into feature/grafici_wp10 2019-03-15 11:54:45 +01:00
Giacomo Canonico 94c41553d1 timeline tooltip 2019-03-15 11:54:42 +01:00
Alessandro e0ff30fc44 style tooltip production 2019-03-15 10:44:17 +01:00
Giacomo Canonico a1cf7102f0 fix merge tooltip 2019-03-15 10:33:44 +01:00
Giacomo Canonico b488dd6134 Auto stash before merge of "feature/grafici_wp10" and "origin/feature/grafici_wp10" 2019-03-15 10:30:15 +01:00
Alessandro d9bdf2834b style tooltip production in tooltip.less 2019-03-15 10:28:01 +01:00
Giacomo Canonico 7fd4af327e Merge remote-tracking branch 'origin/feature/grafici_wp10' into feature/grafici_wp10 2019-03-15 10:08:24 +01:00
Giacomo Canonico 3712d26f28 fix style card.less after merge 2019-03-15 10:07:57 +01:00
Nicola Carminati 87c3c10976 Fix Alarm-list Bugs 2019-03-15 09:35:08 +01:00
Alessandro 795001200f Merge remote-tracking branch 'origin/feature/grafici_wp10' into feature/grafici_wp10 2019-03-15 09:19:39 +01:00
Alessandro be3353153b package 2019-03-15 09:19:25 +01:00
Giacomo Canonico d103af863a timeline date fix nuovo formato data 2019-03-15 09:18:00 +01:00