Homec4science
Diffusion SHRINE MedCo Fork 981c6a37b8c2

Merge branch '1.22.2.x' of https://open.med.harvard.edu/stash/scm/shrine/shrine…
981c6a37b8c2
Actions

Authored by David Walend <david_walend@hms.harvard.edu> on Dec 12 2016, 17:07.

Description

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

Details

Committed
David Walend <david_walend@hms.harvard.edu>Dec 12 2016, 17:07
Pushed
mickmisMar 14 2017, 15:12
Parents
R2664:8b97ba02e01e: Attempt to fix SHRINE-1824 - better error handling if the DSA email audit table…
R2664:102ae7da8213: Fix for SHRINE-1588
Branches
Unknown
Tags
Unknown

Event Timeline

David Walend <david_walend@hms.harvard.edu> committed R2664:981c6a37b8c2: Merge branch '1.22.2.x' of https://open.med.harvard.edu/stash/scm/shrine/shrine… (authored by David Walend <david_walend@hms.harvard.edu>).Dec 12 2016, 17:07

Merged Changes

CommitAuthorDetailsCommitted
102ae7da8213ben-carmen
Fix for SHRINE-1588 
Dec 9 2016
b75812d58e21ben-carmen
fix of clearUsers method missing 
Dec 9 2016
c04a8c3a7324Ty
home-button summary page fix 
Dec 8 2016
d999e1de604bTy
shrine-tools-module readded angular-loading-bar 
Dec 8 2016
7b2041d0ffeeben-carmen
Added fix to truncate username in graphing 
Dec 8 2016
5621ad765682ben-carmen
fix of topic dropdown styles 
Dec 7 2016
32f56ae07837ben-carmen
Merge branch '1.22.2.x' of https://open.med.harvard.edu/stash/scm/shrine/shrine… 
Dec 7 2016
ce24d4ee4914ben-carmen
Fix of dropdown menu issues in Firefox and Safari 
Dec 7 2016
e59c4d981d2eTy
Merge branch '1.22.2.x' of https://open.med.harvard.edu/stash/scm/shrine/shrine… 
Dec 7 2016
c69287b1ee72Ty
removing route change 
Dec 7 2016
ddda69b815f3ben-carmen
fix of dropdown styles 
Dec 7 2016
227458559c45ben-carmen
clarification of parsing logic 
Dec 7 2016
25ed86c99e0aben-carmen
fix of filter by topic query count issue 
Dec 7 2016
550266bac9e4ben-carmen
update of topic dropdown styles 
Dec 6 2016
b7df3d73761dben-carmen
fix of total # of queries calculator 
Dec 6 2016
12b07789be6dben-carmen
fix of query counts 
Dec 6 2016
6abdf024a2adben-carmen
potential fix of subQuery bug 
Dec 6 2016
46e59803152fben-carmen
Merge branch '1.22.2.x' of https://open.med.harvard.edu/stash/scm/shrine/shrine… 
Dec 6 2016
608437bd3447ben-carmen
testing query filter 
Dec 6 2016
8c9a4582a17eTy
replicated fix for home button 
Dec 5 2016
b70bd14b7567Ty
trying to refresh on hitting the home button for a remote dashboard 
Dec 5 2016

Changes (18)

Path
Mapps/dashboard-app/src/main/js/index.html
Mapps/dashboard-app/src/main/js/src/app/diagnostic/views/dashboard.controller.js
Mapps/dashboard-app/src/main/js/src/app/diagnostic/views/summary.controller.js
Mapps/dashboard-app/src/main/js/src/app/header/header.js
Mapps/dashboard-app/src/main/js/src/app/shrine-tools.module.js
Mapps/steward-app/src/main/js/app/assets/css/shrine.css
Mapps/steward-app/src/main/js/app/assets/css/topic-dropdown.css
Mapps/steward-app/src/main/js/app/client/directives/history.tpl.html
Mapps/steward-app/src/main/js/app/client/statistics/query-digest/ontology-term.factory.js
Mapps/steward-app/src/main/js/app/client/statistics/query-digest/ontology-term.service.js
Mapps/steward-app/src/main/js/app/client/statistics/query-digest/topic-dropdown.tpl.html
Mapps/steward-app/src/main/js/app/client/statistics/statistics-graph/statistics-graph.js
Mapps/steward-app/src/main/js/app/client/statistics/statistics-graph/statistics-graph.service.js
Mapps/steward-app/src/main/js/app/client/statistics/statistics-graph/statistics-graph.service.spec.js
Mapps/steward-app/src/main/js/app/client/statistics/statistics-graph/statistics-graph.tpl.html
Mapps/steward-app/src/main/js/app/sass/topic-dropdown.scss
Mapps/steward-app/src/main/js/bower.json
Mapps/steward-app/src/main/js/bower_components/angular/.bower.json

R2664:981c6a37b8c2

View Options

apps/dashboard-app/src/main/js/index.html

Loading...
View Options

apps/dashboard-app/src/main/js/src/app/diagnostic/views/dashboard.controller.js

Loading...
View Options

apps/dashboard-app/src/main/js/src/app/diagnostic/views/summary.controller.js

Loading...
View Options

apps/dashboard-app/src/main/js/src/app/header/header.js

Loading...
View Options

apps/dashboard-app/src/main/js/src/app/shrine-tools.module.js

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/topic-dropdown.css

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

apps/steward-app/src/main/js/app/client/statistics/query-digest/topic-dropdown.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.service.spec.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/sass/topic-dropdown.scss

Loading...
View Options

apps/steward-app/src/main/js/bower.json

Loading...
View Options

apps/steward-app/src/main/js/bower_components/angular/.bower.json

Loading...
c4science · Help