 bcarmen | 3ea09f80db2 | Merge branch '2.0-webclient' into bugfix/SHRINE2020-246 | | |
 Liam Moynihan | 38e5b99f6c6 | Merge branch 'feature/SHRINE2020-277' of ssh://open.catalyst.harvard.edu:7999/shrine/shrine into feature/SHRINE2020-277 | | |
Liam Moynihan | d2739e5d4ca | Using same id for qep database as steward database for the same query | | |
 Liam Moynihan | a5d634328af | Merge pull request #925 in SHRINE/shrine from feature/SHRINE2020-297 to 2.0-webclient
* commit '82f7d8e62eb85263e6f5... | | |
 Xavier Haurie | 24b3a9c2d77 | SHRINE2020-299 : added back-end tests for validation of topic name and description | | |
Xavier Haurie | 16447c8fc4f | SHRINE2020-299 : remove unnecessary \\ in topic description regex | | |
bcarmen | 62612261f8f | Merge branch '2.0-webclient' into feature/SHRINE2020-294 | | |
bcarmen | dd8b11339d6 | fix of failing unit test | | |
bcarmen | f1ba21b83e0 | fixed failing unit tests | | |
Liam Moynihan | 3e7cfd7b19a | Added method to tell if query definition has unsupported features | | |
 Bill Simons | 8374290fbc3 | Correct a minor documentation bug | | |
Liam Moynihan | 82f7d8e62eb | Added isValidForm boolean to start query | | |
Xavier Haurie | e2cc9ea2692 | Merge branch 'feature/SHRINE2020-303' into bugfix/SHRINE2020-299 | | |
Liam Moynihan | 8cdafba56ab | Added topic and patient count tooltips removed query definition help text | | |
bcarmen | d9726dfd3f7 | need to fix unit test | | |
bcarmen | b7ba5751f5b | saving work | | |
Liam Moynihan | 56ea3d94d70 | Styling to the topics select menu to handle overflow | | |
bcarmen | ae737035f08 | saving work | | |
Liam Moynihan | b5ccfe98acb | Small change to topic validation logic to handle edge cases | | |
Liam Moynihan | 039683a1bfe | Added validation to ensure a user has a topic selected before runnning a query | | |
 Ben Carmen | 365acecda0b | Merge pull request #917 in SHRINE/shrine from feature/SHRINE2020-140 to 2.0-webclient
* commit '8262dbb6735de4c18dd5... | | |
Liam Moynihan | 85aff371e8a | Fixed bug causing 500s when new queries are fetched that include a lab value with a less than or greater than | | |
Xavier Haurie | 8262dbb6735 | SHRINE2020-140 : merged 2.0-webclient into 140, with conflicts | | |
bcarmen | 00040d4a30a | saving progress | | |
Liam Moynihan | eee7b1cf398 | Added a unit test for getting a query result with a topic | | |
bcarmen | 8818a31270a | saving work | | |
Liam Moynihan | 6f4dbc2d247 | Fixed failing snapshot tests | | |
Liam Moynihan | 905a29a770b | Merge branch '2.0-webclient' into feature/SHRINE2020-277 | | |
Liam Moynihan | b52270455ca | Merge pull request #913 in SHRINE/shrine from feature/SHRINE2020-215 to 2.0-webclient
* commit '67536ff35ba2e7a18fbc... | | |
Liam Moynihan | 67536ff35ba | Merge pull request #920 in SHRINE/shrine from feature/SHRINE2020-265 to feature/SHRINE2020-215
* commit 'c4968456b58... | | |
Liam Moynihan | 5f3b1370fa8 | Small naming changes to increase readability of query reloading feature | | |
Liam Moynihan | 2f10096fef9 | Changed reloadable class names to be more descriptive | | |
Xavier Haurie | f4efb709782 | SHRINE2020-300 : seet maximum length of flagging message to 1000 | | |
Liam Moynihan | 7b0d8fdbef4 | Merge branch 'feature/SHRINE2020-215' into feature/SHRINE2020-277 | | |
Liam Moynihan | 8a73f5ee7a2 | Added unit test for reloading a query with an associated topic | | |
Liam Moynihan | b2d9055df05 | Fixed bug in frontend webserver path | | |
Liam Moynihan | bc860211987 | Frontend implementation to show query topic on query result panel | | |
Liam Moynihan | af9125e57ca | Only returning topic name to frontend for selected query result | | |
Liam Moynihan | b80154d6524 | First iteration of backend support for returning a topic for a selected query result | | |
Xavier Haurie | 637d7fd044e | SHRINE2020-300 : allow new lines and leading spaces in the flag message field (front-end) | | |
bcarmen | f634e8abadb | Merge branch '2.0-webclient' into feature/SHRINE2020-266 | | |
Xavier Haurie | 01043ecd8d9 | SHRINE2020-299 : added back-end validation of topic name and description | | |
bcarmen | dcb34ecf820 | potential fix of weird ui issue | | |
bcarmen | 381b2423558 | potential solution for clearing out query results when switching users. | | |
Bill Simons | 01f601c079c | Merge remote-tracking branch 'origin/2.0-webclient' into feature/SHRINE2020-local-dev | | |
Bill Simons | 0220aff16cf | Create documentation for local dev environment | | |
Liam Moynihan | 8c57a45cba1 | Incorporated peer review feedback for reloading query backend | | |
Xavier Haurie | 620dfd8294d | SHRINE2020-299 : allow new lines in topic descriptions, on the front-end | | |
Bill Simons | e89f44383cb | Require env vars to be set to mount AdapterMappings, lucene index, and suggest index | | |
 marc-danie | 37fc9447396 | SHRINE2020-140 - As a logged in user, I should view an alert my session may expire, and automatically logged out if m... | | |
