Homec4science
Diffusion SHRINE MedCo Fork 1a60a9b136f2

Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine…
1a60a9b136f2
Actions

Authored by David Walend <david_walend@hms.harvard.edu> on Nov 1 2016, 19:48.

Description

Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop

Details

Committed
David Walend <david_walend@hms.harvard.edu>Nov 1 2016, 19:48
Pushed
mickmisMar 14 2017, 15:12
Parents
R2664:500e03e5557d: full functionality for demo
R2664:0535b3cf6fe5: Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine…
Branches
Unknown
Tags
Unknown

Event Timeline

David Walend <david_walend@hms.harvard.edu> committed R2664:1a60a9b136f2: Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine… (authored by David Walend <david_walend@hms.harvard.edu>).Nov 1 2016, 19:48

Merged Changes

CommitAuthorDetailsCommitted
500e03e5557dben-carmen
full functionality for demo 
Nov 1 2016
f312d79ecb15ben-carmen
styles for topic filter 
Nov 1 2016
d5e5e02e914fben-carmen
working filter 
Nov 1 2016
33e53ee7d093ben-carmen
latest version of dropdown 
Oct 28 2016
d0a7d7c9ca28ben-carmen
latest version of tooltip 
Oct 27 2016
6c68775695b3ben-carmen
hover styles 
Oct 26 2016
2ba433dbd3beben-carmen
added highight styles and tooltip 
Oct 26 2016
d1581a6591aaben-carmen
added a little more style polish 
Oct 26 2016
942258ada6bbben-carmen
polished styles for ontology tree 
Oct 26 2016

Changes (46)

Path
Mapps/steward-app/src/main/js/.jshintrc
Mapps/steward-app/src/main/js/app/assets/css/query-digest.css
Mapps/steward-app/src/main/js/app/assets/css/shrine.css
Aapps/steward-app/src/main/js/app/assets/css/tooltip.css
Aapps/steward-app/src/main/js/app/assets/css/topic-dropdown.css
Dapps/steward-app/src/main/js/app/client/statistics/directives
Dapps/steward-app/src/main/js/app/client/statistics/directives/ontology-term
Vapps/steward-app/src/main/js/app/client/statistics/{directives → }/ontology-term/ontology-term.factory.js
Vapps/steward-app/src/main/js/app/client/statistics/{directives → }/ontology-term/ontology-term.service.js
Vapps/steward-app/src/main/js/app/client/statistics/{directives → }/ontology-term/ontology-term.service.spec.js
Dapps/steward-app/src/main/js/app/client/statistics/directives/ontology-term/term-digest.js
Vapps/steward-app/src/main/js/app/client/statistics/{directives → }/ontology-term/term-digest.tpl.html
Vapps/steward-app/src/main/js/app/client/statistics/{directives → }/ontology-term/term.js
Vapps/steward-app/src/main/js/app/client/statistics/{directives → }/ontology-term/term.service.js
Vapps/steward-app/src/main/js/app/client/statistics/{directives → }/ontology-term/term.tpl.html
Dapps/steward-app/src/main/js/app/client/statistics/directives/statistics-graph
Vapps/steward-app/src/main/js/app/client/statistics/{directives → }/statistics-graph/bar.js
Vapps/steward-app/src/main/js/app/client/statistics/{directives → }/statistics-graph/bar.tpl.html
Vapps/steward-app/src/main/js/app/client/statistics/{directives → }/statistics-graph/new-topic.tpl.html
Vapps/steward-app/src/main/js/app/client/statistics/{directives → }/statistics-graph/statistics-graph.js
Vapps/steward-app/src/main/js/app/client/statistics/{directives → }/statistics-graph/statistics-graph.service.js
Dapps/steward-app/src/main/js/app/client/statistics/directives/statistics-graph/statistics-graph.tpl.html
A(dir)apps/steward-app/src/main/js/app/client/statistics/ontology-term/
Vapps/steward-app/src/main/js/app/client/statistics/{ ← directives}/ontology-term/ontology-term.factory.js
Vapps/steward-app/src/main/js/app/client/statistics/{ ← directives}/ontology-term/ontology-term.service.js
Vapps/steward-app/src/main/js/app/client/statistics/{ ← directives}/ontology-term/ontology-term.service.spec.js
Aapps/steward-app/src/main/js/app/client/statistics/ontology-term/term-digest.js
Vapps/steward-app/src/main/js/app/client/statistics/{ ← directives}/ontology-term/term-digest.tpl.html
Vapps/steward-app/src/main/js/app/client/statistics/{ ← directives}/ontology-term/term.js
Vapps/steward-app/src/main/js/app/client/statistics/{ ← directives}/ontology-term/term.service.js
Vapps/steward-app/src/main/js/app/client/statistics/{ ← directives}/ontology-term/term.tpl.html
Aapps/steward-app/src/main/js/app/client/statistics/ontology-term/topic-dropdown.js
Aapps/steward-app/src/main/js/app/client/statistics/ontology-term/topic-dropdown.tpl.html
A(dir)apps/steward-app/src/main/js/app/client/statistics/statistics-graph/
Vapps/steward-app/src/main/js/app/client/statistics/{ ← directives}/statistics-graph/bar.js
Vapps/steward-app/src/main/js/app/client/statistics/{ ← directives}/statistics-graph/bar.tpl.html
Vapps/steward-app/src/main/js/app/client/statistics/{ ← directives}/statistics-graph/new-topic.tpl.html
Vapps/steward-app/src/main/js/app/client/statistics/{ ← directives}/statistics-graph/statistics-graph.js
Vapps/steward-app/src/main/js/app/client/statistics/{ ← directives}/statistics-graph/statistics-graph.service.js
Aapps/steward-app/src/main/js/app/client/statistics/statistics-graph/statistics-graph.tpl.html
Mapps/steward-app/src/main/js/app/client/statistics/statistics.controller.js
Mapps/steward-app/src/main/js/app/client/statistics/statistics.tpl.html
Mapps/steward-app/src/main/js/app/sass/query-digest.scss
Mapps/steward-app/src/main/js/app/sass/shrine.scss
Aapps/steward-app/src/main/js/app/sass/tooltip.scss
Aapps/steward-app/src/main/js/app/sass/topic-dropdown.scss

