SHRINE
  1. SHRINE

shrine

Public
  1. SHRINE
  2. shrine

All Branches Graph  

        
AuthorCommitMessageCommit dateBuilds
bcarmenbcarmen
e635944d218Merge branch 'feature/SHRINE2020-242' into merge
Liam MoynihanLiam Moynihan
ffb737db011Merge branch '2.0-webclient' into feature/SHRINE2020-226
Liam MoynihanLiam Moynihan
f79e76f2d4bUnified flag and unflag api calls and added query id to flag dialog
bcarmenbcarmen
e96ab75e442merge
bcarmenbcarmen
d3c0db075cbMerge branch 'feature/SHRINE2020-245' into merge
Liam MoynihanLiam Moynihan
f01f7edd768Merge branch 'feature/SHRINE2020-252' into feature/SHRINE2020-226
bcarmenbcarmen
8a28ca73226fix of failing snapshot
bcarmenbcarmen
43f9fddb1fesilence failing snapshot tests
marc-daniemarc-danie
73f753502beMerge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-173
bcarmenbcarmen
856ee869733merge of SHRINE2020-245
bcarmenbcarmen
f89dd58517dmerge changes
XavXav
6ead64cc753Merge branch 'feature/SHRINE2020-226' into feature/SHRINE2020-218
bcarmenbcarmen
b1850bfa84fsaving merge changes
bcarmenbcarmen
35b407dacadMerge branch 'feature/SHRINE2020-238' into merge
bcarmenbcarmen
b9759fab341fixed unit tests
marc-daniemarc-danie
bba4fafe8e0SHRINE2020-252 - Modified sendQueryUpdate to return an IO
marc-daniemarc-danie
41eae238711Merge branches '2.0-webclient' and 'feature/SHRINE2020-173' of https://open.med.harvard.edu/stash/scm/shrine/shrine i...
marc-daniemarc-danie
21462028b09Merge branches '2.0-webclient' and 'feature/SHRINE2020-173' of https://open.med.harvard.edu/stash/scm/shrine/shrine i...
Liam MoynihanLiam Moynihan
26eb4e6b7e5Merge pull request #896 in SHRINE/shrine from feature/SHRINE2020-154 to 2.0-webclient * commit '40b09faca1ef305f564b...
bcarmenbcarmen
bb6fd95ee9cfix of failing unit tests
Liam MoynihanLiam Moynihan
68555809731Merge pull request #895 in SHRINE/shrine from feature/SHRINE2020-212 to 2.0-webclient * commit '55e3ff64657eb1e82dea...
Liam MoynihanLiam Moynihan
55e3ff64657Merge branch '2.0-webclient' into feature/SHRINE2020-212
Liam MoynihanLiam Moynihan
d601de6b3c1Fixed bug causing edit query name dialog to not start with the queries current name
Liam MoynihanLiam Moynihan
40b09faca1eChanged unnecessary lets to consts
Liam MoynihanLiam Moynihan
3be5666e623Merge pull request #892 in SHRINE/shrine from feature/SHRINE2020-211 to 2.0-webclient * commit '0efc9c101a7e560a164e...
marc-daniemarc-danie
7b8b98f5c4aSHRINE2020-252 - moved networkId to be a query parameter
marc-daniemarc-danie
91acf02dd2aSHRINE2020-252 - import cleanup
bcarmenbcarmen
70d7c26510afix of broken snapshot test
marc-daniemarc-danie
e67785bcca2SHRINE2020-252 - fixed typo
Liam MoynihanLiam Moynihan
3de47fe1be2Merge pull request #894 in SHRINE/shrine from feature/SHRINE2020-172 to 2.0-webclient * commit '76aa723aea4f08745011...
marc-daniemarc-danie
fbc117a15afSHRINE2020-252 - updated unit tests
marc-daniemarc-danie
3bce1cfca56SHRINE2020-252 - replaced flag and unflag query api calls with changeQueryFlag api call
marc-daniemarc-danie
dc63dee08a8SHRINE2020-173 - Display a readable format of the query definition on the View Results tab - fixed with placement for...
marc-daniemarc-danie
e495b525bbbSHRINE2020-173 - Display a readable format of the query definition on the View Results tab - changes for hiding and s...
bcarmenbcarmen
25bdb4513bdsaving work
bcarmenbcarmen
b01f2d9897btemporary silence of failing snapshot tests
bcarmenbcarmen
6b00c616ad0saving changes
XavXav
ab2ba6d19c7SHRINE2020-218 : added back-end unit test
XavXav
a20a2d141eaSHRINE2020-218 : reset js config to original values
XavXav
03a2d2890a7SHRINE2020-218 : update snapshot
Liam MoynihanLiam Moynihan
91dca69b0c9Removed unintended code changes caused by git merge
XavXav
1efd2ddcfe1SHRINE2020-218 : implement dialog for renaming a query and integrate with back-end
bcarmenbcarmen
9f2f27ed699moved common modal styles to a mixin
bcarmenbcarmen
06edff558affix of snapshot
Liam MoynihanLiam Moynihan
678965b7c2eFixed failing snapshot test
bcarmenbcarmen
0d854d191a5Merge branch 'feature/SHRINE2020-245' into feature/SHRINE2020-242
Liam MoynihanLiam Moynihan
26d512fd964Cleared query name validation errors after generating name
bcarmenbcarmen
4c8bb6057fafix of failing snapshot tests
bcarmenbcarmen
a0a7998837efix of failing unit test
Liam MoynihanLiam Moynihan
595ed23f794Updated query name validity when generating a name
bcarmenbcarmen
88842122190disabled failing snapshot tests
bcarmenbcarmen
fcfba53a490updated unit tests
Liam MoynihanLiam Moynihan
76aa723aea4Incorporated pr feedback for backend sorting of query institution results
XavXav
7a7953c3104SHRINE2020-218 : merged SHRINE2020-226
marc-daniemarc-danie
7d386906f4cSHRINE2020-247 - Return readable query definition in queryResult api call - enable code category
marc-daniemarc-danie
173b4915c2fMerge branches '2.0-webclient' and 'feature/SHRINE2020-173' of https://open.med.harvard.edu/stash/scm/shrine/shrine i...
marc-daniemarc-danie
fb61ecd7e35disabled query criteria
Liam MoynihanLiam Moynihan
0efc9c101a7Incorporated pr feedback for observed field in reducer
bcarmenbcarmen
6b44492145eadded recommendations from code reviews
XavXav
b819cd3f8e0SHRINE2020-218 : back-end for editing a query name
bcarmenbcarmen
3247da9f996fix of node version
Liam MoynihanLiam Moynihan
59a920d6e25Merge branch 'feature/SHRINE2020-253' into feature/SHRINE2020-226
marc-daniemarc-danie
651825a4383Added flag and unflag api calls
marc-daniemarc-danie
19d36d7496fMerge branch 'feature/SHRINE2020-226' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020...
marc-daniemarc-danie
a0c7fa9d66dAdded flag and unflag api endpoints
bcarmenbcarmen
4c0134fd761updates based on code reviews
marc-daniemarc-danie
b6a40dc2d7cSHRINE2020-252 - temporarily disabled code category
bcarmenbcarmen
ac9f576299dChanges based on code review
Liam MoynihanLiam Moynihan
1d41791933fRemoved wip error status dialog
Liam MoynihanLiam Moynihan
d9e3921c442Merge branch 'feature/SHRINE2020-253' of ssh://open.catalyst.harvard.edu:7999/shrine/shrine into feature/SHRINE2020-253
Liam MoynihanLiam Moynihan
2ae8f377258Split flag and unflag frontend calls into two seperate endpoints
Liam MoynihanLiam Moynihan
bc3e2167199First pass of query result flagging before conecting to backend
Liam MoynihanLiam Moynihan
ff36b625231First iteration of dialog box pop ups for flag renaming and errors
Liam MoynihanLiam Moynihan
be54b2c79e7Split flag and unflag frontend calls into two seperate endpoints
Liam MoynihanLiam Moynihan
1d2a65fddaeFirst pass of query result flagging before conecting to backend
Liam MoynihanLiam Moynihan
5a028b439fdFirst iteration of dialog box pop ups for flag renaming and errors
bcarmenbcarmen
eb89d8f6ffbsaving changes to secure fetch
Liam MoynihanLiam Moynihan
f4c25555adbChanged style of query history name hover text
Liam MoynihanLiam Moynihan
df785c88b44Merge branch 'feature/SHRINE2020-35' of ssh://open.catalyst.harvard.edu:7999/shrine/shrine into feature/SHRINE2020-35
marc-daniemarc-danie
f343b0b217bSHRINE2020-252 - unflag and flag query api calls with unit tests
Liam MoynihanLiam Moynihan
34dbe376199Changed hover text and styling of auto generate query name button
Liam MoynihanLiam Moynihan
083ed2aefc5Changed auto generate icon hover text
marc-daniemarc-danie
35190046755SHRINE2020-252 - unflag and flag query api calls
marc-daniemarc-danie
289edb3b83dSHRINE2020-252 - unflag and flag query api calls
bcarmenbcarmen
63313b81fadFix of failing snapshot
bcarmenbcarmen
4def10a7f44fix of secure fetch
bcarmenbcarmen
c50ed161d56Merge branch 'feature/SHRINE2020-245' into feature/SHRINE2020-242
bcarmenbcarmen
f5c9028c18eupdated steward proxy
bcarmenbcarmen
247df047fc7updated steward request
bcarmenbcarmen
932849ee6ffcode cleanup
bcarmenbcarmen
929cf733310Merge branch '2.0-webclient' into feature/SHRINE2020-245
bcarmenbcarmen
d6e5b2ce6a0updated snapshot test
bcarmenbcarmen
a453fc68b1cfix of secure fetch
bcarmenbcarmen
6cdb04e7122Merge branch '2.0-webclient' into feature/SHRINE2020-242
bcarmenbcarmen
52da429999eadded sort to query topics
Liam MoynihanLiam Moynihan
752c2223c94Incorporated BA suggestions for tooltip arrow and font size
bcarmenbcarmen
80816567fb6updated ViewModeTypes
bcarmenbcarmen
52c194a5a54potential solution for hiding the tutorial
Liam MoynihanLiam Moynihan
333b980af77First pass of query result flagging before conecting to backend
Liam MoynihanLiam Moynihan
ddae8cad8ccMerge pull request #887 in SHRINE/shrine from feature/SHRINE2020-235 to 2.0-webclient * commit '31cba5430da9dcf16208...
Liam MoynihanLiam Moynihan
a68849fecb3Merge branch 'dialog-boxes' into feature/SHRINE2020-226
Liam MoynihanLiam Moynihan
c018a32d337First iteration of dialog box pop ups for flag renaming and errors
marc-daniemarc-danie
31b1b46090cSHRINE2020-247 - Return readable query definition in queryResult api call - fixed broken unit tests
marc-daniemarc-danie
f246045058aSHRINE2020-247 - Return readable query definition in queryResult api call - added complex query criteria test
marc-daniemarc-danie
21f13d307b6SHRINE2020-247 - Return readable query definition in queryResult api call - modified format of the tests to Junit
bcarmenbcarmen
7971cfebdcbsaving work
bcarmenbcarmen
f976904dcd5Fix of broken start query
marc-daniemarc-danie
3e0a8577077SHRINE2020-247 - Return readable query definition in queryResult api call - commented out failing tests
bcarmenbcarmen
f21a3e3f4a4potential fix of secureFetch
bcarmenbcarmen
9663870b649saving work
marc-daniemarc-danie
47d7ea51488SHRINE2020-247 - Return readable query definition in queryResult api call - fixed criteria text when there is only on...
marc-daniemarc-danie
d6d667f6011SHRINE2020-247 - Return readable query definition in queryResult api call - included front end changes
Liam MoynihanLiam Moynihan
31cba5430daExpanded query history date timestamp
marc-daniemarc-danie
f546812d30aSHRINE2020-226 - Allow a user to flag a previous query, including functionality and back end work - includes working ...
dwalenddwalend
06624b52f82Moving develop to version 2.1.0-M7
dwalenddwalend
63165a5db53Moved the version to 2.1.0-M6QA1 for M6's QA pass
bcarmenbcarmen
2c8ba7a8ec3saving work
bcarmenbcarmen
be1b27fd4cfMerge branch '2.0-webclient' into feature/SHRINE2020-242
bcarmenbcarmen
2982764877asaving work
marc-daniemarc-danie
a41a95e9b7cSHRINE2020-247 - Return readable query definition in queryResult api call - added code category to the text
marc-daniemarc-danie
1152ad6a1dfSHRINE2020-247 - Return readable query definition in queryResult api call - added code category to the text
bcarmenbcarmen
851be6ccfa8Merge branch '2.0-webclient' into feature/SHRINE2020-245
bcarmenbcarmen
a544405fa3dsaving work
XavXav
ed750624d25SHRINE2020-226 : A messy bunch of comments to try and plan out how to build the flag-query service -- this does not b...
Liam MoynihanLiam Moynihan
27191b4d5e7Added tool tip to show query name when name is overflowing
Liam MoynihanLiam Moynihan
07f9313b35eRemoved flatmap usage to align with node v10
bcarmenbcarmen
aa008476f9dPotential solution for Query Error Dialog and fetching the config.
David WalendDavid Walend
55d5fab49a6Merge pull request #886 in SHRINE/shrine from feature/SHRINE-3541-realy-remove-shrine.war to develop * commit 'c6734...
Liam MoynihanLiam Moynihan
729806b3bb4Bumped node js version to 12.16.1
bcarmenbcarmen
a8a0d467661saving unit tests
bcarmenbcarmen
066c2d1e17dupdated models to reflect queryDetailInfo
Liam MoynihanLiam Moynihan
e0ba2e51206Updated tests for bolding new query results
Liam MoynihanLiam Moynihan
b1d68c4cfb1Added enum values back to drop down for lab query terms
Liam MoynihanLiam Moynihan
6bb4c18d671Added bold type to queries that are unobserved
bcarmenbcarmen
176143c5af1saving unit tests.
marc-daniemarc-danie
d0b6621894dMerging in most of the changes from SHRINE2020-225 - Include total number of sites and patient counts in the queryRes...
marc-daniemarc-danie
c2d9955a606SHRINE2020-247 - Return readable query definition in queryResult api call
bcarmenbcarmen
5044a7e9934pushing latest work
Liam MoynihanLiam Moynihan
2c9feb4f676Added snapshot test for type select
Liam MoynihanLiam Moynihan
7cd9759d22cMerge branch '2.0-webclient' into feature/SHRINE2020-154
Liam MoynihanLiam Moynihan
f06e87f0b0fUpgraded node version from 10.15.1 to 12.0.0
Liam MoynihanLiam Moynihan
620c53be313First pass of making lab details drop down data driven
dwalenddwalend
c6734f2287dThese comments are lies
bcarmenbcarmen
03658b754e3removed empty test
bcarmenbcarmen
bfda821b239added unit tests
bcarmenbcarmen
9976338ffa2Merge branch 'feature/SHRINE2020-245' into feature/SHRINE2020-242-client-side-work-for-loading-reloading
bcarmenbcarmen
c24eef903ecadded tests for query topic access fetch
Liam MoynihanLiam Moynihan
82e177b968fMerge remote-tracking branch 'origin/2.0-webclient' into feature/SHRINE2020-172
Liam MoynihanLiam Moynihan
b8a0afcd25fFixed small frontend result sorting bugs
XavXav
4be4941ee0cSHRINE2020-226 : added a REST endpoint for flagging a query
Liam MoynihanLiam Moynihan
0576cf01ffdFixed capitalization error in result status checking
bcarmenbcarmen
55652a55ae3fixed unit tests
bcarmenbcarmen
13f66586c7apotential solution for loading topics
Liam MoynihanLiam Moynihan
fe74fbd65a3Implemented institution result sorting on backend
dwalenddwalend
b94aba4eebfRemoved shrine-app and shrine-war for SHRINE-3541
Liam MoynihanLiam Moynihan
d761913f163Added sort site by query param to query result route
Liam MoynihanLiam Moynihan
bd75ea45e05Updated tests for query result sorting
bcarmenbcarmen
ce104d776c6saving changes
bcarmenbcarmen
4a2d66b4183Merge branch 'feature/SHRINE2020-245-create-a-topic' into feature/SHRINE2020-245-client-side-work-for-creating
bcarmenbcarmen
4d01e255cebPotential Solution for creating a query topic
David WalendDavid Walend
fc772dca3cfMerge pull request #885 in SHRINE/shrine from feature/SHRINE-3541-remove-shrine.war-war-and-shrine-app to develop * ...
dwalenddwalend
d2bc69a0d93merge with develop (and cleaned up some imports)
David WalendDavid Walend
a19e7c2e687Merge pull request #884 in SHRINE/shrine from bugfix/SHRINE-3711-authenticate-aim-3-requests-for to develop * commit...
Liam MoynihanLiam Moynihan
345e9135884Implemented frontend logic for sorting institution results
marc-daniemarc-danie
32f8e419160SHRINE2020-223 - Display an aggregate count of the number of sites returning results, and the total patient count in ...
Liam MoynihanLiam Moynihan
b226069911eSlight performance increase with query name generation logic
Liam MoynihanLiam Moynihan
0859b49dc35Changed query name validation to allow all ascii characters between 32 and 126
dwalenddwalend
545c9262a2bOne chaser for SHRINE-3541
dwalenddwalend
ee41f98af2bLast cleanup for SHRINE-3541
bcarmenbcarmen
f95a5274987saving work
marc-daniemarc-danie
7e878910886SHRINE2020-223 - Display an aggregate count of the number of sites returning results, and the total patient count in ...
marc-daniemarc-danie
9f4d799ef2fMerge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-223
marc-daniemarc-danie
fce7f44b1f2SHRINE2020-223 - Display an aggregate count of the number of sites returning results, and the total patient count in ...
bcarmenbcarmen
f4efb4aa98fMerge branch '2.0-webclient' into feature/SHRINE2020-169-create-topic
bcarmenbcarmen
42dade9c321make sure that "hidden" attribute is working
dwalenddwalend
b0cfe14ac2dConsolidating aim3-specific parts to the aim3 service for SHRINE-3541
bcarmenbcarmen
b9f294e08bbsaving work
Liam MoynihanLiam Moynihan
b7da439b1f2Added button to automatically generate default query name
bcarmenbcarmen
a0f988abab5saving work
dwalenddwalend
8d19cc82397Changed the request handler to more modern scala for SHRINE-3541
dwalenddwalend
a0c6f662136Deleted another layer for SHRINE-3541
dwalenddwalend
53a3a0642c7Consolidated the awkward layers of the request dispatch into just one big if statement for SHRINE-3541
XavXav
d7a9fb7acaaMerge branch '2.0-webclient' into origin/feature/SHRINE2020-219B-client-side-work-for-displaying
marc-daniemarc-danie
eb119932c71Merge remote-tracking branch 'origin/2.0-webclient' into 2.0-webclient
marc-daniemarc-danie
432ecaf32bfFix concept type when getting conceptInfo
XavXav
9736c66a8c3Merge branch '2.0-webclient' into origin/feature/SHRINE2020-219B-client-side-work-for-displaying
dwalenddwalend
e0f5e3792dbDissolving HandleableAdminShrineRequest first step for SHRINE-3541
dwalenddwalend
721c79e5895Deleted the held message business for SHRINE-3541
Next →