Cortys commented 5 years ago

@RahulSherikar @himadri-kumari Thanks for resolving the conflicts with the master branch!

For the demo we want to include springsecurity as well as the ontology viewer. Those two features are currently in conflict though (since springsecurity is not merged to master yet, this conflict does not show up in #163). In the springsecurity branch the content of the app.component.html was moved to home.component.html to support switching between multiple pages. The RDF ontology viewer has to be moved there. This should hopefully not require much time.

I added all team members that were involved with the conflicting code to this PR. If you see any potential problems with this merge, please let us know.

@nandeeshpatelgp Since you did the tab integration of the viewer, can you take a look?

Thanks!

Cortys commented 5 years ago

@nandeeshpatelgp Thanks for the fast response!

codecov-io commented 5 years ago

Codecov Report

Merging #167 into demo/ss19 will not change coverage. The diff coverage is n/a.

@@             Coverage Diff              @@
##             demo/ss19     #167   +/-   ##
============================================
  Coverage        38.65%   38.65%           
  Complexity         182      182           
============================================
  Files               60       60           
  Lines             1552     1552           
  Branches           154      154           
============================================
  Hits               600      600           
  Misses             916      916           
  Partials            36       36

Continue to review full report at Codecov.

Legend - Click here to learn more Δ = absolute <relative> (impact), ø = not affected, ? = missing data Powered by Codecov. Last update 4255b6e...67d28cd. Read the comment docs.

dice-group / ida-pg

Add RDF ontology graph to demo #167

Codecov Report