Homec4science
Diffusion SHRINE MedCo Fork cf3ae5e3ebdc

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

Authored by Ty <Ty_Coghlan@hms.harvard.dedu> on Aug 1 2016, 15:49.

Description

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

Details

Committed
Ty <Ty_Coghlan@hms.harvard.dedu>Aug 1 2016, 15:49
Pushed
mickmisMar 14 2017, 15:12
Parents
R2664:5c8d8988dd16: updated package.json with specific versioning
R2664:cb07c39a90fa: attempts at fixing intialization error
Branches
Unknown
Tags
Unknown

Event Timeline

Ty <Ty_Coghlan@hms.harvard.dedu> committed R2664:cf3ae5e3ebdc: Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine… (authored by Ty <Ty_Coghlan@hms.harvard.dedu>).Aug 1 2016, 15:49

Merged Changes

CommitAuthorDetailsCommitted
5c8d8988dd16Benjamin Carmen
updated package.json with specific versioning 
Aug 1 2016
0d6df44c71b6Benjamin Carmen
latest version...needs fix for pagination 
Aug 1 2016
fba0e1040678Benjamin Carmen
Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine… 
Jul 30 2016
751204752e62Benjamin Carmen
commit of fix for statistics module 
Jul 30 2016

Changes (68)

Path
Mapps/steward-app/src/main/js/app/client/history/history.tpl.html
Mapps/steward-app/src/main/js/app/client/statistics/statistics-model.js
Aapps/steward-app/src/main/js/app/client/statistics/statistics.controller.js
Aapps/steward-app/src/main/js/app/client/statistics/statistics.controller.js.bak
Vapps/steward-app/src/main/js/app/client/statistics/{statistics.js → statistics.js.del}
Vapps/steward-app/src/main/js/app/client/statistics/{statistics.js.del ← statistics.js}
Mapps/steward-app/src/main/js/app/client/statistics/statistics.module.js
Mapps/steward-app/src/main/js/app/client/statistics/statistics.tpl.html
Mapps/steward-app/src/main/js/app/client/steward.route.js
Mapps/steward-app/src/main/js/app/client/topics/topics.controller.js
Mapps/steward-app/src/main/js/app/client/topics/topics.module.js
Mapps/steward-app/src/main/js/app/client/topics/topics.tpl.html
Mapps/steward-app/src/main/js/bower.json
A(dir)apps/steward-app/src/main/js/bower_components/angular-animate/
Aapps/steward-app/src/main/js/bower_components/angular-animate/.bower.json
Papps/steward-app/src/main/js/bower_components/angular-animate/LICENSE.md
Copied from apps/steward-app/src/main/js/bower_components/angular-cookies/LICENSE.md
Papps/steward-app/src/main/js/bower_components/angular-animate/README.md
Copied from apps/dashboard-app/src/main/js/src/vendor/angular-animate/README.md
Aapps/steward-app/src/main/js/bower_components/angular-animate/angular-animate.js
Aapps/steward-app/src/main/js/bower_components/angular-animate/angular-animate.min.js
Aapps/steward-app/src/main/js/bower_components/angular-animate/angular-animate.min.js.map
Aapps/steward-app/src/main/js/bower_components/angular-animate/bower.json
Papps/steward-app/src/main/js/bower_components/angular-animate/index.js
Copied from apps/dashboard-app/src/main/js/src/vendor/angular-animate/index.js
Papps/steward-app/src/main/js/bower_components/angular-animate/package.json
Copied from apps/steward-app/src/main/js/bower_components/angular/package.json
Mapps/steward-app/src/main/js/bower_components/angular/.bower.json
Mapps/steward-app/src/main/js/bower_components/angular/angular.js
Mapps/steward-app/src/main/js/bower_components/angular/angular.min.js
Mapps/steward-app/src/main/js/bower_components/angular/angular.min.js.gzip
Mapps/steward-app/src/main/js/bower_components/angular/angular.min.js.map
Mapps/steward-app/src/main/js/bower_components/angular/bower.json
Papps/steward-app/src/main/js/bower_components/angular/package.json
Copied to apps/steward-app/src/main/js/bower_components/angular-animate/package.json
A(dir)apps/steward-app/src/main/js/bower_components/ngAnimate/
Aapps/steward-app/src/main/js/bower_components/ngAnimate/.bower.json
A(dir)apps/steward-app/src/main/js/bower_components/ngAnimate/.sass-cache/
A(dir)apps/steward-app/src/main/js/bower_components/ngAnimate/.sass-cache/7fdab734b2caa40e59f92a90ad814fb25f2984ec/
Aapps/steward-app/src/main/js/bower_components/ngAnimate/.sass-cache/7fdab734b2caa40e59f92a90ad814fb25f2984ec/ng-animation.scssc
Aapps/steward-app/src/main/js/bower_components/ngAnimate/.sass-cache/7fdab734b2caa40e59f92a90ad814fb25f2984ec/style.scssc
Aapps/steward-app/src/main/js/bower_components/ngAnimate/README.md
Aapps/steward-app/src/main/js/bower_components/ngAnimate/config.rb
A(dir)apps/steward-app/src/main/js/bower_components/ngAnimate/css/
A(dir)apps/steward-app/src/main/js/bower_components/ngAnimate/css/fontello/
Aapps/steward-app/src/main/js/bower_components/ngAnimate/css/fontello/LICENSE.txt
Aapps/steward-app/src/main/js/bower_components/ngAnimate/css/fontello/README.txt
Aapps/steward-app/src/main/js/bower_components/ngAnimate/css/fontello/config.json
A(dir)apps/steward-app/src/main/js/bower_components/ngAnimate/css/fontello/css/
Aapps/steward-app/src/main/js/bower_components/ngAnimate/css/fontello/css/animation.css
Aapps/steward-app/src/main/js/bower_components/ngAnimate/css/fontello/css/fontello-codes.css
Aapps/steward-app/src/main/js/bower_components/ngAnimate/css/fontello/css/fontello-embedded.css
Aapps/steward-app/src/main/js/bower_components/ngAnimate/css/fontello/css/fontello-ie7-codes.css
Aapps/steward-app/src/main/js/bower_components/ngAnimate/css/fontello/css/fontello-ie7.css
Aapps/steward-app/src/main/js/bower_components/ngAnimate/css/fontello/css/fontello.css
Aapps/steward-app/src/main/js/bower_components/ngAnimate/css/fontello/demo.html
A(dir)apps/steward-app/src/main/js/bower_components/ngAnimate/css/fontello/font/
Aapps/steward-app/src/main/js/bower_components/ngAnimate/css/fontello/font/fontello.eot
Aapps/steward-app/src/main/js/bower_components/ngAnimate/css/fontello/font/fontello.svg
Aapps/steward-app/src/main/js/bower_components/ngAnimate/css/fontello/font/fontello.ttf
Aapps/steward-app/src/main/js/bower_components/ngAnimate/css/fontello/font/fontello.woff
Aapps/steward-app/src/main/js/bower_components/ngAnimate/css/ng-animation.css
Aapps/steward-app/src/main/js/bower_components/ngAnimate/css/style.css
Aapps/steward-app/src/main/js/bower_components/ngAnimate/index.html
A(dir)apps/steward-app/src/main/js/bower_components/ngAnimate/js/
Aapps/steward-app/src/main/js/bower_components/ngAnimate/js/angular-animate.min.js
Aapps/steward-app/src/main/js/bower_components/ngAnimate/js/angular.min.js
Aapps/steward-app/src/main/js/bower_components/ngAnimate/js/app.js
Aapps/steward-app/src/main/js/bower_components/ngAnimate/js/jquery.js
A(dir)apps/steward-app/src/main/js/bower_components/ngAnimate/sass/
Aapps/steward-app/src/main/js/bower_components/ngAnimate/sass/ng-animation.scss
Aapps/steward-app/src/main/js/bower_components/ngAnimate/sass/style.scss
Mapps/steward-app/src/main/js/gulp.config.js

