SHRINE
  1. SHRINE

shrine

Public
  1. SHRINE
  2. shrine

All Branches Graph  

        
AuthorCommitMessageCommit dateBuilds
dwalenddwalend
fc2bbe316f9Open up the CRC client timeout a bit so that the CRC can report back even if it is running a little slow for SHRINE-3692
dwalenddwalend
6863ee2c834Trimmed the full text of the i2b2 request to the first 5000 characters to fix SHRINE-3691
bcarmenbcarmen
a53cebfaf82Fix so that user is only logged out when hitting logout button and not refresh...also displays "you've been logged ou...
bcarmenbcarmen
4b95f31e419Merge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into 2.0-webclient
bcarmenbcarmen
7436eceb45awhen user refreshes the page, allow them to stay logged in.
Matthew DiLoretoMatthew DiLoreto
c868eadd1f1Merge pull request #815 in SHRINE/shrine from fix-npm-audit-warnings to 2.0-webclient * commit '6ef9c457006b8aca9da1...
Ben CarmenBen Carmen
4a8c0a39abaMerge pull request #814 in SHRINE/shrine from bugfix/SHRINE2020-150-only-send-authentication-challenge to 2.0-webclie...
XavXav
478465b8678SHRINE2020-146 : added missing spec snapshot
mjdiloretomjdiloreto
6ef9c457006Specify exact version of jQuery (3.4.1) to avoid updates causing bugs in the future.
XavXav
a91c831ba3bMerge branch '2.0-webclient' into feature/SHRINE2020-146-display-inactive-codes
bcarmenbcarmen
331147f80c4Merge branch '2.0-webclient' into feature/SHRINE2020-96-as-a-user-i-should-enter-my
Ben CarmenBen Carmen
596bb17ef25Merge pull request #813 in SHRINE/shrine from enhancement/SHRINE2020-106-1-unit-no-dropdown to 2.0-webclient * commi...
XavXav
126d26e6a5aSHRINE2020-146 : simplified scheme for setting and handling branch type and active status
XavXav
f4cf78ea487SHRINE2020-146 : renamed drag-and-drop types so they are not confused with the active/inactive status of a medical co...
XavXav
aa0072b5fb7SHRINE2020-146 : fix test snapshot after merge from 2.0-webclient
XavXav
d7f18424b1dSHRINE2020-146 : merge from 2.0-webclient
marc-daniemarc-danie
2b004727c43SHRINE2020-150 - Only send authentication challenge when X-Requested-With": "XMLHttpRequest is not in the request hea...
marc-daniemarc-danie
2728b5f205dSHRINE2020-150 - Only send authentication challenge when X-Requested-With": "XMLHttpRequest is not in the request hea...
Ben CarmenBen Carmen
f4086e9252fMerge pull request #812 in SHRINE/shrine from feature/SHRINE2020-149-add-x-requested-with to feature/SHRINE2020-96-as...
mjdiloretomjdiloreto
cc77e3acfa2Resolved all npm audit warnings by removing unused deps and updating jQuery.
Matthew DiLoretoMatthew DiLoreto
e5941418326Merge pull request #810 in SHRINE/shrine from bugfix/SHRINE2020-116-when-a-user-drags-a-concept to 2.0-webclient * c...
marc-daniemarc-danie
54d8d65cfcfSHRINE2020-150 - Only send authentication challenge when X-Requested-With": "XMLHttpRequest is not in the request hea...
marc-daniemarc-danie
8eff269ef58SHRINE2020-150 - Only send authentication challenge when X-Requested-With": "XMLHttpRequest is not in the request hea...
marc-daniemarc-danie
5c73f63740fSHRINE2020-150 - Only send authentication challenge when X-Requested-With": "XMLHttpRequest is not in the request hea...
marc-daniemarc-danie
97af29a1f71SHRINE2020-150 - Only send authentication challenge when X-Requested-With": "XMLHttpRequest is not in the request header
XavXav
98cd079760cSHRINE2020-146 : implement concept tree behavior for inactive containers and folders
bcarmenbcarmen
9fd67361e51potential solution for SHRINE2020-106 show unit as a label if only one.
bcarmenbcarmen
e21848e83ddfixed npm audit errors
bcarmenbcarmen
58abc4ac112add x-requested with
dwalenddwalend
79efc0d8594Changes to get shrine to compile and run with JDK 11 for SHRINE-2330
Ben CarmenBen Carmen
313908bf986Merge pull request #809 in SHRINE/shrine from feature/SHRINE2020-97-logout to feature/SHRINE2020-96-as-a-user-i-shoul...
bcarmenbcarmen
c5a7ad524fachange to logout button based on code review
dwalenddwalend
423d45a6632pom.xml files for JDK 11 for SHRINE-2330
mjdiloretomjdiloreto
c568911d7b2Remove relative import.
bcarmenbcarmen
99fe877c553Merge branch '2.0-webclient' into feature/SHRINE2020-97-logout
mjdiloretomjdiloreto
b12b7530464Make scroll more subtle and rename ref.
XavXav
a80db6aa65eSHRINE2020-146 : merge from 2.0-webclient
mjdiloretomjdiloreto
25cd0cab80cScroll the query definition section when new terms are added.
XavXav
97764b75e68SHRINE2020-146 : remove unneeded build folder
bcarmenbcarmen
b8b72eb49ecfixed secure fetch issue
bcarmenbcarmen
6c43f605c87xit a failing snapshot test due to date side effect.
bcarmenbcarmen
cbbf69ee410updated snapshot test.
XavXav
4fa6cbf3352reinstated a front-end test and the snapshot it uses
XavXav
b438ee49089Merge branch '2.0-webclient' into feature/SHRINE2020-146-display-inactive-codes
bcarmenbcarmen
2504ac76e57Merge branch '2.0-webclient' into feature/SHRINE2020-96-as-a-user-i-should-enter-my
bcarmenbcarmen
c28effb9261updated snapshot tests
Matthew DiLoretoMatthew DiLoreto
20835e35936Merge pull request #806 in SHRINE/shrine from bugfix/SHRINE2020-130-shrine-2020-maximum-length to 2.0-webclient * co...
marc-daniemarc-danie
a7da654e9e4SHRINE2020-145 - Modify authenticated web client calls to accept either Basic or Bearer authentication and also inclu...
Marc-Danie NazaireMarc-Danie Nazaire
19c6083bf5bMerge pull request #807 in SHRINE/shrine from feature/SHRINE2020-145-modify-authenticated-web-client to develop * co...
bcarmenbcarmen
7d7e9262efalogout implementation
XavXav
74c8e2cc7acMerge branch '2.0-webclient' into feature/SHRINE2020-146-display-inactive-codes # Conflicts: # services/ontology/src...
marc-daniemarc-danie
ec410dc4a86Merge branches 'develop' and 'feature/SHRINE2020-145-modify-authenticated-web-client' of https://open.med.harvard.edu...
marc-daniemarc-danie
28810919c1eMerge branches 'develop' and 'feature/SHRINE2020-145-modify-authenticated-web-client' of https://open.med.harvard.edu...
marc-daniemarc-danie
3397d8c1330SHRINE2020-145 - Modify authenticated web client calls to accept either Basic or Bearer authentication - renamed the ...
marc-daniemarc-danie
ed2c964b00aminor edit
XavXav
f78121b48a5SHRINE2020-144 : pull request feedback
marc-daniemarc-danie
63ea37c7c1bcleaned up imports
XavXav
958396703dcSHRINE2020-144 : merge develop
marc-daniemarc-danie
b8fab89f705removed unused import
marc-daniemarc-danie
313fdc2d69freverting test removal
Ben CarmenBen Carmen
a9fdb044f62Merge pull request #805 in SHRINE/shrine from feature/SHRINE2020-141-initial-login to feature/SHRINE2020-96-as-a-user...
marc-daniemarc-danie
6b9220adf18minor code cleanup
marc-daniemarc-danie
84f1e6ed9c5minor code cleanup
marc-daniemarc-danie
9ab3a19e499removed extra tests
marc-daniemarc-danie
ac58bb353f6SHRINE2020-145 - Modify authenticated web client calls to accept either Basic or Bearer authentication
marc-daniemarc-danie
4662a7af00aCreated BearerAuthentication split UserAuthentication into BasicAuthentication
bcarmenbcarmen
ccf6e4cdb7dAdded logout tab
mjdiloretomjdiloreto
fdad1de94ceMerge branch '2.0-webclient' with bugfix/SHRINE2020-130-shrine-2020-maximum-length.
mjdiloretomjdiloreto
a1a20f2e9a4Exclude non-positive integer inputs from occurrences input field and shorten input length to lab value inputs.
Marc-Danie NazaireMarc-Danie Nazaire
c1a1a5f2820Merge pull request #799 in SHRINE/shrine from feature/SHRINE2020-143-add-authentication-using-bearer to develop * co...
marc-daniemarc-danie
78b4813abe6SHRINE2020-143 - Add authentication using Bearer token in Http4s - Added test for bad session Id
bcarmenbcarmen
53f80c922ffMerge branch '2.0-webclient' into feature/SHRINE2020-96-as-a-user-i-should-enter-my
mjdiloretomjdiloreto
54660202532Change reducer to validate all properties on each change.
Matthew DiLoretoMatthew DiLoreto
bffd6cefab2Merge pull request #801 in SHRINE/shrine from feature/SHRINE2020-128-allow-a-user-to-enter-a-start to 2.0-webclient ...
XavXav
5774d96377dSHRINE2020-146 : display inactive concepts greyed-out, and make them non-draggable.
bcarmenbcarmen
bb09900c3e4Merge branch '2.0-webclient' into feature/SHRINE2020-96-as-a-user-i-should-enter-my
mjdiloretomjdiloreto
fc4854bb5afUnify UI and reducer date range validation.
bcarmenbcarmen
01d08589489added unit tests for reducer
mjdiloretomjdiloreto
9e6395e15dbmerge branch 'feature/SHRINE2020-128-allow-a-user-to-enter-a-start' with bugfix/SHRINE2020-130-shrine-2020-maximum-le...
mjdiloretomjdiloreto
bd422321538Change validation of occurrences input to disallow characters.
bcarmenbcarmen
babbfe53310user saga unit tests.
XavXav
f3e11711cbdSHRINE2020-144 : move TokenResponse case class to UserAuthentication
mjdiloretomjdiloreto
b0b3d90aaf0Rename http4s failure to align with our naming convention.
bcarmenbcarmen
53157986394saving work on unit tests
XavXav
2057d251dbdSHRINE2020-144 : code review feedback - improve comments and remove filtering of the TokenResponse when creating the ...
bcarmenbcarmen
a751c9204eerouter test
bcarmenbcarmen
40d4a4d31becode cleanup
Ben CarmenBen Carmen
4c1e5fc517cMerge pull request #800 in SHRINE/shrine from feature/SHRINE2020-142-auth-caching to feature/SHRINE2020-96-as-a-user-...
mjdiloretomjdiloreto
4dcc8aaa6afMove startQuery request validation to be sooner.
bcarmenbcarmen
f9f8e54844bworking login
marc-daniemarc-danie
652b6787f2emodified to exclude synonyms from the Lucene index
bcarmenbcarmen
14dae68a693Merge branch 'feature/SHRINE2020-142-auth-caching' into feature/SHRINE2020-141-initial-login
bcarmenbcarmen
d20b8527dd5Merge branch '2.0-webclient' into feature/SHRINE2020-141-initial-login
bcarmenbcarmen
8dbc57dcae9saving work
XavXav
f6484625d26SHRINE2020-146 : Revert commit bc5ce244 : "SHRINE2020-134 - As a user, I only want to view the active codes in the me...
mjdiloretomjdiloreto
3fa0892a079Enforce occurrence maximum of 999.
XavXav
fa1a56e38cfSHRINE2020-144 : respond with a JSON object
mjdiloretomjdiloreto
a35b9e80d2eUpdate snapshots after merge.
mjdiloretomjdiloreto
6b92137ed8aMerge branch '2.0-webclient' with feature/SHRINE2020-128-allow-a-user-to-enter-a-start.
mjdiloretomjdiloreto
b1cde417325Do not allow select a date before 1900.
bcarmenbcarmen
4efe577a944removed hard coded auth
bcarmenbcarmen
c7e51f5eb95merge of 2.0-webclient
bcarmenbcarmen
35f54d3de93saving progress
Matthew DiLoretoMatthew DiLoreto
4a105a7234fMerge pull request #798 in SHRINE/shrine from bugfix/SHRINE2020-125-clear-all-button-is-not-resetting to 2.0-webclien...
XavXav
c80a802b90bSHRINE2020-144 : implement login service using basic authentication
bcarmenbcarmen
f9aa117bf1fsaving work
marc-daniemarc-danie
17c32bd1945SHRINE2020-143 - Add authentication using Bearer token in Http4s - minor edit to comment
marc-daniemarc-danie
21199c7047fSHRINE2020-143 - Add authentication using Bearer token in Http4s - Created BasicAuthentication and left common code i...
bcarmenbcarmen
6ed47867214updated auth caching so that json string is base64 encoded
mjdiloretomjdiloreto
5094de3a915Merge shrine 2.1 M3 with 2.0-webclient.
bcarmenbcarmen
2161c968289Updated auth service so that the token is a json representation of the username and sessionId
mjdiloretomjdiloreto
18110bd5db2Restore logic removed in error.
mjdiloretomjdiloreto
3411be0ecfdRemove comments.
mjdiloretomjdiloreto
5b82c69b7e0Cannot submit query if date range is invalid.
mjdiloretomjdiloreto
b4481341fe8Add back invalid date helper text.
mjdiloretomjdiloreto
fa0d6b20453SHRINE2020-138 allow a user to enter a start or end date only
marc-daniemarc-danie
48e67837b7bSHRINE2020-143 - Add authentication using Bearer token in Http4s - Replace circe-core with circe-parse due to conflic...
bcarmenbcarmen
3f3bfdc79fcfix of poorly described test.
bcarmenbcarmen
ab9d8f01dbaabsolute version
bcarmenbcarmen
180f0e41a2erefactor
bcarmenbcarmen
722a4e1ef24created an auth service and a secureFetch service for working with Bearer tokens.
Ben CarmenBen Carmen
e36983bca4eMerge pull request #794 in SHRINE/shrine from SHRINE2020-50-sprint-7-ontology-filter to 2.0-webclient * commit '9c40...
marc-daniemarc-danie
db27dd923c7reverted testing email notification for failures
marc-daniemarc-danie
05d43752d16testing email notification for failures
marc-daniemarc-danie
2f29184e0a2SHRINE2020-143 - Add authentication using Bearer token in Http4s - Added more error handling
marc-daniemarc-danie
204c363c1fbMerge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-143-add-authen...
marc-daniemarc-danie
ec1ec080343SHRINE2020-143 - Add authentication using Bearer token in Http4s - fixed tests
bcarmenbcarmen
71130d6a4easaving progress
marc-daniemarc-danie
814618f5f23SHRINE2020-143 - Add authentication using Bearer token in Http4s
bcarmenbcarmen
213575c9d48wrapped isomorphic fetch with a method called fetchData
mjdiloretomjdiloreto
5a6f5a7263cFix query group styles when groups are cleared.
mjdiloretomjdiloreto
073e222231aFix clear all button to close dialog when OK is pressed. Change button style to be disabled when no query terms.
bcarmenbcarmen
f2fc7e91700saving auth service
mjdiloretomjdiloreto
8b30218a042Merge branch 'feature/SHRINE2020-139-create-login-page' into feature/SHRINE2020-96-as-a-user-i-should-enter-my
mjdiloretomjdiloreto
c70ec990536Remove required indicator from fields.
Ben CarmenBen Carmen
af4c8729f66Merge pull request #795 in SHRINE/shrine from feature/SHRINE2020-137-apply-griffin-s-changes-to to 2.0-webclient * c...
mjdiloretomjdiloreto
d3e7e2bc1f4Add basic login page fields.
bcarmenbcarmen
1454d99a8bcchange suggested from peer review
bcarmenbcarmen
8733174149fchanges for 12/6/2019 demo
bcarmenbcarmen
402a39ce95cmerge of 2.0-webclient
dwalenddwalend
f30f6746f99Moved the version to 2.1.0-M5
dwalenddwalend
aa1a34a3d2dUpdated version to 2.1.0-M4QA1 before making the QA release branch.
marc-daniemarc-danie
f814588439fModified to return the first matching term for terms with similar paths and is not marked as a synonym or root term
XavXav
8eeb2355d9aSHRINE2020-137 : set up grid and flex boxes for "Run Query" UI section
bcarmenbcarmen
9c40aa1030afixed highlighting issue
marc-daniemarc-danie
5c9af9bead4Modified to perform wildcard Lucene search
marc-daniemarc-danie
2bd851057d6Added isSynonym to the Lucene index
bcarmenbcarmen
7cd246eee6fupdated snapshot tests
bcarmenbcarmen
6c2b9f2007aupdated snapshot tests
bcarmenbcarmen
b50d1e44509added error messages and styles for go button
bcarmenbcarmen
7a4dab6ffd2removed footer for 12/6/2019 demo
bcarmenbcarmen
12016767c23made changes to go button and layout
mjdiloretomjdiloreto
a4f933e5cf1Fix ontology container icon alignment.
bcarmenbcarmen
255dd7564c9fixed snapshot
XavXav
41984fd37deMerge branch '2.0-webclient' into feature/SHRINE2020-98-run-query-section-using-material-ui
bcarmenbcarmen
a8ddbccf98bMerge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into 2.0-webclient
bcarmenbcarmen
68559212170fix of firefox not highlighting when dragging over a query term group
XavXav
f8335eb2466Merge branch '2.0-webclient' into feature/SHRINE2020-98-run-query-section-using-material-ui
mjdiloretomjdiloreto
4af8c4fc061Fix ontology containers to not show preview of child folders when dragging open folder.
XavXav
7ed5dd70a6bSHRINE2020-98 : position patient-count button at bottom right
Matthew DiLoretoMatthew DiLoreto
f19c4ceeb6cMerge pull request #788 in SHRINE/shrine from feature/SHRINE2020-99-allow-a-user-to-click-get-counts to 2.0-webclient...
XavXav
feff7d5fea3Merge branch '2.0-webclient' into feature/SHRINE2020-98-run-query-section-using-material-ui
marc-daniemarc-danie
affb14b08d1SHRINE2020-99 - Allow a user to click Get Counts button and execute an 'advanced query' (inc. date ranges, multiple o...
mjdiloretomjdiloreto
61a2ededb76Fix broken saga test.
XavXav
8ef1004a311SHRINE2020-98 : revert unintended change.
bcarmenbcarmen
f5b87f67b84style tweak for header
mjdiloretomjdiloreto
70d212f6f15Clean up ontology service test.
bcarmenbcarmen
3c1bbb90507updated snapshot test.
mjdiloretomjdiloreto
c6a2e7c0f37Merge branch '2.0-webclient' into feature/SHRINE2020-99-allow-a-user-to-click-get-counts
bcarmenbcarmen
ba6ec793f8fstyle tweaks per design session with Anupama.
mjdiloretomjdiloreto
9965748e80aMerge branch 'feature/SHRINE2020-99-allow-a-user-to-click-get-counts' of https://open.med.harvard.edu/stash/scm/shrin...
mjdiloretomjdiloreto
5d6a4803f07SHRINE2020-99: made frontend request body symmetrical with backend data representation.
bcarmenbcarmen
38a2e623858commented out snapshot test
bcarmenbcarmen
6d33080620badded snapshot back in for confirmation
bcarmenbcarmen
b29d02b80fatest if this will fix breaking build
bcarmenbcarmen
4074ea35845fix of confirmation snapshot
bcarmenbcarmen
1c47316966fupdated snapshot tests
bcarmenbcarmen
5c454adec88updated snapshots
Ben CarmenBen Carmen
02be2176ccdMerge pull request #789 in SHRINE/shrine from feature/SHRINE2020-123-ontology-search-filter to 2.0-webclient * commi...
bcarmenbcarmen
a72911d8cb5saving package.lock
bcarmenbcarmen
59d078be5dbfixed some styles
marc-daniemarc-danie
6f2970dff4eMerge branches '2.0-webclient' and 'feature/SHRINE2020-99-allow-a-user-to-click-get-counts' of https://open.med.harva...
bcarmenbcarmen
2be6863b784checking cause of breaking build
XavXav
2a29a6ae7c7SHRINE2020-98 : minor layout fix
XavXav
3105a774f02SHRINE2020-98 : merged 2.0-webclient into feature/SHRINE2020-98 branch
bcarmenbcarmen
40f75c3e99cfixed snapshot test
XavXav
7cf0720dabbSHRINE2020-98 : a bit of clean-up
bcarmenbcarmen
151890249a8merge of 2.0-webclient
Next →