Merge branch 'STF678_Task4' into 'STF678_Task3'
# Conflicts: # config/.meepctl-repocfg.yaml # js-apps/frontend/src/js/util/scenario-utils.js
Showing
- config/.meepctl-repocfg.yaml 55 additions, 4 deletionsconfig/.meepctl-repocfg.yaml
- config/api/fed-api.yaml 1464 additions, 0 deletionsconfig/api/fed-api.yaml
- config/api/vis-api.yaml 8 additions, 1 deletionconfig/api/vis-api.yaml
- config/grid_map/grid_map.kml 3113 additions, 0 deletionsconfig/grid_map/grid_map.kml
- config/permissions.yaml 27 additions, 0 deletionsconfig/permissions.yaml
- js-apps/frontend/src/js/app-constants.js 1 addition, 1 deletionjs-apps/frontend/src/js/app-constants.js
- js-apps/frontend/src/js/components/dialogs/detailed-data-dialog.js 14 additions, 11 deletions...rontend/src/js/components/dialogs/detailed-data-dialog.js
- js-apps/frontend/src/js/components/dialogs/version-dialog.js 11 additions, 0 deletionsjs-apps/frontend/src/js/components/dialogs/version-dialog.js
- js-apps/frontend/src/js/containers/app-container.js 1 addition, 1 deletionjs-apps/frontend/src/js/containers/app-container.js
- js-apps/frontend/src/js/containers/home/home-page-container.js 13 additions, 3 deletions...ps/frontend/src/js/containers/home/home-page-container.js
- js-apps/frontend/src/js/containers/sandbox/api-table.js 1 addition, 1 deletionjs-apps/frontend/src/js/containers/sandbox/api-table.js
- networks/4g-5g-macro-v2x-fed.yaml 4302 additions, 0 deletionsnetworks/4g-5g-macro-v2x-fed.yaml
- networks/4g-5g-macro-v2x.yaml 1 addition, 1 deletionnetworks/4g-5g-macro-v2x.yaml
- networks/4g-5g-wifi-macro.yaml 1 addition, 1 deletionnetworks/4g-5g-wifi-macro.yaml
- networks/4g-macro.yaml 1 addition, 1 deletionnetworks/4g-macro.yaml
- networks/4g-wifi-macro.yaml 1 addition, 1 deletionnetworks/4g-wifi-macro.yaml
- networks/dual-mep-4g-5g-wifi-macro.yaml 1 addition, 1 deletionnetworks/dual-mep-4g-5g-wifi-macro.yaml
- networks/dual-mep-short-path.yaml 1 addition, 1 deletionnetworks/dual-mep-short-path.yaml
Loading
Please register or sign in to comment