R2664:cf3ae5e3ebdc

View Options

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

Loading...
View Options

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

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.controller.js.bak

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

apps/steward-app/src/main/js/app/client/statistics/statistics.module.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/client/steward.route.js

Loading...
View Options

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

Loading...
View Options

apps/steward-app/src/main/js/app/client/topics/topics.module.js

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

apps/steward-app/src/main/js/bower_components/angular-animate/LICENSE.md

Loading...
View Options

apps/steward-app/src/main/js/bower_components/angular-animate/README.md

Loading...
View Options

apps/steward-app/src/main/js/bower_components/angular-animate/angular-animate.js

Loading...
View Options

apps/steward-app/src/main/js/bower_components/angular-animate/angular-animate.min.js

Loading...
View Options

apps/steward-app/src/main/js/bower_components/angular-animate/angular-animate.min.js.map

Loading...
View Options

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

Loading...
View Options

apps/steward-app/src/main/js/bower_components/angular-animate/index.js

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

apps/steward-app/src/main/js/bower_components/angular/angular.min.js

Loading...
View Options

apps/steward-app/src/main/js/bower_components/angular/angular.min.js.gzip

Loading...
View Options

apps/steward-app/src/main/js/bower_components/angular/angular.min.js.map

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

apps/steward-app/src/main/js/bower_components/ngAnimate/.sass-cache/7fdab734b2caa40e59f92a90ad814fb25f2984ec/ng-animation.scssc

