SHRINE
  1. SHRINE

shrine

Public
  1. SHRINE
  2. shrine

All Branches Graph  

        
AuthorCommitMessageCommit dateBuilds
mjdiloretomjdiloreto
7a9d7b6b143Updated failed snapshots.
marc-daniemarc-danie
2b5ea1ed7c0SHRINE2020-122 - Create api call to search the Lucene index - added ConceptType trait
mjdiloretomjdiloreto
7c3a67252d3Remove all state from QueryTermLabView.
David WalendDavid Walend
295e3e03bbaMerge pull request #783 in SHRINE/shrine from bugfix/SHRINE-3686-shrine-isn-t-polling-the-crc to develop * commit 'e...
David WalendDavid Walend
7b7d2f7de0bMerge pull request #782 in SHRINE/shrine from bugfix/SHRINE-2433-remove-the-shouldqueryself-feature to develop * com...
marc-daniemarc-danie
c499102ebf6SHRINE2020-122 - Create api call to search the Lucene index - added unit test for when there are no search results
mjdiloretomjdiloreto
13b1397b356Put constraint in query parameter of startQuery fetch.
David WalendDavid Walend
60fd7cced40Merge pull request #777 in SHRINE/shrine from bugfix/SHRINE-3632-combine-abstractqepservice-and to develop * commit ...
David WalendDavid Walend
a567beb2c8cMerge pull request #786 in SHRINE/shrine from bugfix/SHRINE-687-readpdo-is-an-unsupported-feature to develop * commi...
marc-daniemarc-danie
3b6e6920ccdSHRINE2020-122 - Create api call to search the Lucene index - replaced with TrieMap with HashMap
marc-daniemarc-danie
c6c11b4fa60SHRINE2020-122 - Create api call to search the Lucene index - cleanup imports
marc-daniemarc-danie
545b99feb39Merge branches '2.0-webclient' and 'feature/SHRINE2020-122-create-api-call-to-search' of https://open.med.harvard.edu...
marc-daniemarc-danie
40495c929f4Merge branches '2.0-webclient' and 'feature/SHRINE2020-122-create-api-call-to-search' of https://open.med.harvard.edu...
David WalendDavid Walend
18bc83eb4e4Merge pull request #779 in SHRINE/shrine from bugfix/SHRINE-3410-remove-acceptallcerts-completely to develop * commi...
David WalendDavid Walend
5512c7a046eMerge pull request #781 in SHRINE/shrine from bugfix/SHRINE-3681-queuedbycrc-has-the-unused-text to develop * commit...
marc-daniemarc-danie
13c16d75129SHRINE2020-122 - Create api call to search the Lucene index
bcarmenbcarmen
7a5d665777eclear search filter is working
dwalenddwalend
d847d2c104aMarc-Danie's review comments for SHRINE-3632
dwalenddwalend
a83b8a6ad67More SHRINE-1740 - I was able to get rid of DurationConfigParser
Xavier HaurieXavier Haurie
f67c9fc4f9dRevert "SHRINE2020-98 : First cut at using Material UI for the "Count Patients" button, and writing SCSS to keep the ...
dwalenddwalend
85ed9e12bf4Cleanup of duration config parser and maxSigantureAge for SHRINE-1740 and SHRINE-3462
Xavier HaurieXavier Haurie
09bfd9a8e7bRevert "SHRINE2020-98 : let width of "Count Patients" button be dynamic, fix the button's padding, give the "run quer...
dwalenddwalend
ee4600f33adFix for SHRINE-3686 - QueuedQueriesPoller restarts whenever a query is QUEUED.
dwalenddwalend
9bbaf95ee4fRemoved all I could find with PDO in it for SHRINE-687
bcarmenbcarmen
06157d9295asaving work
bcarmenbcarmen
244c7c0a674saving working tree
dwalenddwalend
828c84f61d3Removed the last hint of shouldQuerySelf for SHRINE-2433
dwalenddwalend
ee2e5aefe8cPut the right words in for SHRINE-3681
bcarmenbcarmen
fa1ca928dc7saving work
bcarmenbcarmen
de2138e3da3saving working filter
mjdiloretomjdiloreto
c051e4e1c94Constraint type synced between UI and reducer.
mjdiloretomjdiloreto
db3840cf8e5Added lab value constraints to data model and query definition reducer.
bcarmenbcarmen
10353c37a1asaving progress
David WalendDavid Walend
5751c7814e0Merge pull request #774 in SHRINE/shrine from feature/SHRINE-3288-remove-hubdao-in-shrineconfiguration.scala to devel...
bcarmenbcarmen
dd0d8f4bd50saving work
Xavier HaurieXavier Haurie
d49c6443cd3SHRINE2020-98 : let width of "Count Patients" button be dynamic, fix the button's padding, give the "run query" secti...
Xavier HaurieXavier Haurie
3f783a498c9Merge branch '2.0-webclient' into feature/SHRINE2020-98-run-query-section-using-material-ui
Xavier HaurieXavier Haurie
fa9f2c4802bSHRINE2020-98 : First cut at using Material UI for the "Count Patients" button, and writing SCSS to keep the button a...
bcarmenbcarmen
da0570a4581saving changes
bcarmenbcarmen
7f5a9dd3e94saving work
bcarmenbcarmen
47a719da041merge of latest 2.0-webclient
bcarmenbcarmen
5f1bc599f59saving work
bcarmenbcarmen
ae28be230e9saving work
Matthew DiLoretoMatthew DiLoreto
e59512d4496Merge pull request #778 in SHRINE/shrine from drag-containers-please-work to 2.0-webclient * commit '398ea66c3fba828...
bcarmenbcarmen
f52990f6b63saving work
dwalenddwalend
92219a50bbdDeleted TrustParam and BouncyKeyStoreCollection for SHRINE-3410
dwalenddwalend
3067b15f64cPurged acceptallcerts for SHRINE-3410
Xavier HaurieXavier Haurie
f608cbe7fc1SHRINE2020-114 : added comments and minor code cleanup
bcarmenbcarmen
797274503cbsaving work
bcarmenbcarmen
a3068540612saving work
Xavier HaurieXavier Haurie
bb91fa97fecSHRINE2020-114 : added a README.indexer file
Xavier HaurieXavier Haurie
8427a63f31fSHRINE2020-114 : fixed a bug in how the resource files are used
Xavier HaurieXavier Haurie
ddfb8d57cb9SHRINE2020-114 : simplified the set of resource files needed for the unit test to run
Xavier HaurieXavier Haurie
6d1a8a915cfSHRINE2020-114 : added test resource files to git (ontology_subset.txt and category_definition_with_unicode_char.txt)
bcarmenbcarmen
808fdaa5498saving work
bcarmenbcarmen
62d59e9acbasaving work
mjdiloretomjdiloreto
398ea66c3fbFix test and remove unnecessary component rendering.
mjdiloretomjdiloreto
6267a94892cMake containers show not-allowed cursor on drag.
bcarmenbcarmen
730445d4b01saving work
dwalenddwalend
effaeaa65beSome stray todos for SHRINE-3632
dwalenddwalend
c8d24c08e22Finished combining parts for SHRINE-3632
dwalenddwalend
2d38981ee5fmerging
dwalenddwalend
4ebfaf7eb8bMerging from develop
dwalenddwalend
674e4d5cf20Switching to another branch for a minute
dwalenddwalend
92b6a7e9247Moving out more stuff for SHRINE-3632
dwalenddwalend
669040b10d2Removed more of those awful do... methods for SHRINE-3632
Xavier HaurieXavier Haurie
245d1538a5dMerge branch '2.0-webclient' into bugfix/SHRINE2020-114-junk-characters
Xavier HaurieXavier Haurie
41068f4eeacSHRINE2020-114 : unescape a few XML entities and all unicode codes when indexing ontology
bcarmenbcarmen
53926532b2bmerged changes from 2.0-webclient
bcarmenbcarmen
151e4e8abf4saving changes
Matthew DiLoretoMatthew DiLoreto
7bc6971f2b8Merge pull request #773 in SHRINE/shrine from feature/SHRINE2020-90-implement-icons-for-the-medical to 2.0-webclient ...
dwalenddwalend
eb12f88d40cConsolidated some methods out of the top trait for SHRINE-3632
mjdiloretomjdiloreto
57ea84ad358Allow dragging of the full tree item, not just ontology label.
mjdiloretomjdiloreto
881f682aa8dChanged ontology icons from BA review.
dwalenddwalend
d54f76fd857A try at dissovling these two classes for SHRINE-3632
dwalenddwalend
851211c0a15Removed support for readInstanceResults for SHRINE-3632
bcarmenbcarmen
5a9c1379a6fsaving work
David WalendDavid Walend
07f58d806d8Merge pull request #769 in SHRINE/shrine from bugfix/SHRINE-3677-the-domain-and-username-swapped21 to develop * comm...
Marc-Danie NazaireMarc-Danie Nazaire
c1afe0f793bMerge pull request #772 in SHRINE/shrine from feature/SHRINE2020-113-separate-lucene-search-code to 2.0-webclient * ...
marc-daniemarc-danie
44c2708b957SHRINE2020-113 - Separate Lucene search code from the http4s logic in OntologyService - added some more type declarat...
marc-daniemarc-danie
223b37edf52SHRINE2020-113 - Separate Lucene search code from the http4s logic in OntologyService - moved extractVisualAttributes...
Marc-Danie NazaireMarc-Danie Nazaire
c3172bd891eMerge pull request #768 in SHRINE/shrine from feature/SHRINE-3618-move-dashboard-javascript-to to develop * commit '...
bcarmenbcarmen
6044fef76c9saving work
Matthew DiLoretoMatthew DiLoreto
b1179a7f031Merge pull request #771 in SHRINE/shrine from bugfix/SHRINE2020-112-resolve-warning-in-daterange to 2.0-webclient * ...
mjdiloretomjdiloreto
dd5994bd441Added changes lost in the torrid frenzy of a merge.
marc-daniemarc-danie
045f3d90028Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE-3618-move-dashboar...
dwalenddwalend
636050ec838Clearing out the last of the old QEP database for SHRIN-3288
bcarmenbcarmen
8a8cd537ea2saving work
mjdiloretomjdiloreto
508a08f69aaChange mouse hover on ontology Containers to show that dragging is not allowed.
mjdiloretomjdiloreto
38593aa1941Fix tree so that leaves don't get a default expanded icon.
mjdiloretomjdiloreto
4ae8446ec25Fixed proptypes warning.
dwalenddwalend
16f1761be16Merge remote-tracking branch 'origin/develop' into feature/SHRINE-3288-remove-hubdao-in-shrineconfiguration.scala
dwalenddwalend
53e4e7ffeddDeleting the QEP AuditDao code for SHRINE-3288
mjdiloretomjdiloreto
314ec48dda1Simplify branch styling and fix broken snapshot.
Marc-Danie NazaireMarc-Danie Nazaire
08d9d44a9daMerge pull request #770 in SHRINE/shrine from feature/SHRINE-3619-move-the-steward-javascript-to to develop * commit...
marc-daniemarc-danie
982287c5f95SHRINE-3619 - Move the steward javascript to the steward service back-end code - removed vagrant deploy code
marc-daniemarc-danie
a6e1bc78830SHRINE2020-113 - Separate Lucene search code from the http4s logic in OntologyService
mjdiloretomjdiloreto
506c26e7bd0Add different icons for containers and folders.
mjdiloretomjdiloreto
b7023222de7SHRINE2020-112 fix bug where selecting end date resulted in React warning.
dwalenddwalend
c39169e1f7aGetting rid of the really old squeryl QEP audit tables for SHRINE-3288
marc-daniemarc-danie
a46d82e9f8aSHRINE-3619 - Move the steward javascript to the steward service back-end code
Marc-Danie NazaireMarc-Danie Nazaire
f44d9023c2dMerge pull request #765 in SHRINE/shrine from bugfix/SHRINE2020-102-move-query-definition-structure to 2.0-webclient ...
dwalenddwalend
872cb524c66Database repair scripts for SHRIEN-3677
mjdiloretomjdiloreto
5a33c9ea461Change test to use Map instead of array to support old versions of node.
mjdiloretomjdiloreto
3a323b2bce1Merge branch '2.0-webclient' with bugfix/SHRINE2020-102-move-query-definition-structure
dwalenddwalend
826344dece2Fix SHRINE-3677 by getting the username and domain alligned.
marc-daniemarc-danie
b29fb64e7faMerge remote-tracking branch 'origin/2.0-webclient' into 2.0-webclient
marc-daniemarc-danie
d19c19dbf7drenamed runQuery to startQuery
mjdiloretomjdiloreto
78e1f57bf72Merge 2.0-webclient with bugfix/SHRINE2020-102-move-query-definition-structure
bcarmenbcarmen
6827c699a8dincreased font size of title
bcarmenbcarmen
22afc44e932suggested color changes from Griffin
bcarmenbcarmen
3f90b1299ebMerge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into 2.0-webclient
bcarmenbcarmen
13ae9bf8e5dfixed prop types
Marc-Danie NazaireMarc-Danie Nazaire
dc24b5a251fMerge pull request #767 in SHRINE/shrine from feature/SHRINE2020-83-client-side-extract-query-id to 2.0-webclient * ...
marc-daniemarc-danie
77c33c9c54aMapped ontology terms with Multiple visual attribute to the Leaf concept type
marc-daniemarc-danie
ac7f82329bfSHRINE-3618 - Move dashboard javascript to the dashboard service back-end code - removed the build file
marc-daniemarc-danie
3545817735aSHRINE-3618 - Move dashboard javascript to the dashboard service back-end code
mjdiloretomjdiloreto
55041abc13fMerge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into 2.0-webclient
mjdiloretomjdiloreto
1278a3f2871Change npm build to isntall dev dependencies before testing.
bcarmenbcarmen
cc42eb09152Merge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into 2.0-webclient
bcarmenbcarmen
c56980a257fchanges per style session w Anupama and Matt
mjdiloretomjdiloreto
ddb54cf5acdAdd polyfill for array.prototype.flatMap as dev dependency so tests don't break.
mjdiloretomjdiloreto
4cbe85dcf96Hardcode ontology search filters for demo.
marc-daniemarc-danie
b2556068414SHRINE2020-83 - Client side: Extract query ID from JSON (instead of XML) - renamed runQuery api call to startQuery an...
mjdiloretomjdiloreto
b743ef505b9Previous help text change added to new help text.
mjdiloretomjdiloreto
1f2ab24fb70Merge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into 2.0-webclient
bcarmenbcarmen
7c191b63e9efixed snapshots
bcarmenbcarmen
f840eb1e4fdui changes per story grooming
mjdiloretomjdiloreto
49c592424b3Added Help text back to root document for demo.
bcarmenbcarmen
44ef85365c0Merge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into 2.0-webclient
bcarmenbcarmen
dee92febb53made header text consistent
mjdiloretomjdiloreto
bea665c2f3fAdd png ACT logo.
marc-daniemarc-danie
d9598308ebcremoved commented out lines
marc-daniemarc-danie
fb7d0e91c3aMerge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-83-clien...
marc-daniemarc-danie
e06bd88da6fSHRINE2020-83 - Client side: Extract query ID from JSON (instead of XML) - Added unit tests
marc-daniemarc-danie
aff1badb5baMerging changes from 2.0-webclient branch
mjdiloretomjdiloreto
c93c4550929Merge branch '2.0-webclient' with bugfix/SHRINE2020-102-move-query-definition-structure
bcarmenbcarmen
2dacc003ec4merge
bcarmenbcarmen
0cc853c1086merge of 2.0-webclient
marc-daniemarc-danie
c35ccd018c2SHRINE2020-83 - Client side: Extract query ID from JSON (instead of XML) - made networkId a string in the response to...
Ben CarmenBen Carmen
a2411b87e32Merge pull request #764 in SHRINE/shrine from task/SHRINE2020-111-global-ontology-state to 2.0-webclient * commit '1...
bcarmenbcarmen
1bae76ba024merge of 2.0-webclient
marc-daniemarc-danie
505fc96b925made the order of the root folder alphabetic and fixed naming of the root folder Laboratory Test
mjdiloretomjdiloreto
ab8ae4d4dacChange action creators to declare argument names and use payload attribute.
marc-daniemarc-danie
c1fb08e2b04Merge remote-tracking branch 'origin/2.0-webclient' into 2.0-webclient
marc-daniemarc-danie
915fe03a4barenamed concept_category to codeCategory
bcarmenbcarmen
52be5cb8506updated snapshot test.
bcarmenbcarmen
6565e249ac9text change.
bcarmenbcarmen
3028317d794saving merge of 2.0-webclient
bcarmenbcarmen
8c8388c8bf2fixed unit test
bcarmenbcarmen
9da124cec9bfixed styles.
bcarmenbcarmen
085298e7cc5Merge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into 2.0-webclient
bcarmenbcarmen
a375ba15dbbui tweaks and update of snapshot tests
bcarmenbcarmen
258bb9b2774Merge branch 'UI-Tweaks' into 2.0-webclient
bcarmenbcarmen
49b6618ea36saving work
Marc-Danie NazaireMarc-Danie Nazaire
5d89f2133b6Merge pull request #763 in SHRINE/shrine from feature/SHRINE2020-110-modify-structure-of-json-response to 2.0-webclie...
Ben CarmenBen Carmen
0b6dd88ef72Merge pull request #766 in SHRINE/shrine from feature/SHRINE2020-75-category-folders to 2.0-webclient * commit '15ee...
mjdiloretomjdiloreto
b767e0560a8Styling changes from BA review.
bcarmenbcarmen
9572d166de7saving work
bcarmenbcarmen
203806b47f6saving work
marc-daniemarc-danie
9b96890c2d9SHRINE2020-83 - Client side: Extract query ID from JSON (instead of XML)
mjdiloretomjdiloreto
e41e18ed534Changes to queryDefinitionView from BA review.
mjdiloretomjdiloreto
9247e84e2fbChanges to ACT logo from BA review.
bcarmenbcarmen
15ee07a2493Added Concept Categories
bcarmenbcarmen
9c9bc44e77csaving work
mjdiloretomjdiloreto
7899c08ed47Changes from code review.
David WalendDavid Walend
de575213a83Merge pull request #761 in SHRINE/shrine from feature/SHRINE-3423-with-scala-2.12-use-eithers-in to develop * commit...
mjdiloretomjdiloreto
090f6334c15Updated tests with the state of progress.
bcarmenbcarmen
1ad61af3622added prop types
bcarmenbcarmen
53cad4a3e26added unit tests for saga and reducer
marc-daniemarc-danie
e8058ad0700SHRINE2020-110 - Modify structure of JSON response ontology/root and ontology/children apis calls - code review changes
David WalendDavid Walend
8c15abf86baMerge pull request #762 in SHRINE/shrine from feature/SHRINE-3378-remove-jerseyclientexecutioncontext to develop * c...
bcarmenbcarmen
5aadf8d8d8dsaving work
Ben CarmenBen Carmen
3088fc41e60Merge pull request #758 in SHRINE/shrine from feature/SHRINE2020-93-mui-concepts-panel to 2.0-webclient * commit '19...
marc-daniemarc-danie
073de5bab94SHRINE2020-110 - Modify structure of JSON response ontology/root and ontology/children apis calls
mjdiloretomjdiloreto
f355adacaf4Added unit test for queryDefinitionReducer.
David WalendDavid Walend
04baafb03c3Merge pull request #756 in SHRINE/shrine from feature/SHRINE-3575-remove-i2b2workarounds-object to develop * commit ...
dwalenddwalend
3091346d7a4Removed the jersey client context now that the jersey client is gone for SHRINE-3378
dwalenddwalend
2ae2cced176Using 2.12 for-comprehension for Either for SHRINE-3423
mjdiloretomjdiloreto
43522b55ecfFinish hooking up QueryDefinitionContainer to redux.
dwalenddwalend
6ca4300b83aPR recommendations for SHRINE-3575
bcarmenbcarmen
dd3788cc330saving work
dwalenddwalend
edd2c368d32Merge branch 'develop' into feature/SHRINE-3575-remove-i2b2workarounds-object
mjdiloretomjdiloreto
e24b7c4a92fHooked up QueryDefinitionContainer to queryDefinition reducer.
mjdiloretomjdiloreto
78c75369542Created reducer and actions for query definition.
bcarmenbcarmen
3b4c0c12982Merge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into 2.0-webclient
bcarmenbcarmen
952000e2f15fixed prop type
bcarmenbcarmen
525a63afdb7update of background color of the header