SHRINE
  1. SHRINE

shrine

Public
  1. SHRINE
  2. shrine

All Branches Graph  

        
AuthorCommitMessageCommit dateBuilds
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
Xavier HaurieXavier Haurie
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
Xavier HaurieXavier Haurie
f78121b48a5SHRINE2020-144 : pull request feedback
marc-daniemarc-danie
63ea37c7c1bcleaned up imports
Xavier HaurieXavier Haurie
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 ...
Xavier HaurieXavier Haurie
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.
Xavier HaurieXavier Haurie
f3e11711cbdSHRINE2020-144 : move TokenResponse case class to UserAuthentication
mjdiloretomjdiloreto
b0b3d90aaf0Rename http4s failure to align with our naming convention.
bcarmenbcarmen
53157986394saving work on unit tests
Xavier HaurieXavier Haurie
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
Xavier HaurieXavier Haurie
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.
Xavier HaurieXavier Haurie
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...
Xavier HaurieXavier Haurie
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
Xavier HaurieXavier Haurie
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
Xavier HaurieXavier Haurie
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
Xavier HaurieXavier Haurie
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.
Xavier HaurieXavier Haurie
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...
Xavier HaurieXavier Haurie
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.
Xavier HaurieXavier Haurie
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
Xavier HaurieXavier Haurie
2a29a6ae7c7SHRINE2020-98 : minor layout fix
Xavier HaurieXavier Haurie
3105a774f02SHRINE2020-98 : merged 2.0-webclient into feature/SHRINE2020-98 branch
bcarmenbcarmen
40f75c3e99cfixed snapshot test
Xavier HaurieXavier Haurie
7cf0720dabbSHRINE2020-98 : a bit of clean-up
bcarmenbcarmen
151890249a8merge of 2.0-webclient
Ben CarmenBen Carmen
b142568cec4Merge pull request #792 in SHRINE/shrine from SHRINE2020-31-minor-UI-adjustments to 2.0-webclient * commit 'c5567618...
bcarmenbcarmen
c5567618873updated snapshot tests
bcarmenbcarmen
fcbd8bcfe81added changes from design session
Xavier HaurieXavier Haurie
e70f3a75082SHRINE2020-98 : improve positioning of the "start-query" UI block and its contents
Xavier HaurieXavier Haurie
40f4d997004Merge branch '2.0-webclient' into feature/SHRINE2020-98-run-query-section-using-material-ui
Xavier HaurieXavier Haurie
e1ce965783fSHRINE2020-98 : a bit of clean-up
bcarmenbcarmen
dc83c8b32cfadded padding to tree
Xavier HaurieXavier Haurie
581290c95bbSHRINE2020-98 : position query topic drop-down and query name text field in the start-query UI block
bcarmenbcarmen
56c54747a6aMerge branch '2.0-webclient' into merge/SHRINE2020-132-131
bcarmenbcarmen
73726de5aebsaving merge of style tweaks SHRINE2020-132
Matthew DiLoretoMatthew DiLoreto
0d756f63862Merge pull request #790 in SHRINE/shrine from SHRINE2020-132-demo-prep-style-tweaks to 2.0-webclient * commit 'b167d...
Marc-Danie NazaireMarc-Danie Nazaire
7168f0d7010Merge pull request #793 in SHRINE/shrine from feature/SHRINE2020-134-as-a-user-i-only-want-to-view to 2.0-webclient ...
marc-daniemarc-danie
bc5ce244377SHRINE2020-134 - As a user, I only want to view the active codes in the medical concept list
bcarmenbcarmen
24b1852bdb5merge of flex column style from Xav's Get Counts and I specified the hight of the app.
mjdiloretomjdiloreto
24315708d5eSend values as strings to backend when calling startQuery.
mjdiloretomjdiloreto
a9caba4308eMerge branch 'feature/SHRINE2020-99-allow-a-user-to-click-get-counts' of https://open.med.harvard.edu/stash/scm/shrin...
mjdiloretomjdiloreto
a2ee061893dNormalized lab term constraints when sending API calls.
marc-daniemarc-danie
2feaa461125Merge remote-tracking branch 'origin/feature/SHRINE2020-99-allow-a-user-to-click-get-counts' into feature/SHRINE2020-...
marc-daniemarc-danie
fdc5a3e0f95SHRINE2020-99 - Allow a user to click Get Counts button and execute an 'advanced query' (inc. date ranges, multiple o...
Xavier HaurieXavier Haurie
63008748a76SHRINE2020-98 : organize form elements within the start query section using flex boxes
bcarmenbcarmen
74f1e5f7348potential solution for CSS demo style improvements.
Xavier HaurieXavier Haurie
1ce6443c8faSHRINE2020-98 : added missing flex directive for "start query" section
bcarmenbcarmen
464148cd885saving work
Xavier HaurieXavier Haurie
f6f82b46ca8Merge branch '2.0-webclient' into feature/SHRINE2020-98-run-query-section-using-material-ui
Xavier HaurieXavier Haurie
fa46aa8e1c2SHRINE2020-98 : implement expandable/collapsible Start Query section, including placeholdres for form elements, and s...
bcarmenbcarmen
9b53f9133e0saving work
mjdiloretomjdiloreto
b167dead43eFix ontology tree height.
mjdiloretomjdiloreto
5f6eaa0c88aUpdate failed snapshots.
mjdiloretomjdiloreto
fb8372f332cImprove emphasis on header tabs and changed ACT logo.
bcarmenbcarmen
fe52166d209handing branch off to matt
bcarmenbcarmen
c5f0e82d348updated snapshot
bcarmenbcarmen
43324e609d9some tweaks to the Loader and the body of the request.
bcarmenbcarmen
879e5d03a7epotential solution for the ontology search filter
mjdiloretomjdiloreto
897e1756177Rename lab value 'type' to 'constraintType' to avoid decoding into scala keyword 'type'
mjdiloretomjdiloreto
efc0fc01478Merge branch 'feature/SHRINE2020-99-allow-a-user-to-click-get-counts' of https://open.med.harvard.edu/stash/scm/shrin...
mjdiloretomjdiloreto
4454e445f40Fix react warning about switching between controlled and uncontrolled input for ValueRange.
mjdiloretomjdiloreto
c6427460389Allow 0 as a valid lab value.
David WalendDavid Walend
24391ed1f80Merge pull request #785 in SHRINE/shrine from bugfix/SHRINE-1740-durationconfigparser-is-not-compatible to develop *...
dwalenddwalend
0f4cc45cdfeMissed one of the endpoints for SHRINE-1740
marc-daniemarc-danie
e26445eff23Merge branches '2.0-webclient' and 'feature/SHRINE2020-99-allow-a-user-to-click-get-counts' of https://open.med.harva...
Marc-Danie NazaireMarc-Danie Nazaire
45f1cf0175dMerge pull request #787 in SHRINE/shrine from feature/SHRINE2020-122-create-api-call-to-search to 2.0-webclient * co...
mjdiloretomjdiloreto
a04db103894Can only submit queries if all lab values are valid.
dwalenddwalend
75927a8ff28Merge remote-tracking branch 'origin/develop' into bugfix/SHRINE-1740-durationconfigparser-is-not-compatible
dwalenddwalend
48e068a21f3Merging
Next →