R2664:1a60a9b136f2

View Options

apps/steward-app/src/main/js/.jshintrc

Loading...
View Options

apps/steward-app/src/main/js/app/assets/css/query-digest.css

Loading...
View Options

apps/steward-app/src/main/js/app/assets/css/shrine.css

Loading...
View Options

apps/steward-app/src/main/js/app/assets/css/tooltip.css

Loading...
View Options

apps/steward-app/src/main/js/app/assets/css/topic-dropdown.css

Loading...
View Options

apps/steward-app/src/main/js/app/client/statistics/directives

Loading...
View Options

apps/steward-app/src/main/js/app/client/statistics/directives/ontology-term

Loading...
View Options

apps/steward-app/src/main/js/app/client/statistics/directives/ontology-term/ontology-term.factory.js

Loading...
View Options

apps/steward-app/src/main/js/app/client/statistics/directives/ontology-term/ontology-term.service.js

Loading...
View Options

apps/steward-app/src/main/js/app/client/statistics/directives/ontology-term/ontology-term.service.spec.js

Loading...
View Options

apps/steward-app/src/main/js/app/client/statistics/directives/ontology-term/term-digest.js

Loading...
View Options

apps/steward-app/src/main/js/app/client/statistics/directives/ontology-term/term-digest.tpl.html

Loading...
View Options

apps/steward-app/src/main/js/app/client/statistics/directives/ontology-term/term.js

Loading...
View Options

apps/steward-app/src/main/js/app/client/statistics/directives/ontology-term/term.service.js

Loading...
View Options

apps/steward-app/src/main/js/app/client/statistics/directives/ontology-term/term.tpl.html

Loading...
View Options

apps/steward-app/src/main/js/app/client/statistics/directives/statistics-graph

Loading...
View Options

apps/steward-app/src/main/js/app/client/statistics/directives/statistics-graph/bar.js

Loading...
View Options

apps/steward-app/src/main/js/app/client/statistics/directives/statistics-graph/bar.tpl.html

Loading...
View Options

apps/steward-app/src/main/js/app/client/statistics/directives/statistics-graph/new-topic.tpl.html

Loading...
View Options

apps/steward-app/src/main/js/app/client/statistics/directives/statistics-graph/statistics-graph.js

Loading...
View Options

apps/steward-app/src/main/js/app/client/statistics/directives/statistics-graph/statistics-graph.service.js

Loading...
View Options

apps/steward-app/src/main/js/app/client/statistics/directives/statistics-graph/statistics-graph.tpl.html

Loading...
View Options

apps/steward-app/src/main/js/app/client/statistics/ontology-term/ontology-term.factory.js

Loading...
View Options

apps/steward-app/src/main/js/app/client/statistics/ontology-term/ontology-term.service.js

Loading...
View Options

apps/steward-app/src/main/js/app/client/statistics/ontology-term/ontology-term.service.spec.js

Loading...
View Options

apps/steward-app/src/main/js/app/client/statistics/ontology-term/term-digest.js

Loading...
View Options

apps/steward-app/src/main/js/app/client/statistics/ontology-term/term-digest.tpl.html

Loading...
View Options

apps/steward-app/src/main/js/app/client/statistics/ontology-term/term.js

Loading...
View Options

apps/steward-app/src/main/js/app/client/statistics/ontology-term/term.service.js

Loading...
View Options

apps/steward-app/src/main/js/app/client/statistics/ontology-term/term.tpl.html

Loading...
View Options

apps/steward-app/src/main/js/app/client/statistics/ontology-term/topic-dropdown.js

Loading...
View Options

apps/steward-app/src/main/js/app/client/statistics/ontology-term/topic-dropdown.tpl.html

Loading...
View Options

apps/steward-app/src/main/js/app/client/statistics/statistics-graph/bar.js

Loading...
View Options

apps/steward-app/src/main/js/app/client/statistics/statistics-graph/bar.tpl.html

Loading...
View Options

apps/steward-app/src/main/js/app/client/statistics/statistics-graph/new-topic.tpl.html

Loading...
View Options

apps/steward-app/src/main/js/app/client/statistics/statistics-graph/statistics-graph.js

Loading...
View Options

apps/steward-app/src/main/js/app/client/statistics/statistics-graph/statistics-graph.service.js

Loading...
View Options

apps/steward-app/src/main/js/app/client/statistics/statistics-graph/statistics-graph.tpl.html

Loading...
View Options

apps/steward-app/src/main/js/app/client/statistics/statistics.controller.js

Loading...
View Options

apps/steward-app/src/main/js/app/client/statistics/statistics.tpl.html

Loading...
View Options

apps/steward-app/src/main/js/app/sass/query-digest.scss

Loading...
View Options

apps/steward-app/src/main/js/app/sass/shrine.scss

Loading...
View Options

apps/steward-app/src/main/js/app/sass/tooltip.scss

Loading...
View Options

apps/steward-app/src/main/js/app/sass/topic-dropdown.scss

Loading...
c4science · Help