Commit Graph

1683 Commits

Author SHA1 Message Date
Nicola Carminati d6cea4d302 Export of Alarm History 2019-03-19 18:12:34 +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
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
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
Lucio Maranta 1197305d91 WIP Assisted tooling
Fix maintenance password
2019-03-14 13:26:44 +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
Lucio Maranta f635419c30 WIP Assisted tooling
Fix sofkeys
2019-03-13 16:31:31 +01:00
Lucio Maranta 0da197ebf6 WIP assisisted tooling 2019-03-12 17:41:49 +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