Merge remote-tracking branch 'PCStefan/master'

Provenance Viewer for Taverna

Contributed by Padurariu Stefan (PCStefan)
(ICLA is on file)

This closes #3

TODO:
Remove ruby-graphviz library (GPL2)

Add NOTICE for sankey.js (See #3) - BSD-3 license
https://github.com/d3/d3-plugins/blob/master/LICENSE


Project: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-databundle-viewer/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-databundle-viewer/commit/ccf12b31
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-databundle-viewer/tree/ccf12b31
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-taverna-databundle-viewer/diff/ccf12b31

Branch: refs/heads/master
Commit: ccf12b31b35c7573f5e0a19bb92eb1862481f51b
Parents: a7fdbb0 e3ac7c2
Author: Stian Soiland-Reyes <[email protected]>
Authored: Wed Jun 22 23:29:15 2016 +0100
Committer: Stian Soiland-Reyes <[email protected]>
Committed: Wed Jun 22 23:29:15 2016 +0100

----------------------------------------------------------------------
 Gemfile                                    |   8 +-
 app/assets/javascripts/application.coffee  |   5 +-
 app/assets/javascripts/data_bundle.coffee  | 951 ++++++++++++++++++++++--
 app/assets/javascripts/sankey.js           | 577 ++++++++++++++
 app/assets/javascripts/vertical_sankey.js  | 292 ++++++++
 app/assets/stylesheets/data_bundle.scss    | 107 ++-
 app/controllers/data_bundles_controller.rb |  12 +-
 app/decorators/data_bundle_decorator.rb    |  90 ++-
 app/models/provenance.rb                   | 606 +++++++++++++++
 app/views/data_bundles/edit.html.slim      |   5 +-
 app/views/data_bundles/index.html.slim     |  11 +-
 app/views/data_bundles/show.html.slim      | 109 ++-
 app/views/layouts/application.html.slim    |   2 +-
 config/database.yml                        |  85 +++
 14 files changed, 2743 insertions(+), 117 deletions(-)
----------------------------------------------------------------------


Reply via email to