Homec4science
Diffusion SHRINE MedCo Fork 5e79894fc65f

Merge branch 'develop' into feature/new-crypto
5e79894fc65f
Actions

Authored by Ty <Ty_Coghlan@hms.harvard.edu> on Oct 12 2016, 21:48.

Description

Merge branch 'develop' into feature/new-crypto

Details

Committed
Ty <Ty_Coghlan@hms.harvard.edu>Oct 12 2016, 21:48
Pushed
mickmisMar 14 2017, 15:12
Parents
R2664:e2e0d9be4935: merge conflicts in problems controller
R2664:ef27c9e77863: initial import of bouncy-castle/cryptacular, style changes
Branches
Unknown
Tags
Unknown

Event Timeline

Ty <Ty_Coghlan@hms.harvard.edu> committed R2664:5e79894fc65f: Merge branch 'develop' into feature/new-crypto (authored by Ty <Ty_Coghlan@hms.harvard.edu>).Oct 12 2016, 21:48

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
e2e0d9be4935Ty
merge conflicts in problems controller 
Oct 12 2016
60468efc7bf5Ty
merge conflicts in diagnostic 
Oct 12 2016
cea3654e998fTy
fixed conflict in dashboard pom 
Oct 12 2016
24d092ff3bb8Ty
Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine… 
Oct 12 2016
980c37ec1fa2Ty
merge conflicts 
Oct 12 2016
f8ef7d8ca29cben-carmen
created ontology-term.service.js and ontology-term.factory.js and related tests 
Oct 12 2016
2cd8e14505bbben-carmen
latest 
Oct 11 2016
e62c2f2dbc12ben-carmen
added getUserQueryHistory method to statistics.model.js along with unit test in… 
Oct 11 2016
49e4df311974David Walend
Found commons-email in the pom.xml, which we don't use. 
Oct 11 2016
54727f32614cben-carmen
added unit tests for statistics.model.js 
Oct 11 2016
950c6fe2cc1cben-carmen
adding unit tests for statistics.model.js 
Oct 11 2016
10ecc7d15d79ben-carmen
cleanup 
Oct 11 2016
8ee0161d87d9ben-carmen
cleanup of statistics module 
Oct 11 2016
a4d8984aa64fTy
actual gitignore update w/out cruft 
Sep 29 2016
0f6215c6fe34Ty
Revert "gitignore update" 
Sep 29 2016
7038d86193c1Ty
gitignore update 
Sep 29 2016
38bafa7a76a5Ty
Merge branch 'release/1.22.1' of https://open.med.harvard. 
Sep 29 2016
29775c4e5224Ty
updating to 1.22.1.4-SNAPSHOT 
Sep 29 2016
8b069cb547bdben-carmen
Fix of SHRINE-SHRINE-1470 [Webclient] Define order of Events dropdown is… 
Sep 28 2016
351e4f4d9721ben-carmen
Fix of SHRINE-1446 Application is returning results in case of incorrect Date… 
Sep 28 2016
f41185671ba3Ty
fixed epoch caching 
Sep 28 2016
aef223a13fc3Ty
cleaned up log in problems; changed startup command in dashboard 
Sep 27 2016
d16cecb11fcfTy
Merge branch 'release/1.22.1' of https://open.med.harvard. 
Sep 27 2016
ea1e3b2b7e39Ty
updated poms to 1.22.1.3 
Sep 27 2016
3f460cfac253ben-carmen
commit of latest changes 
Sep 26 2016
cfed12df5ca2Ty
Merge branch 'release/1.22.1' of https://open.med.harvard. 
Sep 26 2016
5388fae1d8b3Ty
changed input to a button, updated steward query call 
Sep 26 2016
f0c2a9106c50ben-carmen
fix for SHRINE-1436 "Dropdown Name Temporal Constraint is Missing" 
Sep 26 2016
7b956a7867f4ben-carmen
fix for SHRINE-1436 "Dropdown Name Temporal Constraint is Missing" 
Sep 26 2016
a75c497fab02ben-carmen
fix for SHRINE-1436 "Dropdown Name Temporal Constraint is Missing" 
Sep 26 2016
799e1b5ca584ben-carmen
fix for SHRINE-1436 "Dropdown Name Temporal Constraint is Missing" 
Sep 26 2016
ae1ce427adc0ben-carmen
Researcher is unable to see Approved and Rejected Topics. 
Sep 26 2016
72289cac5716ben-carmen
Fix of SHRINE-1612 "Statistics Tab, the date for "Start Date" is not set for 7… 
Sep 26 2016
72c4fe2b8ec1Ty
merging 
Sep 23 2016
976f23f69cfbTy
Mt push erge branch 'release/1.22.1' of https://open.med.harvard. 
Sep 23 2016
256455139bf1Ty
fixing lines if else error 
Sep 23 2016
3379f48f7086ben-carmen
Merge branch 'release/1.22.1' of https://open.med.harvard. 
Sep 23 2016
28efe25db0f1ben-carmen
Fix for SHRINE-1610: User is unable to see the Approved and Rejected topics 
Sep 23 2016
d95aaad2009dTy
fix ie11 jump-to-home bug and pointer styles w/out cruft 
Sep 23 2016
6d14a491bd3eTy
Revert "fix ie11 jump-to-home bug and pointer styles" 
Sep 23 2016
383fb493a8e0Ty
fix ie11 jump-to-home bug and pointer styles 
Sep 23 2016
5a87d9f5bea2Ty
changing npm version to install for steward/pom.xml w/out other cruft 
Sep 22 2016
e5d94ef52337Ty
Revert "changing npm version to install for steward/pom.xml" 
Sep 22 2016
bd7500fac79dTy
changing npm version to install for steward/pom.xml 
Sep 22 2016
627b61288562Ty
pom update 
Sep 22 2016
17ec67012e8aTy
ie11 doesn't support string includes 
Sep 22 2016
4d310f0bd738Ty
fixed navigating back to page 1 
Sep 22 2016
bbc0b00e4713Ty
Arrows will no longer appear on dashboard for first or last page 
Sep 21 2016
aed22519d20eTy
updated problem log to rememebr the last settings it was used with 
Sep 21 2016
b7df22244101Ty
flipped equality sign on pagination 
Sep 20 2016

