Diffusion SHRINE MedCo Fork 34389254ce4f

open.med.harvard.
34389254ce4f
Actions

Authored by Ty <Ty_Coghlan@hms.harvard.dedu> on Aug 3 2016, 20:51.

Description

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

Details

Committed

Ty <Ty_Coghlan@hms.harvard.dedu>

Aug 3 2016, 20:51

Pushed

mickmis

Mar 14 2017, 15:12

Parents

R2664:5c0208c630df: fixed floorMod bug
R2664:899a18c2b660: fix of unresponsive history when pagination is switched

Branches

Unknown

Tags

Unknown

Event Timeline

Ty <Ty_Coghlan@hms.harvard.dedu> committed R2664:34389254ce4f: Merge branch 'release/1.22.0' of https://open.med.harvard. (authored by Ty <Ty_Coghlan@hms.harvard.dedu>).Aug 3 2016, 20:51

Merged Changes

Commit	Author	Details	Committed
899a18c2b660	Benjamin Carmen	fix of unresponsive history when pagination is switched	Aug 3 2016
b103b1e57a7d	Benjamin Carmen	fix for login centering issue	Aug 3 2016
02d963382117	Benjamin Carmen	change to statistics.controller so that it loads the initial statistics	Aug 3 2016
ce45cd13fd0d	Benjamin Carmen	fixed pagination last/first >> << issue	Aug 3 2016
e7c6f2d484f4	Benjamin Carmen	fix of issues with pagination and logout	Aug 3 2016

Changes (137)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

		Path
