Commit Graph

1331 Commits

Author SHA1 Message Date
Paolo Possanzini 00e9311499 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-10-01 14:34:22 +02:00
Paolo Possanzini b8afe5ef69 fix 2018-10-01 14:34:17 +02:00
Lucio Maranta 92389956b9 Fix client errors
WIP job loading in the queue
2018-10-01 12:17:19 +02:00
Paolo Possanzini d57d51ab86 fix modale caricamento programmi 2018-09-28 17:20:20 +02:00
Nicola Carminati 622248284c Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop
# Conflicts:
#	Step/wwwroot/src/modules/base-components/load-depot.vue
2018-09-28 16:30:36 +02:00
Alessandro Francia ff1198f5b2 localize 2018-09-28 09:07:26 +02:00
Alessandro Francia 429552ad4c localize 2018-09-28 08:50:14 +02:00
Paolo Possanzini 69164be939 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-09-27 17:33:22 +02:00
Paolo Possanzini baa5bd19d9 fix D&D layout 2018-09-27 17:33:15 +02:00
Lucio Maranta adfafcabd4 Library refactor, divided model by type
Added read/update metadata to the cms client
2018-09-27 17:30:37 +02:00
Paolo Possanzini 013f564374 fix job-editor 2018-09-27 17:07:21 +02:00
Paolo Possanzini c17acb00d0 refactoring jobeditor 2018-09-27 15:17:41 +02:00
Paolo Possanzini 3b7970d972 fix 2018-09-27 14:22:49 +02:00
Alessandro Francia 52666879c6 commit 2018-09-27 13:54:27 +02:00
Nicola Carminati baf27b8bf9 Fix loading from + button in magazine 2018-09-27 09:28:59 +02:00
Alessandro Francia 885fac6a52 fix layout and services 2018-09-26 18:21:27 +02:00
Lucio Maranta 7cacbb13d6 Fix on loading in magazine (temporary) 2018-09-26 09:09:47 +02:00
Alessandro Francia e21ebced8e fix loading 2018-09-24 18:26:14 +02:00
Alessandro Francia 8130a0e577 loadingIsActive fix 2018-09-24 17:59:21 +02:00
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