Changes (34)

Path
Mapps/dashboard-app/pom.xml
Mapps/dashboard-app/src/main/js/src/app/diagnostic/views/problems.controller.js
Mapps/dashboard-app/src/main/js/src/app/diagnostic/views/problems.tpl.html
Mapps/dashboard-app/src/main/js/src/app/shrine-tools.service.js
Mapps/dashboard-app/src/main/js/test/admin/status/problems
A(dir)apps/steward-app/src/main/js/app/client/statistics/directives/
Aapps/steward-app/src/main/js/app/client/statistics/directives/ontology-term.factory.js
Aapps/steward-app/src/main/js/app/client/statistics/directives/ontology-term.service.js
Aapps/steward-app/src/main/js/app/client/statistics/directives/ontology-term.service.spec.js
Vapps/steward-app/src/main/js/app/client/statistics/{statistics-model.js → statistics.model.js}
Mapps/steward-app/src/main/js/app/client/statistics/statistics.controller.js
Vapps/steward-app/src/main/js/app/client/statistics/{statistics.model.js ← statistics-model.js}
Aapps/steward-app/src/main/js/app/client/statistics/statistics.model.spec.js
Papps/steward-app/src/main/js/app/client/statistics/statistics.service.js
Copied from apps/dashboard-app/src/test/resources/testhappy/keystore
Mapps/steward-app/src/main/js/app/client/steward.provider.spec.js
Aapps/steward-app/src/main/js/pom.xml
A(dir)apps/steward-app/src/main/js/src/
A(dir)apps/steward-app/src/main/js/src/app/
A(dir)apps/steward-app/src/main/js/src/app/dashboard/
A(dir)apps/steward-app/src/main/js/src/app/dashboard/statistics/
Aapps/steward-app/src/main/js/src/app/dashboard/statistics/statistics.js
Mapps/steward-app/src/main/scala/net/shrine/steward/StewardService.scala
Mapps/steward-app/src/test/scala/net/shrine/steward/StewardServiceSpec.scala
Mcommons/auth/src/main/scala/net/shrine/authorization/steward/StewardModel.scala
Mcommons/config/src/main/scala/net/shrine/config/mappings/AdapterMappings.scala
Mcommons/config/src/main/scala/net/shrine/config/mappings/ClasspathFormatDetectingAdapterMappingsSource.scala
Mcommons/util/pom.xml
Mcommons/util/src/main/scala/net/shrine/problem/DashboardProblemDatabase.scala
Pshrine-webclient/src/main/html/crc_view_qrytoo-live.js
Copied from shrine-webclient/src/main/html/js-i2b2/cells/CRC/CRC_view_QryTool.js
Mshrine-webclient/src/main/html/index.html
Mshrine-webclient/src/main/html/js-i2b2/cells/CRC/CRC_ctrlr_Dates.js
Mshrine-webclient/src/main/html/js-i2b2/cells/CRC/CRC_ctrlr_QryTool.js
Pshrine-webclient/src/main/html/js-i2b2/cells/CRC/CRC_view_QryTool.js
Copied to shrine-webclient/src/main/html/crc_view_qrytoo-live.js
Mshrine-webclient/src/main/html/js-i2b2/cells/CRC/assets/vwQryTool.css

R2664:5e79894fc65f

View Options

apps/dashboard-app/pom.xml

Loading...
View Options

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

Loading...
View Options

apps/dashboard-app/src/main/js/src/app/diagnostic/views/problems.tpl.html

Loading...
View Options

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

Loading...
View Options

apps/dashboard-app/src/main/js/test/admin/status/problems

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

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

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.model.js

Loading...
View Options

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

Loading...
View Options

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

Loading...
View Options

apps/steward-app/src/main/js/app/client/steward.provider.spec.js

Loading...
View Options

apps/steward-app/src/main/js/pom.xml

Loading...
View Options

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

Loading...
View Options

apps/steward-app/src/main/scala/net/shrine/steward/StewardService.scala

Loading...
View Options

apps/steward-app/src/test/scala/net/shrine/steward/StewardServiceSpec.scala

Loading...
View Options

commons/auth/src/main/scala/net/shrine/authorization/steward/StewardModel.scala

Loading...
View Options

commons/config/src/main/scala/net/shrine/config/mappings/AdapterMappings.scala

Loading...
View Options

commons/config/src/main/scala/net/shrine/config/mappings/ClasspathFormatDetectingAdapterMappingsSource.scala

Loading...
View Options

commons/util/pom.xml

Loading...
View Options

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

Loading...
View Options

shrine-webclient/src/main/html/crc_view_qrytoo-live.js

Loading...
View Options

shrine-webclient/src/main/html/index.html

Loading...
View Options

shrine-webclient/src/main/html/js-i2b2/cells/CRC/CRC_ctrlr_Dates.js

Loading...
View Options

shrine-webclient/src/main/html/js-i2b2/cells/CRC/CRC_ctrlr_QryTool.js

Loading...
View Options

shrine-webclient/src/main/html/js-i2b2/cells/CRC/CRC_view_QryTool.js

Loading...
View Options

shrine-webclient/src/main/html/js-i2b2/cells/CRC/assets/vwQryTool.css

Loading...
c4science · Help