SHRINE
  1. SHRINE

shrine

Public
  1. SHRINE
  2. shrine

All Branches Graph  

        
AuthorCommitMessageCommit dateBuilds
dwalenddwalend
b851133d8ddAdded front end parts as a dependency for SHRINE2020-464
Marc-Danie NazaireMarc-Danie Nazaire
5f613fa590eSHRINE2020-494 - Migrate the SHRINE_QUERY and QUERY_RESULT tables to Slick - removed selectAllQueryHistoryForNetworkI...
dwalenddwalend
6371d6fd4e0Merge with develop for SHRINE2020-464
dwalenddwalend
7bf2262bd96Merge branch 'develop' into feature/SHRINE2020-464 # Conflicts: # frontend/shrine-webclient/v1/dev-server/data/selec...
Marc-Danie NazaireMarc-Danie Nazaire
31e8139a2f9SHRINE2020-494 - Migrate the SHRINE_QUERY and QUERY_RESULT tables to Slick - reverting changes
Marc-Danie NazaireMarc-Danie Nazaire
a0502cc749cSHRINE2020-456 - Simplify shrine.conf with default values - removed trailing slash
Marc-Danie NazaireMarc-Danie Nazaire
678b69e4caaSHRINE2020-456 - Simplify shrine.conf with default values - Modified to use .map.getOrElse
bcarmenbcarmen
720703b7928saving work
bcarmenbcarmen
5d08f9ee461Merge branch 'develop' into feature/SHRINE2020-532
elizahelizah
ec1c5062bb9combine api and root
elizahelizah
27a8174d689wrong log
elizahelizah
a5c651cbf33combine log files
dwalenddwalend
dff13eac876Renamed the long-named-indexing-tool to something shroter for SHRINE2020-464
Marc-Danie NazaireMarc-Danie Nazaire
42aa28933bbSHRINE2020-456 - Simplify shrine.conf with default values - Fixed StaticDataServiceTest
Marc-Danie NazaireMarc-Danie Nazaire
4757c91b123SHRINE2020-456 - Simplify shrine.conf with default values - Added default value for webclient.nextStepsUrl
Marc-Danie NazaireMarc-Danie Nazaire
f8a8d04e25eSHRINE2020-456 - Simplify shrine.conf with default values - Added default value for networkStatusQuery
Marc-Danie NazaireMarc-Danie Nazaire
38a53eb2aa9SHRINE2020-456 - Simplify shrine.conf with default values - Added default value for networkStatusQuery
dwalenddwalend
52fe41f329dFirst batch of Bill's review comments for SHRINE2020-464
elizahelizah
1698b2763bdadd tests
elizahelizah
a6ca9d8257aadd default logger
Marc-Danie NazaireMarc-Danie Nazaire
db6f02ba729SHRINE2020-494 - Migrate the SHRINE_QUERY and QUERY_RESULT tables to Slick - Made networkId the primary key in the SH...
Marc-Danie NazaireMarc-Danie Nazaire
308cef163c9SHRINE2020-494 - Migrate the SHRINE_QUERY and QUERY_RESULT tables to Slick - Removed unused deleteQueryIO function
bcarmenbcarmen
4837b8e9752Merge branch 'develop' into feature/SHRINE2020-534
bcarmenbcarmen
64d1edbf125updated unit test, fixed prop name
elizahelizah
ab9d6c21287remove ripple effects
elizahelizah
f2b251d8648rename to SelectionContext
elizahelizah
cb86ce402e7cleanup
elizahelizah
950936a193eremove useCallback
elizahelizah
8dbc4f705d6move event handler
elizahelizah
ae9d018f38ccleanup reducer
bcarmenbcarmen
16f7e78320bsaving work
elizahelizah
b5a99064c41centralize prompt
elizahelizah
67b8704a40adrop area style change
elizahelizah
e3ee709c498indicate drag region
bcarmenbcarmen
7eac3889b0cMerge branch 'develop' into bugfix/SHRINE2020-363
elizahelizah
68e57e2ef8badd snapshot
elizahelizah
8c259dd47e9remove group when all moved out
Eliza HuangEliza Huang
3a790f611f0Merge pull request #1037 in SHRINE/shrine from bugfix/SHRINE2020-537 to develop * commit '722bf89b2db02f42e30344f062...
elizahelizah
3098b620953correct equality
elizahelizah
bfd80052306Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-170
bcarmenbcarmen
1823add354csaving work
Marc-Danie NazaireMarc-Danie Nazaire
23561a43083SHRINE2020-494 - Migrate the SHRINE_QUERY and QUERY_RESULT tables to Slick - Added return type for toMillis function
Marc-Danie NazaireMarc-Danie Nazaire
70e014c4f5fMerge branches 'develop' and 'feature/SHRINE2020-494' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine in...
elizahelizah
722bf89b2dbclear view mode on logout
bcarmenbcarmen
13fdcae15b3saving work
Eliza HuangEliza Huang
54c38c72b7eMerge pull request #1029 in SHRINE/shrine from bugfix/SHRINE2020-384 to develop * commit '1adaa493314dc36dea0b7ea5fa...
bcarmenbcarmen
1ad3ce88034saving work
bcarmenbcarmen
b8b2fe372ccsaving work
bcarmenbcarmen
f7b4336b3dfsaving updated snapshot test
bcarmenbcarmen
52f06513711saving work
Marc-Danie NazaireMarc-Danie Nazaire
7a4c01b7bdcSHRINE2020-456 - Simplify shrine.conf with default values - Fix retrieval of hub.client.serverUrl
Marc-Danie NazaireMarc-Danie Nazaire
28d5f82c2a5SHRINE2020-456 - Simplify shrine.conf with default values - Removed debug statement
elizahelizah
9f0ac8b1101cleanup
elizahelizah
d872a8d3d96display a download link
elizahelizah
7a0a885254eMerge branch 'feature/SHRINE2020-505' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRIN...
elizahelizah
412fd599552place
Marc-Danie NazaireMarc-Danie Nazaire
483e7cb925eSHRINE2020-456 - Simplify shrine.conf with default values - Set createTopicsMode = Pending in shrine.conf for unit te...
elizahelizah
47e47e22252rm todo
elizahelizah
64d50ecfd93fix tests
elizahelizah
a6651ed891dcleanup context reducer
elizahelizah
020f8b6cc32remove logs
elizahelizah
65235fa10aerename addGroupTerms
elizahelizah
6c963f65ba8rename insertTerms
elizahelizah
1a31f60d3e6fix tutorial
elizahelizah
8de7ccae920working
elizahelizah
006f5ffa431change selection color
elizahelizah
5b67a537831selection color style
elizahelizah
7c4cf8d7a39change on mousedown
elizahelizah
f96a6df14acinsert term
elizahelizah
5b243ddd50bselect with shift
marc-daniemarc-danie
2600cbd10bbSHRINE2020-456 - Simplify shrine.conf with default values - Set default for createTopicsMode to Approved in the shrin...
Bill SimonsBill Simons
c2e2891a308account for directory restructuring in dockerignore
bcarmenbcarmen
9155e4a9698updated package-lock for legacy
bcarmenbcarmen
927adfe3099updated .gitignore
bcarmenbcarmen
672fc62b9efadded package.lock files
bcarmenbcarmen
c46bd8f4fd3added package-lock.json
elizahelizah
583e927d68ause selection context
marc-daniemarc-danie
82d7e7c18deMerge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-456
marc-daniemarc-danie
339b7d61753SHRINE2020-468 - Passwords in shrine.conf make support difficult - Modified the shrine.conf's units tests to use the ...
marc-daniemarc-danie
85e0e410192SHRINE2020-468 - Passwords in shrine.conf make support difficult - Added password.conf to docker, unit tests, and rem...
bcarmenbcarmen
9c3972f9601added front end build for network health
elizahelizah
aebc8fafb9erm unused import
bcarmenbcarmen
815e176cadcupdated changes
bcarmenbcarmen
975535a81d4removed bloop artifact
elizahelizah
85c199c9c04update snapchat
bcarmenbcarmen
3b4580b47f0updated .gitignore
bcarmenbcarmen
1dc683bf1b9updated .gitignore
bcarmenbcarmen
f7131bf4f36updated primary .gitignore
bcarmenbcarmen
239dfd6bb56saving work
dwalenddwalend
4aadb748ed8Folded Receiver into the shrine-api-app directory, alongside Bootstrap for SHRINE-464
elizahelizah
54a2582e62cfixing tests
dwalenddwalend
c120396226fMoved the MOM system into the hub for SHRINE2020-464
elizahelizah
82ecb92d88bfix typo
elizahelizah
17e941a18fdcheck if concept exits
elizahelizah
4a59172e708move between groups
Eliza HuangEliza Huang
a190e03b2cdMerge pull request #1018 in SHRINE/shrine from feature/SHRINE2020-468 to feature/SHRINE2020-456 * commit '52f33dd83d...
dwalenddwalend
db475ce3478Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-464
marc-daniemarc-danie
52f33dd83d9SHRINE2020-468 - Passwords in shrine.conf make support difficult - Added more test password.conf file
elizahelizah
6ad07d7d8d8move drag-dropable area
marc-daniemarc-danie
bbdf142a9d8SHRINE2020-468 - Passwords in shrine.conf make support difficult - Added test password.conf file
elizahelizah
dfc93289463Merge branch 'develop' into feature/SHRINE2020-170
marc-daniemarc-danie
a5fb062e4c3Merge branch 'feature/SHRINE2020-468' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRIN...
marc-daniemarc-danie
3bcc9932913SHRINE2020-468 - Passwords in shrine.conf make support difficult - changed shrine.keystore.password to be the correct...
dwalenddwalend
b9ebcc2a6adMoved http4s utilities into util for SHRINE2020-464
elizahelizah
948486eb9d8Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-170
elizahelizah
a587060ba97Merge branch 'feature/SHRINE2020-387' into develop
Eliza HuangEliza Huang
b665325380fMerge pull request #1032 in SHRINE/shrine from bugfix/SHRINE2020-401 to develop * commit 'add9c1663d8007bd9746067183...
Eliza HuangEliza Huang
ef48669e5c4Merge pull request #1031 in SHRINE/shrine from bugfix/SHRINE2020-381 to develop * commit '6e8e6afc1f5a0f2ce1517a4031...
Eliza HuangEliza Huang
eb95d6bd8f9Merge pull request #1033 in SHRINE/shrine from feature/SHRINE2020-387 to develop * commit '54dbf4a6c02f43e8da456786b...
elizahelizah
6e8e6afc1f5set find patients page as default
elizahelizah
8f710370cf7fix merge conflict
elizahelizah
8a243e46f3aremove close action on static text
marc-daniemarc-danie
afd2b2be4aaSHRINE2020-456 - Simplify shrine.conf with default values - replaced to use getOption().getOrElse in ConfigExtensions
elizahelizah
c43e300c4f3Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into bugfix/SHRINE2020-399
elizahelizah
a209ad8013dMerge branch 'feature/SHRINE2020-456' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRIN...
dwalenddwalend
a3960d80872Moved the jmeter parts to the apps directory and deleted the tools directory for SHRINE2020-464
dwalenddwalend
4f3931497d2Moved jmeter-automation for SHRINE2020-464
marc-daniemarc-danie
f243efd4466SHRINE2020-456 - Simplify shrine.conf with default values - Fixed build
dwalenddwalend
d4d4b7116b4Moved the hub audit tool for SHRINE2020-464
dwalenddwalend
0138946a9f0Moved hubAuditTool closer to the hub for SHRINE2020-464
marc-daniemarc-danie
8abffe00386SHRINE2020-456 - Simplify shrine.conf with default values - Added getOptionWithFallback function to ConfigExtensions
dwalenddwalend
7d291add611Moved the ontology building tool to the ontology project for SHRINE2020-464
marc-daniemarc-danie
7c01a609d6fSHRINE2020-456 - Simplify shrine.conf with default values - replaced to use getOption().getOrElse in ConfigExtensions
dwalenddwalend
11b999c1b7eCleaned up some comments for SHRINE2020-464
dwalenddwalend
320d30ec581Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-464
marc-daniemarc-danie
b8f8a27c9fdSHRINE2020-456 - Simplify shrine.conf with default values - added buildUri function to ConfigExtensions
elizahelizah
b72052fd0c7move to password.conf file
bcarmenbcarmen
e4e04827c99moved dashboard frontend code and dsa frontend code and legacy
elizahelizah
f8b34c98ff2Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-468
elizahelizah
f759538195efix query round trip test
dwalenddwalend
c6bb71de031Moved the I2B2QepService into the legacy/service subproject for SHRINE2020-464
elizahelizah
73387d7eddbMerge branch 'feature/SHRINE2020-456' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRIN...
elizahelizah
ee6414a2cafadd password.conf to msg queue
marc-daniemarc-danie
d50a5c0fb17SHRINE2020-456 - Simplify shrine.conf with default values - removed urlPath from test shrine.conf
bcarmenbcarmen
b162afdba7fdeleted unused stuff
bcarmenbcarmen
b907ed17eedcommitting change of dashboard frontend code
elizahelizah
5f6eac6f503fix exception tests
elizahelizah
5e9cf692a0bMerge branch 'feature/SHRINE2020-456' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRIN...
marc-daniemarc-danie
71e7b185179Added use statements to the beginning of the *.ddl files
bcarmenbcarmen
45044782a50changed method name
marc-daniemarc-danie
382f0eea5a1SHRINE2020-456 - Simplify shrine.conf with default values - removed empty adapter block
marc-daniemarc-danie
1b50f57c07eAdded use statements to the beginning of the *.ddl files
marc-daniemarc-danie
f1b237c3ab7Removed duplicate statement to create index "previousQueriesDateCreatedIndex" on "previousQueries"
marc-daniemarc-danie
bdbefcb435cRemoved alter table "queriesReceived" add "userDomainName" VARCHAR(MAX) NULL statement call since userDomainName colu...
elizahelizah
1adaa493314update snapshots
bcarmenbcarmen
512310efe7asaving work
bcarmenbcarmen
6f503ade5baadded demo distribution view
elizahelizah
13932ff24edMerge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into bugfix/SHRINE2020-384
elizahelizah
e5cb5a96e68fix merge conflicts
marc-daniemarc-danie
fac2d09f914SHRINE2020-456 - Simplify shrine.conf with default values - shrine.conf cleanup
marc-daniemarc-danie
cc6471cc1d6SHRINE2020-456 - Simplify shrine.conf with default values - Fix retrieval of crcEndpointUrl in DashboardService
marc-daniemarc-danie
c7d13b57babSHRINE2020-456 - Simplify shrine.conf with default values - moved the messagequeue element to be a child of the hub e...
marc-daniemarc-danie
c9512d38ed1SHRINE2020-456 - Simplify shrine.conf with default values - set default value for hiveCredentials.domain and hiveCred...
marc-daniemarc-danie
f5bfbc50e2bSHRINE2020-456 - Simplify shrine.conf with default values - set default value for webclient.domain and webclient.name
marc-daniemarc-danie
5d6609d9cd5SHRINE2020-456 - Simplify shrine.conf with default values - set default value for webclient.domain and webclient.name
dwalenddwalend
699166b0ee3Got rid of CertCollectionAdapter for SHRINE2020-469 and SHRINE-3425
dwalenddwalend
554b5434131Removed trustModel shrine.conf value for SHRINE2020-469
dwalenddwalend
7f0bf0734c4Moved a lot of crypto stuff into the crypto package for SHRINE2020-469 , SHRINE-3425
marc-daniemarc-danie
9a5f1978bc5SHRINE2020-456 - Simplify shrine.conf with default values - set default value for hub.client.serverUrl
dwalenddwalend
b3cc5b9cdcfMerge branch 'feature/SHRINE2020-469' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRIN...
dwalenddwalend
14c8f170c5bPart-way through removing the Peer cert business for SHRINE2020-469 and SHRINE-3425
marc-daniemarc-danie
8a6344044e6SHRINE2020-456 - Simplify shrine.conf with default values - set default value for keystore.file and keystore.keyStore...
marc-daniemarc-danie
8429f797af3SHRINE2020-456 - Simplify shrine.conf with default values - set default value for keystore.file and keystore.keyStore...
bcarmenbcarmen
11513e05f81Updated Unit test.
marc-daniemarc-danie
0cccd158454SHRINE2020-456 - Simplify shrine.conf with default values - set default value for adapterMappingsFileName
bcarmenbcarmen
c16bc723f2bminor change
bcarmenbcarmen
2da0a175c58saving work
dwalenddwalend
1d78d67d4d2Moved config things into the config package for SHRINE2020-469
marc-daniemarc-danie
0ea63164b0eSHRINE2020-456 - Simplify shrine.conf with default values - replaced url with urlPath and set a default value for pmE...
dwalenddwalend
4bd311c406eMoved a lot of XML stuff from util to xml. Does not build. Getting some help from Ben. SHRINE2020-469
marc-daniemarc-danie
b7f602271fdSHRINE2020-456 - Simplify shrine.conf with default values - replaced serverUrl with serverUrlPath and set a default v...
dwalenddwalend
c7d8a6225deMoved out the OntClient so that http4s-utils does not depend on protocol fo rSHRINE2020-469
elizahelizah
26afbfebd51add unit tests for exceptions
bcarmenbcarmen
53819c535c0updated unit test.
dwalenddwalend
adf9e2e6c95Big rearangement of code to split out the http4s subproject better for SHRINE-469
bcarmenbcarmen
26991cccbc1potential solution for selecting the demographic distribution.
marc-daniemarc-danie
4debe7ae54dSHRINE2020-456 - Simplify shrine.conf with default values - Set default value for steward.createTopicsMode to Approved
marc-daniemarc-danie
f752bcebd3dSHRINE2020-456 - Simplify shrine.conf with default values - Moved definition of SHRINE properties external to the shr...
marc-daniemarc-danie
0217b90a910Cleared out the *-update.sql scripts for SHRINE 3.1, added update scripts for the hub, and renamed the qep update scr...
marc-daniemarc-danie
dfe42a2fc8bSHRINE2020-494 - Migrate the SHRINE_QUERY and QUERY_RESULT tables to Slick - Added TODO to get the QueryHistory schem...
marc-daniemarc-danie
971e2aba7e5SHRINE2020-494 - Migrate the SHRINE_QUERY and QUERY_RESULT tables to Slick - Removed unnecessary run function
dwalenddwalend
625228c8ea0Missed moving the dsa setup scripts in shrine-setup.zip
dwalenddwalend
879440341d7Moved authorization code to the QEP for SHRINE2020-469
marc-daniemarc-danie
03691e90088SHRINE2020-494 - Migrate the SHRINE_QUERY and QUERY_RESULT tables to Slick - Added comment about the locale used in X...
marc-daniemarc-danie
52d2d39e1b1SHRINE2020-494 - Migrate the SHRINE_QUERY and QUERY_RESULT tables to Slick - removed unused daysFromNow function from...
marc-daniemarc-danie
b5bc7ac675aMerge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-494
elizahelizah
2648136fd5eMerge branch 'feature/SHRINE2020-456' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRIN...
elizahelizah
87531712208cleanup
Next →