M		apps/steward-app/src/main/js/app/client/directives/history.js
M		apps/steward-app/src/main/js/app/client/directives/history.tpl.html
M		apps/steward-app/src/main/js/app/client/history/history.module.js
M		apps/steward-app/src/main/js/app/client/statistics/statistics.controller.js
M		apps/steward-app/src/main/js/app/client/statistics/statistics.module.js
M		apps/steward-app/src/main/js/app/client/statistics/statistics.tpl.html
M		apps/steward-app/src/main/js/app/client/steward.controller.js
M		apps/steward-app/src/main/js/app/client/steward.service.js
M		apps/steward-app/src/main/js/app/client/topics/topics.module.js
M		apps/steward-app/src/main/js/app/client/topics/topics.tpl.html
M		apps/steward-app/src/main/js/bower.json
M		apps/steward-app/src/main/js/bower_components/angular-animate/.bower.json
M		apps/steward-app/src/main/js/bower_components/bootstrap/.bower.json
A		apps/steward-app/src/main/js/bower_components/bootstrap/Gemfile
A		apps/steward-app/src/main/js/bower_components/bootstrap/Gemfile.lock
M		apps/steward-app/src/main/js/bower_components/bootstrap/Gruntfile.js
A		apps/steward-app/src/main/js/bower_components/bootstrap/ISSUE_TEMPLATE.md
M		apps/steward-app/src/main/js/bower_components/bootstrap/LICENSE
M		apps/steward-app/src/main/js/bower_components/bootstrap/README.md
M		apps/steward-app/src/main/js/bower_components/bootstrap/bower.json
M		apps/steward-app/src/main/js/bower_components/bootstrap/dist/css/bootstrap-theme.css
M		apps/steward-app/src/main/js/bower_components/bootstrap/dist/css/bootstrap-theme.css.map
M		apps/steward-app/src/main/js/bower_components/bootstrap/dist/css/bootstrap-theme.min.css
M		apps/steward-app/src/main/js/bower_components/bootstrap/dist/css/bootstrap-theme.min.css.map
M		apps/steward-app/src/main/js/bower_components/bootstrap/dist/css/bootstrap.css
M		apps/steward-app/src/main/js/bower_components/bootstrap/dist/css/bootstrap.css.map
M		apps/steward-app/src/main/js/bower_components/bootstrap/dist/css/bootstrap.min.css
M		apps/steward-app/src/main/js/bower_components/bootstrap/dist/css/bootstrap.min.css.map
M		apps/steward-app/src/main/js/bower_components/bootstrap/dist/js/bootstrap.js
M		apps/steward-app/src/main/js/bower_components/bootstrap/dist/js/bootstrap.min.js
A		apps/steward-app/src/main/js/bower_components/bootstrap/grunt/change-version.js
M		apps/steward-app/src/main/js/bower_components/bootstrap/grunt/configBridge.json
A		apps/steward-app/src/main/js/bower_components/bootstrap/grunt/npm-shrinkwrap.json
M		apps/steward-app/src/main/js/bower_components/bootstrap/grunt/sauce_browsers.yml
M		apps/steward-app/src/main/js/bower_components/bootstrap/js/affix.js
M		apps/steward-app/src/main/js/bower_components/bootstrap/js/alert.js
M		apps/steward-app/src/main/js/bower_components/bootstrap/js/button.js
M		apps/steward-app/src/main/js/bower_components/bootstrap/js/carousel.js
M		apps/steward-app/src/main/js/bower_components/bootstrap/js/collapse.js
M		apps/steward-app/src/main/js/bower_components/bootstrap/js/dropdown.js
M		apps/steward-app/src/main/js/bower_components/bootstrap/js/modal.js
M		apps/steward-app/src/main/js/bower_components/bootstrap/js/popover.js
M		apps/steward-app/src/main/js/bower_components/bootstrap/js/scrollspy.js
M		apps/steward-app/src/main/js/bower_components/bootstrap/js/tab.js
M		apps/steward-app/src/main/js/bower_components/bootstrap/js/tooltip.js
M		apps/steward-app/src/main/js/bower_components/bootstrap/js/transition.js
M		apps/steward-app/src/main/js/bower_components/bootstrap/less/bootstrap.less
M		apps/steward-app/src/main/js/bower_components/bootstrap/less/button-groups.less
M		apps/steward-app/src/main/js/bower_components/bootstrap/less/forms.less
M		apps/steward-app/src/main/js/bower_components/bootstrap/less/input-groups.less
M		apps/steward-app/src/main/js/bower_components/bootstrap/less/mixins/tab-focus.less
M		apps/steward-app/src/main/js/bower_components/bootstrap/less/panels.less
M		apps/steward-app/src/main/js/bower_components/bootstrap/less/scaffolding.less
M		apps/steward-app/src/main/js/bower_components/bootstrap/less/theme.less
M		apps/steward-app/src/main/js/bower_components/bootstrap/less/variables.less
M		apps/steward-app/src/main/js/bower_components/bootstrap/nuget/MyGet.ps1
M		apps/steward-app/src/main/js/bower_components/bootstrap/nuget/bootstrap.less.nuspec
M		apps/steward-app/src/main/js/bower_components/bootstrap/nuget/bootstrap.nuspec
M		apps/steward-app/src/main/js/bower_components/bootstrap/package.js
M		apps/steward-app/src/main/js/bower_components/bootstrap/package.json
V	(dir)	apps/steward-app/src/main/js/{bower_components/ngAnimate/ → ngAnimate}
V		apps/steward-app/src/main/js/{bower_components → }/ngAnimate/.bower.json
V	(dir)	apps/steward-app/src/main/js/{bower_components/ngAnimate/.sass-cache/ → ngAnimate/.sass-cache}
V	(dir)	apps/steward-app/src/main/js/{bower_components/ngAnimate/.sass-cache/7fdab734b2caa40e59f92a90ad814fb25f2984ec/ → ngAnimate/.sass-cache/7fdab734b2caa40e59f92a90ad814fb25f2984ec}
V		apps/steward-app/src/main/js/{bower_components → }/ngAnimate/.sass-cache/7fdab734b2caa40e59f92a90ad814fb25f2984ec/ng-animation.scssc
V		apps/steward-app/src/main/js/{bower_components → }/ngAnimate/.sass-cache/7fdab734b2caa40e59f92a90ad814fb25f2984ec/style.scssc
V		apps/steward-app/src/main/js/{bower_components → }/ngAnimate/README.md
V		apps/steward-app/src/main/js/{bower_components → }/ngAnimate/config.rb
V	(dir)	apps/steward-app/src/main/js/{bower_components/ngAnimate/css/ → ngAnimate/css}
V	(dir)	apps/steward-app/src/main/js/{bower_components/ngAnimate/css/fontello/ → ngAnimate/css/fontello}
V		apps/steward-app/src/main/js/{bower_components → }/ngAnimate/css/fontello/LICENSE.txt
V		apps/steward-app/src/main/js/{bower_components → }/ngAnimate/css/fontello/README.txt
V		apps/steward-app/src/main/js/{bower_components → }/ngAnimate/css/fontello/config.json
V	(dir)	apps/steward-app/src/main/js/{bower_components/ngAnimate/css/fontello/css/ → ngAnimate/css/fontello/css}
V		apps/steward-app/src/main/js/{bower_components → }/ngAnimate/css/fontello/css/animation.css
V		apps/steward-app/src/main/js/{bower_components → }/ngAnimate/css/fontello/css/fontello-codes.css
V		apps/steward-app/src/main/js/{bower_components → }/ngAnimate/css/fontello/css/fontello-embedded.css
V		apps/steward-app/src/main/js/{bower_components → }/ngAnimate/css/fontello/css/fontello-ie7-codes.css
V		apps/steward-app/src/main/js/{bower_components → }/ngAnimate/css/fontello/css/fontello-ie7.css
V		apps/steward-app/src/main/js/{bower_components → }/ngAnimate/css/fontello/css/fontello.css
V		apps/steward-app/src/main/js/{bower_components → }/ngAnimate/css/fontello/demo.html
V	(dir)	apps/steward-app/src/main/js/{bower_components/ngAnimate/css/fontello/font/ → ngAnimate/css/fontello/font}
V		apps/steward-app/src/main/js/{bower_components → }/ngAnimate/css/fontello/font/fontello.eot
V		apps/steward-app/src/main/js/{bower_components → }/ngAnimate/css/fontello/font/fontello.svg
V		apps/steward-app/src/main/js/{bower_components → }/ngAnimate/css/fontello/font/fontello.ttf
V		apps/steward-app/src/main/js/{bower_components → }/ngAnimate/css/fontello/font/fontello.woff
V		apps/steward-app/src/main/js/{bower_components → }/ngAnimate/css/ng-animation.css
V		apps/steward-app/src/main/js/{bower_components → }/ngAnimate/css/style.css
V		apps/steward-app/src/main/js/{bower_components → }/ngAnimate/index.html
V	(dir)	apps/steward-app/src/main/js/{bower_components/ngAnimate/js/ → ngAnimate/js}
V		apps/steward-app/src/main/js/{bower_components → }/ngAnimate/js/angular-animate.min.js
V		apps/steward-app/src/main/js/{bower_components → }/ngAnimate/js/angular.min.js
V		apps/steward-app/src/main/js/{bower_components → }/ngAnimate/js/app.js
V		apps/steward-app/src/main/js/{bower_components → }/ngAnimate/js/jquery.js
V	(dir)	apps/steward-app/src/main/js/{bower_components/ngAnimate/sass/ → ngAnimate/sass}
V		apps/steward-app/src/main/js/{bower_components → }/ngAnimate/sass/ng-animation.scss
V		apps/steward-app/src/main/js/{bower_components → }/ngAnimate/sass/style.scss
M		apps/steward-app/src/main/js/index.html
V	(dir)	apps/steward-app/src/main/js/{ngAnimate/ ← bower_components/ngAnimate}
V		apps/steward-app/src/main/js/{ ← bower_components}/ngAnimate/.bower.json
V	(dir)	apps/steward-app/src/main/js/{ngAnimate/.sass-cache/ ← bower_components/ngAnimate/.sass-cache}
V	(dir)	apps/steward-app/src/main/js/{ngAnimate/.sass-cache/7fdab734b2caa40e59f92a90ad814fb25f2984ec/ ← bower_components/ngAnimate/.sass-cache/7fdab734b2caa40e59f92a90ad814fb25f2984ec}
V		apps/steward-app/src/main/js/{ ← bower_components}/ngAnimate/.sass-cache/7fdab734b2caa40e59f92a90ad814fb25f2984ec/ng-animation.scssc
V		apps/steward-app/src/main/js/{ ← bower_components}/ngAnimate/.sass-cache/7fdab734b2caa40e59f92a90ad814fb25f2984ec/style.scssc
V		apps/steward-app/src/main/js/{ ← bower_components}/ngAnimate/README.md
V		apps/steward-app/src/main/js/{ ← bower_components}/ngAnimate/config.rb
V	(dir)	apps/steward-app/src/main/js/{ngAnimate/css/ ← bower_components/ngAnimate/css}
V	(dir)	apps/steward-app/src/main/js/{ngAnimate/css/fontello/ ← bower_components/ngAnimate/css/fontello}
V		apps/steward-app/src/main/js/{ ← bower_components}/ngAnimate/css/fontello/LICENSE.txt
V		apps/steward-app/src/main/js/{ ← bower_components}/ngAnimate/css/fontello/README.txt
V		apps/steward-app/src/main/js/{ ← bower_components}/ngAnimate/css/fontello/config.json
V	(dir)	apps/steward-app/src/main/js/{ngAnimate/css/fontello/css/ ← bower_components/ngAnimate/css/fontello/css}
V		apps/steward-app/src/main/js/{ ← bower_components}/ngAnimate/css/fontello/css/animation.css
V		apps/steward-app/src/main/js/{ ← bower_components}/ngAnimate/css/fontello/css/fontello-codes.css
V		apps/steward-app/src/main/js/{ ← bower_components}/ngAnimate/css/fontello/css/fontello-embedded.css
V		apps/steward-app/src/main/js/{ ← bower_components}/ngAnimate/css/fontello/css/fontello-ie7-codes.css
V		apps/steward-app/src/main/js/{ ← bower_components}/ngAnimate/css/fontello/css/fontello-ie7.css
V		apps/steward-app/src/main/js/{ ← bower_components}/ngAnimate/css/fontello/css/fontello.css
V		apps/steward-app/src/main/js/{ ← bower_components}/ngAnimate/css/fontello/demo.html
V	(dir)	apps/steward-app/src/main/js/{ngAnimate/css/fontello/font/ ← bower_components/ngAnimate/css/fontello/font}
V		apps/steward-app/src/main/js/{ ← bower_components}/ngAnimate/css/fontello/font/fontello.eot
V		apps/steward-app/src/main/js/{ ← bower_components}/ngAnimate/css/fontello/font/fontello.svg
V		apps/steward-app/src/main/js/{ ← bower_components}/ngAnimate/css/fontello/font/fontello.ttf
V		apps/steward-app/src/main/js/{ ← bower_components}/ngAnimate/css/fontello/font/fontello.woff
V		apps/steward-app/src/main/js/{ ← bower_components}/ngAnimate/css/ng-animation.css
V		apps/steward-app/src/main/js/{ ← bower_components}/ngAnimate/css/style.css
V		apps/steward-app/src/main/js/{ ← bower_components}/ngAnimate/index.html
V	(dir)	apps/steward-app/src/main/js/{ngAnimate/js/ ← bower_components/ngAnimate/js}
V		apps/steward-app/src/main/js/{ ← bower_components}/ngAnimate/js/angular-animate.min.js
V		apps/steward-app/src/main/js/{ ← bower_components}/ngAnimate/js/angular.min.js
V		apps/steward-app/src/main/js/{ ← bower_components}/ngAnimate/js/app.js
V		apps/steward-app/src/main/js/{ ← bower_components}/ngAnimate/js/jquery.js
V	(dir)	apps/steward-app/src/main/js/{ngAnimate/sass/ ← bower_components/ngAnimate/sass}
V		apps/steward-app/src/main/js/{ ← bower_components}/ngAnimate/sass/ng-animation.scss
V		apps/steward-app/src/main/js/{ ← bower_components}/ngAnimate/sass/style.scss
M		apps/steward-app/src/main/js/src/app/app.js
M		apps/steward-app/src/main/js/src/app/header/user-status/user-status.tpl.html