Commit Graph

2980 Commits

Author SHA1 Message Date
Paolo Possanzini 894765881b fix backdrop 2018-04-05 10:14:21 +02:00
Paolo Possanzini c89dcf1e1d Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-04-04 17:29:34 +02:00
Paolo Possanzini 9317c8330e softgeys grouped 2018-04-04 17:29:26 +02:00
Lucio Maranta 10459313f6 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-04-04 16:56:07 +02:00
Lucio Maranta d94e10ac9b Fix demo select process
And WIP siemens library
2018-04-04 16:55:29 +02:00
Paolo Possanzini b32cac477f fix 2018-04-04 16:50:42 +02:00
Paolo Possanzini 50d99b2b7f active 2018-04-04 16:03:00 +02:00
Paolo Possanzini b5e02c8307 fix 2018-04-04 15:46:41 +02:00
Paolo Possanzini 4a6a1827e8 confirm 2018-04-04 15:39:23 +02:00
Paolo Possanzini dee02c01a1 confirm 2018-04-04 15:26:36 +02:00
Paolo Possanzini cea2ec10ed Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-04-04 15:09:12 +02:00
Paolo Possanzini b60e1401b2 waiting confirm 2018-04-04 15:09:06 +02:00
Nicola Carminati 2469548d21 Revert "Added transition"
This reverts commit 5323dd5740.
2018-04-04 12:05:42 +02:00
Nicola Carminati 5323dd5740 Added transition 2018-04-04 12:00:48 +02:00
Nicola Carminati ce69226bf4 Fix Style 2018-04-04 11:52:56 +02:00
Nicola Carminati 7ec21d966d Fix pressed-softkey Style + Checkbox Click Prevent 2018-04-04 11:41:49 +02:00
Nicola Carminati 5b2e4906a3 Fix User-Softkey style 2018-04-03 16:15:43 +02:00
Paolo Possanzini 948b5a5743 active command 2018-04-03 15:22:08 +02:00
Paolo Possanzini d61a4bc871 fix 2018-04-03 15:05:57 +02:00
Paolo Possanzini 7427cb85e2 fix disabled 2018-04-03 13:07:12 +02:00
Paolo Possanzini aa91f9024c pls softkeys 2018-04-03 12:31:16 +02:00
Paolo Possanzini 76181d2b04 layout ok 2018-04-03 11:33:22 +02:00
Paolo Possanzini 127235d686 css fix 2018-04-03 11:26:24 +02:00
Alessandro Francia a9f820c793 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-03-30 17:33:22 +02:00
Alessandro Francia 88c5ddb9c6 depot 2018-03-30 17:32:57 +02:00
Lucio Maranta 1a9fbde785 Fix alarm id
Fix Osai Library
2018-03-30 16:02:13 +02:00
Paolo Possanzini b6bb0afc75 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-03-29 17:02:50 +02:00
Paolo Possanzini 635e7c9bbd process 2018-03-29 17:02:41 +02:00
Nicola Carminati 8d41d0a076 Fix Heads Style + Plc Softkeys 2018-03-29 16:47:39 +02:00
Paolo Possanzini e9d26fe04b alarm plc 2018-03-29 16:40:04 +02:00
Paolo Possanzini becec17029 finalmente la backdrop 2018-03-29 16:22:01 +02:00
Paolo Possanzini d6111c53d4 varie + placeholders 2018-03-29 15:10:58 +02:00
Paolo Possanzini d4f7fc4d39 softkeys enabled 2018-03-29 10:39:14 +02:00
Paolo Possanzini 9a05e2ec5f fix 2018-03-29 09:35:08 +02:00
Alessandro Francia 3c99c91c52 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-03-28 18:00:06 +02:00
Alessandro Francia a16a068140 tooling, card, depot 2018-03-28 17:59:34 +02:00
Lucio Maranta 63d2ce8f4a Fix configuration
Fix Functionality and PLC id matching
2018-03-28 17:31:32 +02:00
Nicola Carminati 5187bd9d15 Fix Incr. Menu Style 2018-03-28 12:49:21 +02:00
Paolo Possanzini c6366ceb29 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-03-28 12:38:23 +02:00
Paolo Possanzini 682791b4c5 incmenu container position 2018-03-28 12:38:14 +02:00
Nicola Carminati 0a2aec51a7 Style Fix 2018-03-28 12:36:50 +02:00
Paolo Possanzini 924636dfca inc 2018-03-28 12:21:38 +02:00
Paolo Possanzini 56bfe35976 inc.. 2018-03-28 12:21:27 +02:00
Paolo Possanzini 728c0916ab Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-03-28 12:06:24 +02:00
Paolo Possanzini 6bc80e84f1 minus 2018-03-28 12:06:20 +02:00
Nicola Carminati 9153967bfb Fix Hotkey functions 2018-03-28 12:04:22 +02:00
Paolo Possanzini 139fd7e381 tooling presets 2018-03-28 10:22:01 +02:00
Lucio Maranta 3c8e29a354 Fix selected axis not updated 2018-03-27 17:15:08 +02:00
Nicola Carminati 6a15536f1f Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-03-27 17:08:45 +02:00
Nicola Carminati beaeae3643 Fix Heads & Processes Style 2018-03-27 17:07:53 +02:00