Code Review / sdc.git / commit
? search:
summary | shortlog | log | commit | commitdiff | review | tree
(parent: 0f3a808) | patch
Fixed merge issues 47/35547/1
authorIdan Amit <ia096e@intl.att.com>
Tue, 13 Mar 2018 17:59:46 +0000 (19:59 +0200)
committerIdan Amit <ia096e@intl.att.com>
Tue, 13 Mar 2018 18:02:12 +0000 (20:02 +0200)
commitfad1d735d7ac3896e28277c733920d15e105db6e
tree22dabd78b1383707776fc06ccd1c8b5814461131tree | snapshot
parent0f3a80869bf57fc909ec5908601ba04271d92d97commit | diff
Fixed merge issues

Fixed merge issues that broke the behavior of the plugins development

Change-Id: I6333944939628f745eb36c4619be33780881d27d
Issue-ID: SDC-1126
Signed-off-by: Idan Amit <ia096e@intl.att.com>
catalog-ui/configurations/dev.js diff | blob | history
catalog-ui/src/app/ng2/components/layout/top-nav/top-nav.component.ts diff | blob | history
catalog-ui/src/app/ng2/components/ui/plugin/plugin-frame.component.ts diff | blob | history
catalog-ui/src/app/ng2/services/plugins.service.ts diff | blob | history
catalog-ui/src/app/services/components/component-service.ts diff | blob | history
catalog-ui/src/app/services/components/service-service.ts diff | blob | history
catalog-ui/src/app/view-models/workspace/workspace-view-model.ts diff | blob | history
catalog-ui/src/app/view-models/workspace/workspace-view.html diff | blob | history
catalog-ui/webpack.server.js diff | blob | history
SDC Parent Project Catalog FE and BE