marc-danie | 52e4df5d5dd | SHRINE2020-140 - As a logged in user, I should view an alert my session may expire, and automatically logged out if m... | | |
marc-danie | a213c78717b | SHRINE2020-140 - As a logged in user, I should view an alert my session may expire, and automatically logged out if m... | | |
marc-danie | 27810e8adb3 | Merge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-140
# C... | | |
Ben Carmen | 9489c3db0f8 | Merge pull request #908 in SHRINE/shrine from feature/SHRINE2020-261 to 2.0-webclient
* commit '8704c5844932c86ce56b... | | |
bcarmen | 8704c584493 | xit of failing test | | |
bcarmen | fc393aad6a4 | fix of missing value for flag dialog | | |
bcarmen | 51dc6a3f07f | updated snapshot test. | | |
bcarmen | 29a245a8faa | Merge branch '2.0-webclient' into feature/SHRINE2020-261 | | |
Liam Moynihan | d9077a45d0a | Merge branch '2.0-webclient' into feature/SHRINE2020-215 | | |
Liam Moynihan | 4b56ebd547a | Added standard IO postfix to method returning an io | | |
Bill Simons | 08e1feae111 | Generated and build with local dev specific keystore | | |
 David Walend | f888ee1ec9c | Merge pull request #919 in SHRINE/shrine from feature/SHRINE2020-255 to 2.0-webclient
* commit '31e07ce60932d10a1911... | | |
Ben Carmen | 2d2322f0891 | Merge pull request #918 in SHRINE/shrine from feature/SHRINE2020-284 to 2.0-webclient
* commit 'd6293550860be2c3d1b7... | | |
David Walend | 9b584bc6add | Merge pull request #915 in SHRINE/shrine from feature/SHRINE2020-147-do-not-write-bearer-token to 2.0-webclient
* co... | | |
Liam Moynihan | c4968456b58 | Treat critieria text as an html string and add custom styling | | |
Liam Moynihan | 1dfa93bb145 | Fixed typo in span classname | | |
Liam Moynihan | bf26011756d | Merge branch 'feature/SHRINE2020-215' into feature/SHRINE2020-265 | | |
Liam Moynihan | ddc7378d8a4 | Incorporated PR feedback to add clarity | | |
Liam Moynihan | d870f2f8a43 | Accounted for ontology terms having equal paths and added tests | | |
 dwalend | 31e07ce6093 | Merging | | |
