Commit Graph

1312 Commits

Author SHA1 Message Date
Alessandro Francia fcec0df2d5 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-09-24 16:55:51 +02:00
Alessandro Francia 538fa7b5b3 job editor 2018-09-24 16:55:37 +02:00
Lucio Maranta d373bac71b Fix magazine locked 2018-09-24 15:54:49 +02:00
Lucio Maranta a35bce643a Added magazines names, auto open cms client...
Fix alarm bug
2018-09-24 15:28:19 +02:00
Lucio Maranta 3fa38e344c fix: removed "start layer" when there isn't queue configurated 2018-09-24 11:24:46 +02:00
Lucio Maranta 06e61c9e3a Minor job fix 2018-09-24 10:58:23 +02:00
Nicola Carminati f80b64e38e Fix tools name based on options 2018-09-21 16:50:22 +02:00
Alessandro Francia d91e19be83 fix locked magazine 2018-09-21 13:51:24 +02:00
Alessandro Francia aef3dee9fa tooling 2018-09-21 12:22:48 +02:00
Alessandro Francia 5c4a68fcb0 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-09-21 12:07:23 +02:00
Alessandro Francia b1d87d8931 fix magazine blocked 2018-09-21 12:05:44 +02:00
Nicola Carminati adc6adfc11 Added Job Editor in Client CMS 2018-09-21 11:21:45 +02:00
Paolo Possanzini 4e84c2aee7 commenti 2018-09-21 10:11:56 +02:00
Paolo Possanzini d1afe31582 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-09-21 10:09:55 +02:00
Paolo Possanzini 48a60d3022 fix regex osai 2018-09-21 10:09:48 +02:00
Lucio Maranta 744b11ef6c Fix queue storage 2018-09-21 10:06:23 +02:00
Paolo Possanzini f909ba2a9a fix job editor 2018-09-21 10:03:59 +02:00
Paolo Possanzini 46024c0b87 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-09-21 09:29:11 +02:00
Paolo Possanzini 9a18f43c4e fix editor 2018-09-21 09:29:06 +02:00
Alessandro Francia 5718c47392 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-09-21 08:46:09 +02:00
Alessandro Francia d48608ad11 fix breadcrumbs 2018-09-21 08:45:48 +02:00
Paolo Possanzini f4e794034e merge 2018-09-21 08:37:39 +02:00
Paolo Possanzini 37a17d06d2 fix regex 2018-09-21 08:36:46 +02:00
Nicola Carminati 0fbe1e7350 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-09-20 16:53:14 +02:00
Nicola Carminati 4d5358938a Fix tools options 2018-09-20 16:48:16 +02:00
Alessandro Francia 9ce803fdec fix 2018-09-20 16:31:27 +02:00
Alessandro Francia 603e07cd7e fix move element list 2018-09-20 16:19:00 +02:00
Lucio Maranta 13a143957f Added macros API
WIP Job backend
2018-09-20 13:03:02 +02:00
Paolo Possanzini 704eac61d0 fix 2018-09-20 10:56:24 +02:00
Paolo Possanzini 40d2bf9e47 Merge remote-tracking branch 'origin/develop' into develop 2018-09-20 10:55:26 +02:00
Alessandro Francia da92349e0d commit all and fix reps 2018-09-20 09:23:39 +02:00
Alessandro Francia f376ba16d0 fix delete element disappears list 2018-09-20 08:22:15 +02:00
Alessandro Francia ef86b8f266 fix start stop 2018-09-20 07:58:58 +02:00
Lucio Maranta 9653abacda Added value to custom job fields, added is job
Fixed queue
2018-09-19 16:46:44 +02:00
Nicola Carminati d2d532cd18 Fix tooling-equipment names 2018-09-19 16:27:26 +02:00
Alessandro Francia 600a233a41 fix icon trash list element 2018-09-19 15:39:16 +02:00
Alessandro Francia ffb69c979b fix change reps 2018-09-19 14:33:40 +02:00
Alessandro Francia 580748c69b fix 2018-09-19 12:21:29 +02:00
Alessandro Francia 95bdb77175 fix top reps and start stop 2018-09-19 11:54:19 +02:00
Alessandro Francia 35221eff5d fix change reps 2018-09-19 11:39:51 +02:00
Alessandro Francia 0340ad485c fix right-left 2018-09-19 11:17:31 +02:00
Alessandro Francia 3b3d119434 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-09-19 10:52:29 +02:00
Alessandro Francia a61cca2ae2 fix drag box reps 2018-09-19 10:51:41 +02:00
Lucio Maranta caa19c2f7e Fix tool manager 2018-09-18 18:07:33 +02:00
Alessandro Francia bbfd640052 fix 2018-09-18 17:18:44 +02:00
Lucio Maranta 9f7d0f32ca Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-09-18 15:19:56 +02:00
Lucio Maranta 3798122fc1 Added queue storaging 2018-09-18 15:19:00 +02:00
Alessandro Francia 7140accb5e Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-09-18 15:08:19 +02:00
Alessandro Francia 2d0795dbcd block drop program running and finished 2018-09-18 15:07:51 +02:00
Nicola Carminati b7d6353951 Fix Maintenance "canPerform" prop 2018-09-18 10:50:08 +02:00