SHRINE
  1. SHRINE

shrine

Public
  1. SHRINE
  2. shrine

All Branches Graph  

        
AuthorCommitMessageCommit dateBuilds
bcarmenbcarmen
ece0b1b31daupdate of unit tests
bcarmenbcarmen
d93ae082060saving work
marc-daniemarc-danie
3756b86e5f5Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-309
Marc-Danie NazaireMarc-Danie Nazaire
a47b04d2708Merge pull request #961 in SHRINE/shrine from bugfix/SHRINE2020-258 to develop * commit '8dbedb3d212c4d7f8c797d162f2...
bcarmenbcarmen
ea5ba094a46fix of unit tests
Marc-Danie NazaireMarc-Danie Nazaire
9bfa35a909bMerge pull request #960 in SHRINE/shrine from bugfix/SHRINE2020-346 to develop * commit '9633771cdc2128727415b40640c...
bcarmenbcarmen
0557fb15d7fsaving work
dwalenddwalend
e3aff52dc8cCleaned up import for SHRINE2020-357
dwalenddwalend
7fd5109ae13Should give a submit error for SHRINE2020-357. Something else is preventing the code from getting that far
dwalenddwalend
5063fe5bd60Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-357
marc-daniemarc-danie
8dbedb3d212SHRINE2020-258 - Sort Topics Alphabetically from server instead of on client
bcarmenbcarmen
b8f2be59bf4saving changes
Marc-Danie NazaireMarc-Danie Nazaire
49e34109b6aMerge pull request #951 in SHRINE/shrine from feature/SHRINE2020-311 to develop * commit '6b7464c3386e3c97c1d0f70268...
marc-daniemarc-danie
9633771cdc2SHRINE2020-346 - SHRINE 2020: Error Message modal: i2b2 XML appearing in Description and Message field - added back m...
David WalendDavid Walend
bc9f3151395Merge pull request #958 in SHRINE/shrine from bugfix/SHRINE2020-354-prod-demo-node-selecting-topics to develop * com...
bcarmenbcarmen
a6d1f8aa70bsaving work
bcarmenbcarmen
1234f1662afSuggested SCSS changes
marc-daniemarc-danie
34a937b9d20SHRINE2020-346 - SHRINE 2020: Error Message modal: i2b2 XML appearing in Description and Message field - code cleanup
marc-daniemarc-danie
dbf7f490f0dSHRINE2020-346 - SHRINE 2020: Error Message modal: i2b2 XML appearing in Description and Message field - code cleanup
marc-daniemarc-danie
9267abc98aeSHRINE2020-346 - SHRINE 2020: Error Message modal: i2b2 XML appearing in Description and Message field
dwalenddwalend
64b37b1bba1Added multiple asynchronous send attempts for SHRINE2020-357
bcarmenbcarmen
532605005cesaving changes
bcarmenbcarmen
9b4e1951987remove tutorial
bcarmenbcarmen
7a6bc938156changed config
bcarmenbcarmen
246db6c557badded unit test back in
bcarmenbcarmen
52c7fdc02bapotential fix of hanging tutorial
dwalenddwalend
f06e92bfa8bAdded unit test for topics from 2.0.0 used in 3.0.0, cleaned up some other tests for SHRINE2020-354
bcarmenbcarmen
bf9751c23afsaving work
marc-daniemarc-danie
6b7464c3386SHRINE2020-311 - Help icon and text so users can copy/paste results into csv/notepad with table formatting - BA revie...
marc-daniemarc-danie
d64be7afa7eSHRINE2020-311 - Help icon and text so users can copy/paste results into csv/notepad with table formatting - BA revie...
marc-daniemarc-danie
981e2be78ffMerge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-311
bcarmenbcarmen
3263ca11cccsaving work
bcarmenbcarmen
54f431aa70dsaving work
Bill SimonsBill Simons
8dc724a91abupdate README with correct environment variable setup
Bill SimonsBill Simons
c1bf8363110update README with correct environment variable setup
Bill SimonsBill Simons
b984dcf4e9bupdate README with correct environment variable setup
Liam MoynihanLiam Moynihan
383be1a357dMerge pull request #955 in SHRINE/shrine from feature/SHRINE2020-347 to develop * commit 'ad9fe49d1f7a622cf4a4b71f6d...
Liam MoynihanLiam Moynihan
c1de77f2289Merge pull request #956 in SHRINE/shrine from feature/SHRINE2020-160 to develop * commit '0ae982cb28b8fa5a3a1c2fb766...
Liam MoynihanLiam Moynihan
b82880c0831Merge pull request #952 in SHRINE/shrine from feature/SHRINE2020-352 to develop * commit '3d64f73a0e8522f65468d97147...
Liam MoynihanLiam Moynihan
5d66634c876Merge pull request #947 in SHRINE/shrine from feature/SHRINE2020-256 to develop * commit '7802cd4188703e4f49b2fdc201...
Marc-Danie NazaireMarc-Danie Nazaire
1265aac83f4Merge pull request #954 in SHRINE/shrine from bugfix/SHRINE2020-348 to develop * commit 'b68c23ebe47b5c818ff61e66646...
bcarmenbcarmen
67e0d7090a9spaced out login
bcarmenbcarmen
39552011279moved next steps icon to the right
Bill SimonsBill Simons
0fbfed1ff14update README to include the necessary i2b2 demo env properties
marc-daniemarc-danie
d5320d2cbb3SHRINE2020-311 - Help icon and text so users can copy/paste results into csv/notepad with table formatting - added va...
marc-daniemarc-danie
cf59b316317SHRINE2020-311 - Help icon and text so users can copy/paste results into csv/notepad with table formatting - removed ...
bcarmenbcarmen
c72e224d2a3saving work
Bill SimonsBill Simons
956d1204b3bshrine and i2b2 integrated dev env basic use case is working for the new webclient; the ontology is not loaded into i...
marc-daniemarc-danie
b68c23ebe47SHRINE2020-348 - SHRINE 2020: View Results: Blue Highlight feature for selecting the query is not working in the prev...
Liam MoynihanLiam Moynihan
0ae982cb28bFixed clearing youve been logged out and capitalized text
marc-daniemarc-danie
5468981b8b5SHRINE2020-348 - SHRINE 2020: View Results: Blue Highlight feature for selecting the query is not working in the prev...
marc-daniemarc-danie
79510c97a9bSHRINE2020-348 - SHRINE 2020: View Results: Blue Highlight feature for selecting the query is not working in the prev...
XavXav
1e3fe4e8668SHRINE2020-350 : removed commented out code
Liam MoynihanLiam Moynihan
3d64f73a0e8trim trailing whitespace on searching
XavXav
8ba6fad7d05SHRINE2020-350 : by default when the current state type is LOGIN, do not modify the state type, instead of transition...
bcarmenbcarmen
1a0f9f1a2cdpotential solution for tutorial
Liam MoynihanLiam Moynihan
7862dc4af06Merge branch 'develop' into feature/SHRINE2020-309
Liam MoynihanLiam Moynihan
8f7478da885Treating search strings with trailing white space as full words
David WalendDavid Walend
379832b5b24Merge pull request #949 in SHRINE/shrine from bugfix/SHRINE2020-341 to develop * commit '45c737d3b448a90f7de55a9acc9...
bcarmenbcarmen
4c49a10283asaving work
marc-daniemarc-danie
380590446d0Merge branches '2.0-webclient' and 'feature/SHRINE2020-311' of https://open.med.harvard.edu/stash/scm/shrine/shrine i...
marc-daniemarc-danie
4f3d6c022b4SHRINE2020-311 - Help icon and text so users can copy/paste results into csv/notepad with table formatting - added to...
Liam MoynihanLiam Moynihan
ad9fe49d1f7Adjusted the background color and box shadow of query result panel
dwalenddwalend
94100378de2Moved to build shrine 3.0 snapshots
marc-daniemarc-danie
8543b0e2f93SHRINE2020-311 - Help icon and text so users can copy/paste results into csv/notepad with table formatting
bcarmenbcarmen
4593137ed74Merge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into 2.0-webclient
bcarmenbcarmen
680ae1bd446saving work
bcarmenbcarmen
ac3bc1b372efix of config
XavXav
fc866071b2cMerge branch '2.0-webclient' into feature/SHRINE2020-300
Marc-Danie NazaireMarc-Danie Nazaire
9df0789dfecMerge pull request #946 in SHRINE/shrine from feature/SHRINE2020-101 to 2.0-webclient * commit 'b5b9e1a7841d38296b69...
bcarmenbcarmen
590d33c1c37fix of missing help links in conf
XavXav
b8fd9602208Merge branch '2.0-webclient' into feature/SHRINE2020-300
bcarmenbcarmen
ac668807068added help links by default
XavXav
3a4ac474ee4Merge branch '2.0-webclient' into feature/SHRINE2020-300
bcarmenbcarmen
1e7ece1f7e2saving changes
Liam MoynihanLiam Moynihan
85e5407a5b4Merge pull request #950 in SHRINE/shrine from feature/SHRINE2020-297 to 2.0-webclient * commit '9ca68eb9f06cae58c4c4...
XavXav
f9f993bc532SHRINE2020-300 : code review feedback
bcarmenbcarmen
e56fd5bd9efadded changes to nextStepsUrl in shrine.conf
Liam MoynihanLiam Moynihan
9ca68eb9f06Fixed count patients button validation for having a selected topic
XavXav
8001e7678f6Merge branch '2.0-webclient' into feature/SHRINE2020-300
XavXav
231461f217bSHRINE2020-300 : code review feedback
bcarmenbcarmen
93492068f97possible solution for configurable next steps tab
bcarmenbcarmen
31bbbdb2f9bfix of missing configuration in shrine.conf
Ben CarmenBen Carmen
e45492da167Merge pull request #945 in SHRINE/shrine from feature/SHRINE2020-288 to 2.0-webclient * commit 'a5f846424ef8bb4ca561...
Liam MoynihanLiam Moynihan
7802cd41887Merge branch 'remove-enum' into feature/SHRINE2020-256
Marc-Danie NazaireMarc-Danie Nazaire
68d702baffdMerge pull request #943 in SHRINE/shrine from feature/SHRINE2020-280 to 2.0-webclient * commit '33f9bacb60339e850425...
David WalendDavid Walend
9d0054bf41fMerge pull request #939 in SHRINE/shrine from feature/SHRINE2020-279 to 2.0-webclient * commit 'a8132036d75f1cca923b...
Liam MoynihanLiam Moynihan
f6fba9b945bMerge pull request #941 in SHRINE/shrine from feature/SHRINE2020-320 to 2.0-webclient * commit '15a96c356d391e753698...
Liam MoynihanLiam Moynihan
2dd27cca15eRemoved enum values from lab value drop down
marc-daniemarc-danie
b5b9e1a7841SHRINE2020-101 - Help documentation for the Ontology Lucene indexing tool
marc-daniemarc-danie
33f9bacb603merge with 2.0-webclient
XavXav
bd339337b5eMerge branch '2.0-webclient' into feature/SHRINE2020-300
David WalendDavid Walend
f0f8a026221Merge pull request #942 in SHRINE/shrine from feature/SHRINE2020-217 to 2.0-webclient * commit '4a7a3bc39d0f89b128eb...
XavXav
7e821bb5270SHRINE2020-300 : merged 2.0-webclient with conflicts
Liam MoynihanLiam Moynihan
15a96c356d3Added important tag to enforce tooltip width restriction
Liam MoynihanLiam Moynihan
e24e0afba0bUpdated unit test ontology to include basecode seraching
Liam MoynihanLiam Moynihan
efeb8569d00Merge branch '2.0-webclient' into feature/SHRINE2020-320
Liam MoynihanLiam Moynihan
f10ab42ee82Merge pull request #936 in SHRINE/shrine from feature/SHRINE2020-296 to 2.0-webclient * commit '821fccd4b81ed0debc23...
Liam MoynihanLiam Moynihan
821fccd4b81Merge branch '2.0-webclient' into feature/SHRINE2020-296
bcarmenbcarmen
a5f846424efadded prop types
bcarmenbcarmen
f6d7ea8970cMerge branch '2.0-webclient' into feature/SHRINE2020-289
Marc-Danie NazaireMarc-Danie Nazaire
213b9f1caceMerge pull request #938 in SHRINE/shrine from feature/SHRINE2020-159 to 2.0-webclient * commit 'aaaa2898835bda08afe1...
Marc-Danie NazaireMarc-Danie Nazaire
b1c8d869e4dMerge pull request #932 in SHRINE/shrine from feature/SHRINE2020-313 to 2.0-webclient * commit 'ae75263fd81b2b677368...
XavXav
eb9e61a6379Merge branch '2.0-webclient' into feature/SHRINE2020-300
bcarmenbcarmen
c50a54e1a21open link in new tab
Ben CarmenBen Carmen
b17eed06182Merge pull request #928 in SHRINE/shrine from feature/SHRINE2020-294 to 2.0-webclient * commit '37ddda136d759f92f42a...
XavXav
357dea97b37SHRINE2020-300 : accept all characters in the front-end (except new lines in topic names and query names)
XavXav
5cf1359cce4Merge branch '2.0-webclient' into feature/SHRINE2020-300
XavXav
e6c8ac63ba2SHRINE2020-300 : fixed front-end topic validation
XavXav
13fa1431665SHRINE2020-300 : manually revert changes made when 2 files were inadvertently included in previous commit
XavXav
19dbf8cc930SHRINE2020-300 : fixed front-end query flag validation;
XavXav
c1eeb6109e9SHRINE2020-300 : fixed validation regex for strings with leading spaces; allow query names to contain any character e...
XavXav
9f7b7756b3aSHRINE2020-300 : fixed topic validation: name can contain any characters except new line; description can accept any ...
bcarmenbcarmen
494847025b2quick removal of icon
bcarmenbcarmen
37ddda136d7fix of skip
bcarmenbcarmen
0895cf712c6Merge branch '2.0-webclient' into feature/SHRINE2020-294
bcarmenbcarmen
35ac8e7739erecommended BA review changes
marc-daniemarc-danie
ae75263fd81SHRINE2020-313 - Review comments in SHRINE2020-140 - especially about logging tokens - Added comments
Ben CarmenBen Carmen
21925b43e75Merge pull request #940 in SHRINE/shrine from feature/SHRINE2020-301 to 2.0-webclient * commit 'f7dee78bf912d0bfc000...
bcarmenbcarmen
bb70f8d19eerecommended BA review changes
marc-daniemarc-danie
2b50f9555c0SHRINE2020-280 - Query status in the View Results panel should reflect the status in the Previous Results panel - rem...
Liam MoynihanLiam Moynihan
53f6f36ee27Updated failing snapshot tests
Liam MoynihanLiam Moynihan
60e744846fbFixed weird spacing on edit criteria tooltip
marc-daniemarc-danie
da815cb9875SHRINE2020-280 - Query status in the View Results panel should reflect the status in the Previous Results panel
Liam MoynihanLiam Moynihan
d5c6ed16174Replaced elipsis with collapse expansion for query criteria
XavXav
15fe71b46bdSHRINE2020-300 : added unit tests of flag message validation
dwalenddwalend
4a7a3bc39d0Cleaned up dependencies in the pom.xml file for SHRINE2020-217. Didn't find anything else to do for shrine 3.0.0
XavXav
02195bc164dSHRINE2020-300 : minor clean-up of exception message; added specificity to unit test for validation
dwalenddwalend
45c737d3b44Use shrine's ID instead of i2b2's to report rare errors from the CRC SHRINE2020-341
bcarmenbcarmen
59b549d1067saving changes
bcarmenbcarmen
d4fe09ee691potential solution for query topic dropdown
bcarmenbcarmen
f5ac5b865fasaving changes
bcarmenbcarmen
a1d924a6b2csaving work
XavXav
c7c047f058fSHRINE2020-300 : added validation logic to FlagData case class and refactored service method for query flag changes t...
Liam MoynihanLiam Moynihan
8f2d142ce9bRemoved unused query result tab view
Liam MoynihanLiam Moynihan
8fd93b7a34aUpdated the message when no query result is selected
Liam MoynihanLiam Moynihan
c1018fb8c6fchanged view details to edit criteria and added a corresponding tool tip
Liam MoynihanLiam Moynihan
9765cbe1ffeStandardized the designs of tool tips and added desnsity to query result table
Liam MoynihanLiam Moynihan
6d24b6921ceMerge branch '2.0-webclient' into feature/SHRINE2020-309
Liam MoynihanLiam Moynihan
68496224c93Incorporated some small frontend feedback to query results page
XavXav
42989c21f40Merge branch 'bugfix/SHRINE2020-299' into feature/SHRINE2020-300
XavXav
928ffb3fcc6Merge branch '2.0-webclient' into bugfix/SHRINE2020-299
bcarmenbcarmen
37dd470b032Merge branch '2.0-webclient' into feature/SHRINE2020-248
bcarmenbcarmen
caa6e6581b2updated link to legacy webclient
XavXav
e5bba49f6a7SHRINE2020-288 : re-doing layout of start query section
dwalenddwalend
d575cdf1760Updating some comments around how shrine asks i2b2's CRC for QUEUED query results
Ben CarmenBen Carmen
2875d5db8d1Merge pull request #933 in SHRINE/shrine from feature/SHRINE2020-234 to 2.0-webclient * commit '2a5bf9308cc95002dd6a...
Ben CarmenBen Carmen
503a883cd53Merge pull request #935 in SHRINE/shrine from bugfix/SHRINE2020-251 to 2.0-webclient * commit '3e1c0b1152a7275ba84a7...
Liam MoynihanLiam Moynihan
868403c6e70Changed diagnosis to diagnoses
XavXav
5991fa24ccbSHRINE2020-288 : re-position + sign for creating new topic
Liam MoynihanLiam Moynihan
24efd1801eaCombined code category and code set filter options maintaining the code set ordering
Liam MoynihanLiam Moynihan
0806032d0beAdded dividers between code category groups
XavXav
0bf5f2b64c7SHRINE2020-288 : update snapshot
XavXav
29be545db8dSHRINE2020-288 : disable topic menu when the user doesn't have any topic
bcarmenbcarmen
f7dee78bf91removed accidental merge of 310
bcarmenbcarmen
f871ba71106added prop types
bcarmenbcarmen
cca5b5c599aupdate query rename dialog to look conistent with other dialogs.
bcarmenbcarmen
841fe2cf352added suggested changes from BA review
bcarmenbcarmen
2a5bf9308ccmade recommended BA review changes
bcarmenbcarmen
b103d044f0bmerged 2.0-webclient
bcarmenbcarmen
5dcf63d556dfix of missinfg parenthesis
bcarmenbcarmen
1f184edb6a6changes based on code reciew
bcarmenbcarmen
5c4a933e544Merge branch '2.0-webclient' into feature/SHRINE2020-289
bcarmenbcarmen
3e1c0b1152afixes based on code reviews
bcarmenbcarmen
c7eed414c94Merge branch '2.0-webclient' into bugfix/SHRINE2020-251
Liam MoynihanLiam Moynihan
07946860ab5Merge branch '2.0-webclient' into feature/SHRINE2020-296
dwalenddwalend
a8132036d75Changed [Submitted] to [Processing at Site] for SHRINE2020-279
XavXav
d6b85fccc57SHRINE2020-288 : update snapshots
XavXav
7591ec6f4f4SHRINE2020-288 : a bit more width for the start query input elements
XavXav
1edc8d354cdSHRINE2020-288 : similar stying for help text in topic drop-down and query name input field
XavXav
eb64b6b0dd1SHRINE2020-288 : make help text dynamic
Ben CarmenBen Carmen
9c283f77c54Merge pull request #937 in SHRINE/shrine from feature/SHRINE2020-248 to 2.0-webclient * commit '0f2730b784a59a53d6f9...
Liam MoynihanLiam Moynihan
a47aa86a795Merge pull request #927 in SHRINE/shrine from feature/SHRINE2020-286 to 2.0-webclient * commit '6ab43f5e9f6b978311c3...
Liam MoynihanLiam Moynihan
6ab43f5e9f6Added missing period
XavXav
504d3d63f47SHRINE2020-288 : positioned help text
Liam MoynihanLiam Moynihan
d2466b3b85aUpdated patient count info text
marc-daniemarc-danie
12cbb88a175SHRINE2020-313 - Review comments in SHRINE2020-140 - especially about logging tokens - removed extra empty line
marc-daniemarc-danie
06ad93f1a80SHRINE2020-313 - Review comments in SHRINE2020-140 - especially about logging tokens - moved UserSessionToken and Use...
Liam MoynihanLiam Moynihan
7a12a02d0abMerge pull request #929 in SHRINE/shrine from feature/SHRINE2020-277 to 2.0-webclient * commit '38e5b99f6c6747956f89...
marc-daniemarc-danie
aaaa2898835SHRINE2020-159 - Allow a user to search for a specific code by the base code - fied broken unit test
Liam MoynihanLiam Moynihan
1b0d992d8c3Merge pull request #926 in SHRINE/shrine from feature/SHRINE2020-302 to 2.0-webclient * commit '56ea3d94d70bfe959a9d...
marc-daniemarc-danie
049011a26f5SHRINE2020-159 - Allow a user to search for a specific code by the base code - reverted code debug changes
marc-daniemarc-danie
c6dc23e9a6aSHRINE2020-159 - Allow a user to search for a specific code by the base code - modified to make highlighted name null...
marc-daniemarc-danie
e9f5bfc9e44SHRINE2020-159 - Allow a user to search for a specific code by the base code - added comment about parsing out the ba...
bcarmenbcarmen
84322203eb3add scrollbar to criterea section of query result panel
marc-daniemarc-danie
a38c1dcffa2SHRINE2020-159 - Allow a user to search for a specific code by the base code - updated the lucene test index
marc-daniemarc-danie
0c6f11304c3SHRINE2020-159 - Allow a user to search for a specific code by the base code;
bcarmenbcarmen
0f2730b784afix of session caching.