Liam Moynihan | 14e3068d440 | Added html tags to query as string to allow additional styling | | |
marc-danie | 1377035af03 | Merge with 2.0-webclient branch | | |
Liam Moynihan | 886f8180f2f | Fixed inconsistencies with new query as string function | | |
Liam Moynihan | 11aa50767ba | Merge branch 'feature/SHRINE2020-215' into feature/SHRINE2020-265 | | |
Liam Moynihan | 6e39b02de39 | On reloading a query assume the query name is valid | | |
dwalend | 6bed28ce7cf | Sending the status uiString to the front-end json structure and cleaning up the test file for SHRINE2020-255 | | |
Liam Moynihan | d3a9a6b1607 | Merge branch '2.0-webclient' into feature/SHRINE2020-215 | | |
Liam Moynihan | da393702cbd | Changed getReadableQueryText to use a concept group list | | |
Xavier Haurie | 347dbed4e6f | SHRINE2020-218 : straggler | | |
bcarmen | d6293550860 | added recommended changes from code review | | |
Liam Moynihan | 5b84bf2d5cf | Merge branch 'feature/SHRINE2020-215' into feature/SHRINE2020-265 | | |
bcarmen | 1eb002fcd61 | temporarily comment out failing test | | |
bcarmen | d10739c3967 | Commit of front end work for help links menu | | |
bcarmen | 2e014aefb8d | Merge branch '2.0-webclient' into feature/SHRINE2020-284 | | |
bcarmen | b3ea38ed697 | Design session changes | | |
bcarmen | 84a88b7b56e | Merge branch 'feature/SHRINE2020-250' into feature/SHRINE2020-284 | | |
Xavier Haurie | ec2500368f3 | SHRINE2020-218 : fix badly-resolved merge conflict | | |
Xavier Haurie | be9509a451b | SHRINE2020-218 : minor clean-up | | |
marc-danie | 20ab5967441 | SHRINE2020-140 - As a logged in user, I should view an alert my session may expire, and automatically logged out if m... | | |
marc-danie | 1596c7509b3 | SHRINE2020-140 - As a logged in user, I should view an alert my session may expire, and automatically logged out if m... | | |
marc-danie | 6ff516223ba | Merge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-140 | | |
Bill Simons | 18733bff550 | Got the prototype working; still needs cleanup and checking in index files | | |
Xavier Haurie | cec3bab00d6 | SHRINE2020-218 : merge 2.0-webclient (with conflicts) | | |
marc-danie | 9a627c83320 | SHRINE2020-140 - As a logged in user, I should view an alert my session may expire, and automatically logged out if m... | | |
Xavier Haurie | 41b4a80de92 | SHRINE2020-218 : code review feedback (minor clean-up) | | |
marc-danie | df7cc331a04 | SHRINE2020-140 - As a logged in user, I should view an alert my session may expire, and automatically logged out if m... | | |
bcarmen | b9939bc1e8e | saving work | | |
Bill Simons | e9e9ea40b93 | Docker compose of single Hub/QEP node running without log errors. Need to add adapter to finalize setup. Note that ... | | |
bcarmen | 10a32da18e2 | saving work | | |
Xavier Haurie | 17acaff3da0 | SHRINE2020-218 : updated spec snapshots | | |
marc-danie | 7a302a3be73 | SHRINE2020-140 - As a logged in user, I should view an alert my session may expire, and automatically logged out if m... | | |
Xavier Haurie | 1434eac03e4 | Revert "SHRINE2020-218 : merge 2.0-webclient with conflicts"
This reverts commit 6db34d6cd2d4d2e852f8a7c75382184808c... | | |
Liam Moynihan | dbdb2e3cb78 | Allow a query name to be repopulated when reloading a query | | |
Liam Moynihan | 5e8a84fa944 | Fixed frontned excluded isExcluded naming conflict | | |
Liam Moynihan | e413bc2ea1a | Merge branch '2.0-webclient' into feature/SHRINE2020-215 | | |
Xavier Haurie | 6db34d6cd2d | SHRINE2020-218 : merge 2.0-webclient with conflicts | | |
Liam Moynihan | 0ccd58ba3c4 | changed select query by id to maintain IO postfix standard | | |
Liam Moynihan | 7f3c76f64ef | Added ontology values to reload query response | | |
marc-danie | fdee5691e8b | SHRINE2020-140 - As a logged in user, I should view an alert my session may expire, and automatically logged out if m... | | |
bcarmen | 7fe30569e7d | feedback from design session | | |
marc-danie | 888b735af78 | SHRINE2020-140 - As a logged in user, I should view an alert my session may expire, and automatically logged out if m... | | |
Xavier Haurie | 2c15a4052ed | SHRINE2020-218 : Set query-renaming's change date in the db layer instead of QepService | | |
Xavier Haurie | 470536e7ba4 | SHRINE2020-218 : removed unused component id; replaced freeText property of ValidatedTextField with allowLeadingSpace | | |
dwalend | 07f92603f48 | Something odd in the review for SHRINE2020-147 | | |
dwalend | 7f680af01ec | Censoring BasicCredentials for SHRINE2020-147 | | |
dwalend | acb5840f2d9 | Merge remote-tracking branch 'origin/2.0-webclient' into feature/SHRINE2020-147-do-not-write-bearer-token | | |
Xavier Haurie | ea4e98368d5 | SHRINE2020-218 : removed RENAME_QUERY case from reducer (no longer used) | | |
Liam Moynihan | c42ce8caf7b | Updated query term prop types | | |
bcarmen | c2ea161b275 | saving work | | |
Liam Moynihan | 5c5d8161d4f | Added logic to correctly display reloaded query group constraint options | | |
Xavier Haurie | 732d0d9c650 | SHRINE2020-218 : implement default value for max character length in ValidatedTextField | | |
Xavier Haurie | da02ef4a3b0 | SHRINE2020-218 : implement default value for max character length in ValidatedTextField | | |
Liam Moynihan | 8cf2d857821 | Changed query term group excluded field to isExcluded to match backend implementaiton | | |
Liam Moynihan | f454724b94e | First draft of query reloading frontend implementation | | |
Xavier Haurie | b9bfc6420ea | SHRINE2020-218 : code review feedback on validation: make default regex for invalid text be [^ !-~] | | |
Ben Carmen | 6c8e971ab61 | Merge pull request #909 in SHRINE/shrine from feature/SHRINE2020-267 to 2.0-webclient
* commit '0d7300aa062d48fbe4aa... | | |
bcarmen | 0d7300aa062 | Merge branch '2.0-webclient' into feature/SHRINE2020-267 | | |
dwalend | aebe9ca64b8 | Merge remote-tracking branch 'origin/2.0-webclient' into feature/SHRINE2020-255-change-query-institution-site | | |
dwalend | e7539662c85 | Check in plans for SHRINE2020-147 so I can work on something else | | |
bcarmen | 51ace5b905c | saving work | | |
marc-danie | 511c7107474 | SHRINE2020-140 - As a logged in user, I should view an alert my session may expire, and automatically logged out if m... | | |
bcarmen | 667915e5c5a | saving work | | |
dwalend | 7c58624caf5 | Better tie breaker to keep the SHRINE2020-255 sorts stabile | | |
dwalend | 7727c7e9d56 | Added a tie breaker to keep the SHRINE2020-255 sorts stabile | | |
dwalend | b396d725369 | Reworked result sorting to be more explicit when dealing with three distinct groups for SHRINE2020-255 | | |
Liam Moynihan | 99ceade5ced | Fixed stalling unit test by adding steward database configuration to qep service | | |
Liam Moynihan | 2c4a7e362bc | Added 2 unit tests for reloading query functionalities | | |
Liam Moynihan | 6b7360cb36c | Merge pull request #907 in SHRINE/shrine from feature/SHRINE2020-264 to 2.0-webclient
* commit 'b8e5e539c3fb2b7b34cf... | | |
Liam Moynihan | b8e5e539c3f | updated method name to applySortLimitAndSkipToSqlQuery | | |
Liam Moynihan | 973386da699 | First draft of backend query reloading | | |
Xavier Haurie | 2b158ee8c59 | Merge branch '2.0-webclient' into feature/SHRINE2020-218 | | |
Ben Carmen | c360c72f0c4 | Merge pull request #910 in SHRINE/shrine from feature/SHRINE2020-285 to 2.0-webclient
* commit '388b8c97141124edbd3b... | | |
dwalend | e8258fb3a3c | Interesting sort orders for statuses for SHRINE2020-255 | | |
Xavier Haurie | 5f7d74cb356 | SHRINE2020-218 : fix query renaming saga | | |
dwalend | d73f954cb6e | weird merge conflict | | |
dwalend | 8cf93dfd83c | weird merge conflict | | |
Xavier Haurie | e86a15d72f7 | SHRINE2020-218 : got rid of QueryName.js (not used) | | |
Xavier Haurie | e793f0b6080 | SHRINE2020-218 : refactored query name validation (made it DRYer) | | |
Xavier Haurie | c10d41860a1 | SHRINE2020-218 : working on rename query | | |
Xavier Haurie | d32fc8aa448 | SHRINE2020-218 : revert package-lock.json to be identical to the one in 2.0-webclient | | |
Xavier Haurie | ae21d90078d | SHRINE2020-218 : code review feedback : refactored QueryNameField to use ValidatedTextField | | |
Xavier Haurie | 370f9ab8c67 | SHRINE2020-218 : merge 2.0-webclient | | |
marc-danie | 6c7f5230856 | SHRINE2020-140 - As a logged in user, I should view an alert my session may expire, and automatically logged out if m... | | |
marc-danie | 281eb7e5d0b | SHRINE2020-140 - As a logged in user, I should view an alert my session may expire, and automatically logged out if m... | | |
marc-danie | ee23e917a9f | Merge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-140
# C... | | |
bcarmen | 14ef9cd2eaa | made recommended changes from BA review | | |
bcarmen | 192d370bf8b | fix of styles | | |
Liam Moynihan | 40f99618a84 | Changed name of sort skip limit sql query method | | |
Liam Moynihan | 695b217503d | Added parens around query string terms and fixed error with single date limited term | | |
Liam Moynihan | f1efe4b2844 | Fixed bug with criteria text causing pannels to shift | | |
Xavier Haurie | 26738bc491c | SHRINE2020-218 : more code review feedback | | |
Xavier Haurie | bff351c6207 | SHRINE2020-218 : fixed failing spec | | |
bcarmen | fedb39510b7 | Merge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into 2.0-webclient | | |
bcarmen | 5ec28772541 | improve test:watch to be more verbose | | |
bcarmen | 238190b6baf | changes based on styling session | | |
bcarmen | 388b8c97141 | code changes based on review | | |
bcarmen | 3bb9d21612d | merge of SHRINE2020-281 | | |
 Marc-Danie Nazaire | cdb715ade9e | Merge pull request #912 in SHRINE/shrine from feature/SHRINE2020-262 to 2.0-webclient