Loading...
View Options

apps/steward-app/src/main/js/bower_components/ngAnimate/.sass-cache/7fdab734b2caa40e59f92a90ad814fb25f2984ec/style.scssc

Loading...
View Options

apps/steward-app/src/main/js/bower_components/ngAnimate/README.md

Loading...
View Options

apps/steward-app/src/main/js/bower_components/ngAnimate/config.rb

Loading...
View Options

apps/steward-app/src/main/js/bower_components/ngAnimate/css/fontello/LICENSE.txt

Loading...
View Options

apps/steward-app/src/main/js/bower_components/ngAnimate/css/fontello/README.txt

Loading...
View Options

apps/steward-app/src/main/js/bower_components/ngAnimate/css/fontello/config.json

Loading...
View Options

apps/steward-app/src/main/js/bower_components/ngAnimate/css/fontello/css/animation.css

Loading...
View Options

apps/steward-app/src/main/js/bower_components/ngAnimate/css/fontello/css/fontello-codes.css

Loading...
View Options

apps/steward-app/src/main/js/bower_components/ngAnimate/css/fontello/css/fontello-embedded.css

Loading...
View Options

apps/steward-app/src/main/js/bower_components/ngAnimate/css/fontello/css/fontello-ie7-codes.css

Loading...
View Options

apps/steward-app/src/main/js/bower_components/ngAnimate/css/fontello/css/fontello-ie7.css

Loading...
View Options

apps/steward-app/src/main/js/bower_components/ngAnimate/css/fontello/css/fontello.css

Loading...
View Options

apps/steward-app/src/main/js/bower_components/ngAnimate/css/fontello/demo.html

Loading...
View Options

apps/steward-app/src/main/js/bower_components/ngAnimate/css/fontello/font/fontello.eot

Loading...
View Options

apps/steward-app/src/main/js/bower_components/ngAnimate/css/fontello/font/fontello.svg

Loading...
View Options

apps/steward-app/src/main/js/bower_components/ngAnimate/css/fontello/font/fontello.ttf

Loading...
View Options

apps/steward-app/src/main/js/bower_components/ngAnimate/css/fontello/font/fontello.woff

Loading...
View Options

apps/steward-app/src/main/js/bower_components/ngAnimate/css/ng-animation.css

Loading...
View Options

apps/steward-app/src/main/js/bower_components/ngAnimate/css/style.css

Loading...
View Options

apps/steward-app/src/main/js/bower_components/ngAnimate/index.html

Loading...
View Options

apps/steward-app/src/main/js/bower_components/ngAnimate/js/angular-animate.min.js

Loading...
View Options

apps/steward-app/src/main/js/bower_components/ngAnimate/js/angular.min.js

Loading...
View Options

apps/steward-app/src/main/js/bower_components/ngAnimate/js/app.js

Loading...
View Options

apps/steward-app/src/main/js/bower_components/ngAnimate/js/jquery.js

Loading...
View Options

apps/steward-app/src/main/js/bower_components/ngAnimate/sass/ng-animation.scss

Loading...
View Options

apps/steward-app/src/main/js/bower_components/ngAnimate/sass/style.scss

Loading...
View Options

apps/steward-app/src/main/js/gulp.config.js

Loading...
c4science · Help