Homec4science
Diffusion SHRINE MedCo Fork 432350d83487

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

Authored by Keith Dwyer <keith_dwyer@hms.harvard.edu> on Oct 22 2015, 22:30.

Description

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

Details

Committed
Keith Dwyer <keith_dwyer@hms.harvard.edu>Oct 22 2015, 22:30
Pushed
mickmisMar 14 2017, 15:12
Parents
R2664:f2d18d7b7dd3: Fix for SHRINE 1152
R2664:f5ed75a67945: [shrine-webclient] move error wiki link up above Technical Details (so it won't…
Branches
Unknown
Tags
Unknown

Event Timeline

Keith Dwyer <keith_dwyer@hms.harvard.edu> committed R2664:432350d83487: Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine… (authored by Keith Dwyer <keith_dwyer@hms.harvard.edu>).Oct 22 2015, 22:30

Merged Changes

CommitAuthorDetailsCommitted
f2d18d7b7dd3Ben Carmen
Fix for SHRINE 1152 
Oct 22 2015
6ee2ca3c45c6Ben Carmen
Merge remote-tracking branch 'origin/develop' into develop 
Oct 22 2015
b003246ab1ffBen Carmen
Fix for SHRINE 1173 
Oct 22 2015
f5373bfbbf2fDavid Walend
Missing periods 
Oct 22 2015
979b3608257bDavid Walend
Updated problem text with Bill. 
Oct 22 2015
49772ff66439Ben Carmen
Fix for SHRINE 1167 
Oct 22 2015
0be8444b93acBen Carmen
Fix for SHRINE 1123 
Oct 22 2015
b47ba13fccfaBen Carmen
Fix of history table. 
Oct 22 2015
7f07706e88c5Ben Carmen
Fix for SHRINE-1172 
Oct 22 2015
318129e3dc13Ben Carmen
Commit of styles to fix: 
Oct 21 2015

Changes (84)

Path
Madapter/adapter-api/src/main/scala/net/shrine/adapter/client/RemoteAdapterClient.scala
Madapter/adapter-service/src/main/scala/net/shrine/adapter/AbstractReadQueryResultAdapter.scala
Madapter/adapter-service/src/main/scala/net/shrine/adapter/Adapter.scala
Madapter/adapter-service/src/main/scala/net/shrine/adapter/components/QueryDefinitions.scala
Madapter/adapter-service/src/main/scala/net/shrine/adapter/dao/squeryl/SquerylAdapterDao.scala
Mapps/dashboard-app/src/main/js/src/app/dashboard/sidebar/sidebar.tpl.html
Mapps/dashboard-app/src/main/js/src/assets/css/shrine.css
Aapps/dashboard-app/src/main/js/src/assets/fnt/nexa/nexa-bold-webfont.eot
Aapps/dashboard-app/src/main/js/src/assets/fnt/nexa/nexa-bold-webfont.svg
Aapps/dashboard-app/src/main/js/src/assets/fnt/nexa/nexa-bold-webfont.ttf
Aapps/dashboard-app/src/main/js/src/assets/fnt/nexa/nexa-bold-webfont.woff
Aapps/dashboard-app/src/main/js/src/assets/fnt/nexa/nexa-bold-webfont.woff2
Aapps/dashboard-app/src/main/js/src/assets/fnt/nexa/nexa-light-webfont.eot
Aapps/dashboard-app/src/main/js/src/assets/fnt/nexa/nexa-light-webfont.svg
Aapps/dashboard-app/src/main/js/src/assets/fnt/nexa/nexa-light-webfont.ttf
Aapps/dashboard-app/src/main/js/src/assets/fnt/nexa/nexa-light-webfont.woff
Aapps/dashboard-app/src/main/js/src/assets/fnt/nexa/nexa-light-webfont.woff2
Aapps/dashboard-app/src/main/js/src/assets/fnt/open-sans/opensans-regular-webfont.eot
Aapps/dashboard-app/src/main/js/src/assets/fnt/open-sans/opensans-regular-webfont.svg
Aapps/dashboard-app/src/main/js/src/assets/fnt/open-sans/opensans-regular-webfont.ttf
Aapps/dashboard-app/src/main/js/src/assets/fnt/open-sans/opensans-regular-webfont.woff
Aapps/dashboard-app/src/main/js/src/assets/fnt/open-sans/opensans-regular-webfont.woff2
Aapps/dashboard-app/src/main/js/src/assets/fnt/open-sans/opensans-semibold-webfont.eot
Aapps/dashboard-app/src/main/js/src/assets/fnt/open-sans/opensans-semibold-webfont.svg
Aapps/dashboard-app/src/main/js/src/assets/fnt/open-sans/opensans-semibold-webfont.ttf
Aapps/dashboard-app/src/main/js/src/assets/fnt/open-sans/opensans-semibold-webfont.woff
Aapps/dashboard-app/src/main/js/src/assets/fnt/open-sans/opensans-semibold-webfont.woff2
Aapps/dashboard-app/src/main/js/src/assets/fnt/roboto/roboto-bold-webfont.eot
Aapps/dashboard-app/src/main/js/src/assets/fnt/roboto/roboto-bold-webfont.svg
Aapps/dashboard-app/src/main/js/src/assets/fnt/roboto/roboto-bold-webfont.ttf
Aapps/dashboard-app/src/main/js/src/assets/fnt/roboto/roboto-bold-webfont.woff
Aapps/dashboard-app/src/main/js/src/assets/fnt/roboto/roboto-bold-webfont.woff2
Aapps/dashboard-app/src/main/js/src/assets/fnt/roboto/roboto-regular-webfont.eot
Aapps/dashboard-app/src/main/js/src/assets/fnt/roboto/roboto-regular-webfont.svg
Aapps/dashboard-app/src/main/js/src/assets/fnt/roboto/roboto-regular-webfont.ttf
Aapps/dashboard-app/src/main/js/src/assets/fnt/roboto/roboto-regular-webfont.woff
Aapps/dashboard-app/src/main/js/src/assets/fnt/roboto/roboto-regular-webfont.woff2
Mapps/steward-app/src/main/js/src/app/dashboard/history/history-table/history-table.tpl.html
Mapps/steward-app/src/main/js/src/app/dashboard/history/history.tpl.html
Mapps/steward-app/src/main/js/src/app/dashboard/sidebar/sidebar.tpl.html
Mapps/steward-app/src/main/js/src/app/dashboard/topics/new-topic/new-topic.tpl.html
Mapps/steward-app/src/main/js/src/app/dashboard/topics/topic-table/topic-detail.tpl.html
Mapps/steward-app/src/main/js/src/app/dashboard/topics/topic-table/topic-detail/role1-description.tpl.html
Mapps/steward-app/src/main/js/src/app/dashboard/topics/topic-table/topic-detail/role1-edit.tpl.html
Mapps/steward-app/src/main/js/src/app/dashboard/topics/topic-table/topic-detail/role2-description.tpl.html
Dapps/steward-app/src/main/js/src/app/dashboard/topics/topic-table/topic-detail/topic-detail.js
Mapps/steward-app/src/main/js/src/app/dashboard/topics/topics-model.js
Mapps/steward-app/src/main/js/src/app/dashboard/topics/topics.js
Mapps/steward-app/src/main/js/src/assets/css/shrine.css
Aapps/steward-app/src/main/js/src/assets/fnt/nexa/nexa-bold-webfont.eot
Aapps/steward-app/src/main/js/src/assets/fnt/nexa/nexa-bold-webfont.svg
Aapps/steward-app/src/main/js/src/assets/fnt/nexa/nexa-bold-webfont.ttf
Aapps/steward-app/src/main/js/src/assets/fnt/nexa/nexa-bold-webfont.woff
Aapps/steward-app/src/main/js/src/assets/fnt/nexa/nexa-bold-webfont.woff2
Aapps/steward-app/src/main/js/src/assets/fnt/nexa/nexa-light-webfont.eot
Aapps/steward-app/src/main/js/src/assets/fnt/nexa/nexa-light-webfont.svg
Aapps/steward-app/src/main/js/src/assets/fnt/nexa/nexa-light-webfont.ttf
Aapps/steward-app/src/main/js/src/assets/fnt/nexa/nexa-light-webfont.woff
Aapps/steward-app/src/main/js/src/assets/fnt/nexa/nexa-light-webfont.woff2
Aapps/steward-app/src/main/js/src/assets/fnt/open-sans/opensans-regular-webfont.eot
Aapps/steward-app/src/main/js/src/assets/fnt/open-sans/opensans-regular-webfont.svg
Aapps/steward-app/src/main/js/src/assets/fnt/open-sans/opensans-regular-webfont.ttf
Aapps/steward-app/src/main/js/src/assets/fnt/open-sans/opensans-regular-webfont.woff
Aapps/steward-app/src/main/js/src/assets/fnt/open-sans/opensans-regular-webfont.woff2
Aapps/steward-app/src/main/js/src/assets/fnt/open-sans/opensans-semibold-webfont.eot
Aapps/steward-app/src/main/js/src/assets/fnt/open-sans/opensans-semibold-webfont.svg
Aapps/steward-app/src/main/js/src/assets/fnt/open-sans/opensans-semibold-webfont.ttf
Aapps/steward-app/src/main/js/src/assets/fnt/open-sans/opensans-semibold-webfont.woff
Aapps/steward-app/src/main/js/src/assets/fnt/open-sans/opensans-semibold-webfont.woff2
Aapps/steward-app/src/main/js/src/assets/fnt/roboto/roboto-bold-webfont.eot
Aapps/steward-app/src/main/js/src/assets/fnt/roboto/roboto-bold-webfont.svg
Aapps/steward-app/src/main/js/src/assets/fnt/roboto/roboto-bold-webfont.ttf
Aapps/steward-app/src/main/js/src/assets/fnt/roboto/roboto-bold-webfont.woff
Aapps/steward-app/src/main/js/src/assets/fnt/roboto/roboto-bold-webfont.woff2
Aapps/steward-app/src/main/js/src/assets/fnt/roboto/roboto-regular-webfont.eot
Aapps/steward-app/src/main/js/src/assets/fnt/roboto/roboto-regular-webfont.svg
Aapps/steward-app/src/main/js/src/assets/fnt/roboto/roboto-regular-webfont.ttf
Aapps/steward-app/src/main/js/src/assets/fnt/roboto/roboto-regular-webfont.woff
Aapps/steward-app/src/main/js/src/assets/fnt/roboto/roboto-regular-webfont.woff2
Mcommons/auth/src/main/scala/net/shrine/authorization/PmAuthorizerComponent.scala
Mcommons/util/src/main/scala/net/shrine/problem/Problem.scala
Mhub/broadcaster-aggregator/src/main/scala/net/shrine/aggregation/BasicAggregator.scala
Mhub/broadcaster-aggregator/src/main/scala/net/shrine/aggregation/IgnoresErrorsAggregator.scala
Mhub/broadcaster-aggregator/src/main/scala/net/shrine/aggregation/PackagesErrorsAggregator.scala

R2664:432350d83487

View Options

adapter/adapter-api/src/main/scala/net/shrine/adapter/client/RemoteAdapterClient.scala

Loading...
View Options

adapter/adapter-service/src/main/scala/net/shrine/adapter/AbstractReadQueryResultAdapter.scala

Loading...
View Options

adapter/adapter-service/src/main/scala/net/shrine/adapter/Adapter.scala

Loading...
View Options

adapter/adapter-service/src/main/scala/net/shrine/adapter/components/QueryDefinitions.scala

Loading...
View Options

adapter/adapter-service/src/main/scala/net/shrine/adapter/dao/squeryl/SquerylAdapterDao.scala

Loading...
View Options

apps/dashboard-app/src/main/js/src/app/dashboard/sidebar/sidebar.tpl.html

Loading...
View Options

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

Loading...
View Options

apps/dashboard-app/src/main/js/src/assets/fnt/nexa/nexa-bold-webfont.eot

Loading...
View Options

apps/dashboard-app/src/main/js/src/assets/fnt/nexa/nexa-bold-webfont.svg

Loading...
View Options

apps/dashboard-app/src/main/js/src/assets/fnt/nexa/nexa-bold-webfont.ttf

Loading...
View Options

apps/dashboard-app/src/main/js/src/assets/fnt/nexa/nexa-bold-webfont.woff

Loading...
View Options

apps/dashboard-app/src/main/js/src/assets/fnt/nexa/nexa-bold-webfont.woff2

Loading...
View Options

apps/dashboard-app/src/main/js/src/assets/fnt/nexa/nexa-light-webfont.eot

Loading...
View Options

apps/dashboard-app/src/main/js/src/assets/fnt/nexa/nexa-light-webfont.svg

Loading...
View Options

apps/dashboard-app/src/main/js/src/assets/fnt/nexa/nexa-light-webfont.ttf

Loading...
View Options

apps/dashboard-app/src/main/js/src/assets/fnt/nexa/nexa-light-webfont.woff

Loading...
View Options

apps/dashboard-app/src/main/js/src/assets/fnt/nexa/nexa-light-webfont.woff2

Loading...
View Options

apps/dashboard-app/src/main/js/src/assets/fnt/open-sans/opensans-regular-webfont.eot

Loading...
View Options

apps/dashboard-app/src/main/js/src/assets/fnt/open-sans/opensans-regular-webfont.svg

Loading...
View Options

apps/dashboard-app/src/main/js/src/assets/fnt/open-sans/opensans-regular-webfont.ttf

Loading...
View Options

apps/dashboard-app/src/main/js/src/assets/fnt/open-sans/opensans-regular-webfont.woff

Loading...
View Options

apps/dashboard-app/src/main/js/src/assets/fnt/open-sans/opensans-regular-webfont.woff2

Loading...
View Options

apps/dashboard-app/src/main/js/src/assets/fnt/open-sans/opensans-semibold-webfont.eot

Loading...
View Options

apps/dashboard-app/src/main/js/src/assets/fnt/open-sans/opensans-semibold-webfont.svg

Loading...
View Options

apps/dashboard-app/src/main/js/src/assets/fnt/open-sans/opensans-semibold-webfont.ttf

Loading...
View Options

apps/dashboard-app/src/main/js/src/assets/fnt/open-sans/opensans-semibold-webfont.woff

Loading...
View Options

apps/dashboard-app/src/main/js/src/assets/fnt/open-sans/opensans-semibold-webfont.woff2

Loading...
View Options

apps/dashboard-app/src/main/js/src/assets/fnt/roboto/roboto-bold-webfont.eot

Loading...
View Options

apps/dashboard-app/src/main/js/src/assets/fnt/roboto/roboto-bold-webfont.svg

Loading...
View Options

apps/dashboard-app/src/main/js/src/assets/fnt/roboto/roboto-bold-webfont.ttf

Loading...
View Options

apps/dashboard-app/src/main/js/src/assets/fnt/roboto/roboto-bold-webfont.woff

Loading...
View Options

apps/dashboard-app/src/main/js/src/assets/fnt/roboto/roboto-bold-webfont.woff2

Loading...
View Options

apps/dashboard-app/src/main/js/src/assets/fnt/roboto/roboto-regular-webfont.eot

Loading...
View Options

apps/dashboard-app/src/main/js/src/assets/fnt/roboto/roboto-regular-webfont.svg

Loading...
View Options

apps/dashboard-app/src/main/js/src/assets/fnt/roboto/roboto-regular-webfont.ttf

Loading...
View Options

apps/dashboard-app/src/main/js/src/assets/fnt/roboto/roboto-regular-webfont.woff

Loading...
View Options

apps/dashboard-app/src/main/js/src/assets/fnt/roboto/roboto-regular-webfont.woff2

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

apps/steward-app/src/main/js/src/app/dashboard/sidebar/sidebar.tpl.html

Loading...
View Options

apps/steward-app/src/main/js/src/app/dashboard/topics/new-topic/new-topic.tpl.html

Loading...
View Options

apps/steward-app/src/main/js/src/app/dashboard/topics/topic-table/topic-detail.tpl.html

Loading...
View Options

apps/steward-app/src/main/js/src/app/dashboard/topics/topic-table/topic-detail/role1-description.tpl.html

Loading...
View Options

apps/steward-app/src/main/js/src/app/dashboard/topics/topic-table/topic-detail/role1-edit.tpl.html

Loading...
View Options

apps/steward-app/src/main/js/src/app/dashboard/topics/topic-table/topic-detail/role2-description.tpl.html

Loading...
View Options

apps/steward-app/src/main/js/src/app/dashboard/topics/topic-table/topic-detail/topic-detail.js

Loading...
View Options

apps/steward-app/src/main/js/src/app/dashboard/topics/topics-model.js

Loading...
View Options

apps/steward-app/src/main/js/src/app/dashboard/topics/topics.js

Loading...
View Options

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

Loading...
View Options

apps/steward-app/src/main/js/src/assets/fnt/nexa/nexa-bold-webfont.eot

Loading...
View Options

apps/steward-app/src/main/js/src/assets/fnt/nexa/nexa-bold-webfont.svg

Loading...
View Options

apps/steward-app/src/main/js/src/assets/fnt/nexa/nexa-bold-webfont.ttf

Loading...
View Options

apps/steward-app/src/main/js/src/assets/fnt/nexa/nexa-bold-webfont.woff

Loading...
View Options

apps/steward-app/src/main/js/src/assets/fnt/nexa/nexa-bold-webfont.woff2

Loading...
View Options

apps/steward-app/src/main/js/src/assets/fnt/nexa/nexa-light-webfont.eot

Loading...
View Options

apps/steward-app/src/main/js/src/assets/fnt/nexa/nexa-light-webfont.svg

Loading...
View Options

apps/steward-app/src/main/js/src/assets/fnt/nexa/nexa-light-webfont.ttf

Loading...
View Options

apps/steward-app/src/main/js/src/assets/fnt/nexa/nexa-light-webfont.woff

Loading...
View Options

apps/steward-app/src/main/js/src/assets/fnt/nexa/nexa-light-webfont.woff2

Loading...
View Options

apps/steward-app/src/main/js/src/assets/fnt/open-sans/opensans-regular-webfont.eot

Loading...
View Options

apps/steward-app/src/main/js/src/assets/fnt/open-sans/opensans-regular-webfont.svg

Loading...
View Options

apps/steward-app/src/main/js/src/assets/fnt/open-sans/opensans-regular-webfont.ttf

Loading...
View Options

apps/steward-app/src/main/js/src/assets/fnt/open-sans/opensans-regular-webfont.woff

Loading...
View Options

apps/steward-app/src/main/js/src/assets/fnt/open-sans/opensans-regular-webfont.woff2

Loading...
View Options

apps/steward-app/src/main/js/src/assets/fnt/open-sans/opensans-semibold-webfont.eot

Loading...
View Options

apps/steward-app/src/main/js/src/assets/fnt/open-sans/opensans-semibold-webfont.svg

Loading...
View Options

apps/steward-app/src/main/js/src/assets/fnt/open-sans/opensans-semibold-webfont.ttf

Loading...
View Options

apps/steward-app/src/main/js/src/assets/fnt/open-sans/opensans-semibold-webfont.woff

Loading...
View Options

apps/steward-app/src/main/js/src/assets/fnt/open-sans/opensans-semibold-webfont.woff2

Loading...
View Options

apps/steward-app/src/main/js/src/assets/fnt/roboto/roboto-bold-webfont.eot

Loading...
View Options

apps/steward-app/src/main/js/src/assets/fnt/roboto/roboto-bold-webfont.svg

Loading...
View Options

apps/steward-app/src/main/js/src/assets/fnt/roboto/roboto-bold-webfont.ttf

Loading...
View Options

apps/steward-app/src/main/js/src/assets/fnt/roboto/roboto-bold-webfont.woff

Loading...
View Options

apps/steward-app/src/main/js/src/assets/fnt/roboto/roboto-bold-webfont.woff2

Loading...
View Options

apps/steward-app/src/main/js/src/assets/fnt/roboto/roboto-regular-webfont.eot

Loading...
View Options

apps/steward-app/src/main/js/src/assets/fnt/roboto/roboto-regular-webfont.svg

Loading...
View Options

apps/steward-app/src/main/js/src/assets/fnt/roboto/roboto-regular-webfont.ttf

Loading...
View Options

apps/steward-app/src/main/js/src/assets/fnt/roboto/roboto-regular-webfont.woff

Loading...
View Options

apps/steward-app/src/main/js/src/assets/fnt/roboto/roboto-regular-webfont.woff2

Loading...
View Options

commons/auth/src/main/scala/net/shrine/authorization/PmAuthorizerComponent.scala

Loading...
View Options

commons/util/src/main/scala/net/shrine/problem/Problem.scala

Loading...
View Options

hub/broadcaster-aggregator/src/main/scala/net/shrine/aggregation/BasicAggregator.scala

Loading...
View Options

hub/broadcaster-aggregator/src/main/scala/net/shrine/aggregation/IgnoresErrorsAggregator.scala

Loading...
View Options

hub/broadcaster-aggregator/src/main/scala/net/shrine/aggregation/PackagesErrorsAggregator.scala

Loading...
c4science · Help