* commit '4a7fcc4b302c2de3fb5d... | | |
bcarmen | e233eeaa11f | Merge branch '2.0-webclient' into feature/SHRINE2020-267 | | |
Xavier Haurie | 392d2934757 | SHRINE2020-218 : updated snapshot for QueryNameDialog unit test | | |
Xavier Haurie | 71cbe8d84e0 | Merge branch 'feature/SHRINE2020-218' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRIN... | | |
bcarmen | f50c9d689fc | made tests have separate renders | | |
Xavier Haurie | 1e2f73e6a48 | Merge branch 'feature/SHRINE2020-218' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRIN... | | |
Xavier Haurie | bc097c75f5c | SHRINE2020-218 : more code review feedback | | |
bcarmen | 3b54f93914b | fixed unit test | | |
marc-danie | 4a7fcc4b302 | Merge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-262 | | |
Liam Moynihan | 196ccc7511d | Merge pull request #911 in SHRINE/shrine from feature/SHRINE2020-281 to 2.0-webclient
* commit 'a2a5d000302d239abfc5... | | |
Xavier Haurie | 7d115cf5ffc | Merge branch '2.0-webclient' into feature/SHRINE2020-218 | | |
Xavier Haurie | 639cf11cf6c | SHRINE2020-218 : some code review feedback | | |
Xavier Haurie | 715b6cb0f49 | SHRINE2020-218 : front-end unit test for QueryNameDialog -- failing | | |
bcarmen | 2e2550a3fc9 | saving work | | |
Liam Moynihan | 35e3634227e | Clarrified a java doc comment | | |
bcarmen | b6d43003a60 | change shrine.conf to use networkHelpConfig | | |
bcarmen | e1aead811a1 | changed network help url to config. | | |
Xavier Haurie | 675e1fa9046 | SHRINE2020-218 : a better way to handle clicking outside of the dialog box, and cancelling in general. Similar to wha... | | |
Liam Moynihan | 7cf5e438ce4 | Fixed bug in how network configurations were being fetched | | |
Liam Moynihan | eee5d0f9301 | Fixed bug in closing flag dialog on click outside of box | | |
marc-danie | 5d6961bfb49 | SHRINE2020-140 - As a logged in user, I should view an alert my session may expire, and automatically logged out if m... | | |
| Next → |
