SHRINE
  1. SHRINE

shrine

Public
  1. SHRINE
  2. shrine

All Branches Graph  

        
AuthorCommitMessageCommit dateBuilds
XavXav
17acaff3da0SHRINE2020-218 : updated spec snapshots
marc-daniemarc-danie
7a302a3be73SHRINE2020-140 - As a logged in user, I should view an alert my session may expire, and automatically logged out if m...
XavXav
1434eac03e4Revert "SHRINE2020-218 : merge 2.0-webclient with conflicts" This reverts commit 6db34d6cd2d4d2e852f8a7c75382184808c...
Liam MoynihanLiam Moynihan
dbdb2e3cb78Allow a query name to be repopulated when reloading a query
Liam MoynihanLiam Moynihan
5e8a84fa944Fixed frontned excluded isExcluded naming conflict
Liam MoynihanLiam Moynihan
e413bc2ea1aMerge branch '2.0-webclient' into feature/SHRINE2020-215
XavXav
6db34d6cd2dSHRINE2020-218 : merge 2.0-webclient with conflicts
Liam MoynihanLiam Moynihan
0ccd58ba3c4changed select query by id to maintain IO postfix standard
Liam MoynihanLiam Moynihan
7f3c76f64efAdded ontology values to reload query response
marc-daniemarc-danie
fdee5691e8bSHRINE2020-140 - As a logged in user, I should view an alert my session may expire, and automatically logged out if m...
bcarmenbcarmen
7fe30569e7dfeedback from design session
marc-daniemarc-danie
888b735af78SHRINE2020-140 - As a logged in user, I should view an alert my session may expire, and automatically logged out if m...
XavXav
2c15a4052edSHRINE2020-218 : Set query-renaming's change date in the db layer instead of QepService
XavXav
470536e7ba4SHRINE2020-218 : removed unused component id; replaced freeText property of ValidatedTextField with allowLeadingSpace
dwalenddwalend
07f92603f48Something odd in the review for SHRINE2020-147
dwalenddwalend
7f680af01ecCensoring BasicCredentials for SHRINE2020-147
dwalenddwalend
acb5840f2d9Merge remote-tracking branch 'origin/2.0-webclient' into feature/SHRINE2020-147-do-not-write-bearer-token
XavXav
ea4e98368d5SHRINE2020-218 : removed RENAME_QUERY case from reducer (no longer used)
Liam MoynihanLiam Moynihan
c42ce8caf7bUpdated query term prop types
bcarmenbcarmen
c2ea161b275saving work
Liam MoynihanLiam Moynihan
5c5d8161d4fAdded logic to correctly display reloaded query group constraint options
XavXav
732d0d9c650SHRINE2020-218 : implement default value for max character length in ValidatedTextField
XavXav
da02ef4a3b0SHRINE2020-218 : implement default value for max character length in ValidatedTextField
Liam MoynihanLiam Moynihan
8cf2d857821Changed query term group excluded field to isExcluded to match backend implementaiton
Liam MoynihanLiam Moynihan
f454724b94eFirst draft of query reloading frontend implementation
XavXav
b9bfc6420eaSHRINE2020-218 : code review feedback on validation: make default regex for invalid text be [^ !-~]
Ben CarmenBen Carmen
6c8e971ab61Merge pull request #909 in SHRINE/shrine from feature/SHRINE2020-267 to 2.0-webclient * commit '0d7300aa062d48fbe4aa...
bcarmenbcarmen
0d7300aa062Merge branch '2.0-webclient' into feature/SHRINE2020-267
dwalenddwalend
aebe9ca64b8Merge remote-tracking branch 'origin/2.0-webclient' into feature/SHRINE2020-255-change-query-institution-site
dwalenddwalend
e7539662c85Check in plans for SHRINE2020-147 so I can work on something else
bcarmenbcarmen
51ace5b905csaving work
marc-daniemarc-danie
511c7107474SHRINE2020-140 - As a logged in user, I should view an alert my session may expire, and automatically logged out if m...
bcarmenbcarmen
667915e5c5asaving work
dwalenddwalend
7c58624caf5Better tie breaker to keep the SHRINE2020-255 sorts stabile
dwalenddwalend
7727c7e9d56Added a tie breaker to keep the SHRINE2020-255 sorts stabile
dwalenddwalend
b396d725369Reworked result sorting to be more explicit when dealing with three distinct groups for SHRINE2020-255
Liam MoynihanLiam Moynihan
99ceade5cedFixed stalling unit test by adding steward database configuration to qep service
Liam MoynihanLiam Moynihan
2c4a7e362bcAdded 2 unit tests for reloading query functionalities
Liam MoynihanLiam Moynihan
6b7360cb36cMerge pull request #907 in SHRINE/shrine from feature/SHRINE2020-264 to 2.0-webclient * commit 'b8e5e539c3fb2b7b34cf...
Liam MoynihanLiam Moynihan
b8e5e539c3fupdated method name to applySortLimitAndSkipToSqlQuery
Liam MoynihanLiam Moynihan
973386da699First draft of backend query reloading
XavXav
2b158ee8c59Merge branch '2.0-webclient' into feature/SHRINE2020-218
Ben CarmenBen Carmen
c360c72f0c4Merge pull request #910 in SHRINE/shrine from feature/SHRINE2020-285 to 2.0-webclient * commit '388b8c97141124edbd3b...
dwalenddwalend
e8258fb3a3cInteresting sort orders for statuses for SHRINE2020-255
XavXav
5f7d74cb356SHRINE2020-218 : fix query renaming saga
dwalenddwalend
d73f954cb6eweird merge conflict
dwalenddwalend
8cf93dfd83cweird merge conflict
XavXav
e86a15d72f7SHRINE2020-218 : got rid of QueryName.js (not used)
XavXav
e793f0b6080SHRINE2020-218 : refactored query name validation (made it DRYer)
XavXav
c10d41860a1SHRINE2020-218 : working on rename query
XavXav
d32fc8aa448SHRINE2020-218 : revert package-lock.json to be identical to the one in 2.0-webclient
XavXav
ae21d90078dSHRINE2020-218 : code review feedback : refactored QueryNameField to use ValidatedTextField
XavXav
370f9ab8c67SHRINE2020-218 : merge 2.0-webclient
marc-daniemarc-danie
6c7f5230856SHRINE2020-140 - As a logged in user, I should view an alert my session may expire, and automatically logged out if m...
marc-daniemarc-danie
281eb7e5d0bSHRINE2020-140 - As a logged in user, I should view an alert my session may expire, and automatically logged out if m...
marc-daniemarc-danie
ee23e917a9fMerge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-140 # C...
bcarmenbcarmen
14ef9cd2eaamade recommended changes from BA review
bcarmenbcarmen
192d370bf8bfix of styles
Liam MoynihanLiam Moynihan
40f99618a84Changed name of sort skip limit sql query method
Liam MoynihanLiam Moynihan
695b217503dAdded parens around query string terms and fixed error with single date limited term
Liam MoynihanLiam Moynihan
f1efe4b2844Fixed bug with criteria text causing pannels to shift
XavXav
26738bc491cSHRINE2020-218 : more code review feedback
XavXav
bff351c6207SHRINE2020-218 : fixed failing spec
bcarmenbcarmen
fedb39510b7Merge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into 2.0-webclient
bcarmenbcarmen
5ec28772541improve test:watch to be more verbose
bcarmenbcarmen
238190b6bafchanges based on styling session
bcarmenbcarmen
388b8c97141code changes based on review
bcarmenbcarmen
3bb9d21612dmerge of SHRINE2020-281
Marc-Danie NazaireMarc-Danie Nazaire
cdb715ade9eMerge pull request #912 in SHRINE/shrine from feature/SHRINE2020-262 to 2.0-webclient * commit '4a7fcc4b302c2de3fb5d...
bcarmenbcarmen
e233eeaa11fMerge branch '2.0-webclient' into feature/SHRINE2020-267
XavXav
392d2934757SHRINE2020-218 : updated snapshot for QueryNameDialog unit test
XavXav
71cbe8d84e0Merge branch 'feature/SHRINE2020-218' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRIN...
bcarmenbcarmen
f50c9d689fcmade tests have separate renders
XavXav
1e2f73e6a48Merge branch 'feature/SHRINE2020-218' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRIN...
XavXav
bc097c75f5cSHRINE2020-218 : more code review feedback
bcarmenbcarmen
3b54f93914bfixed unit test
marc-daniemarc-danie
4a7fcc4b302Merge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-262
Liam MoynihanLiam Moynihan
196ccc7511dMerge pull request #911 in SHRINE/shrine from feature/SHRINE2020-281 to 2.0-webclient * commit 'a2a5d000302d239abfc5...
XavXav
7d115cf5ffcMerge branch '2.0-webclient' into feature/SHRINE2020-218
XavXav
639cf11cf6cSHRINE2020-218 : some code review feedback
XavXav
715b6cb0f49SHRINE2020-218 : front-end unit test for QueryNameDialog -- failing
bcarmenbcarmen
2e2550a3fc9saving work
Liam MoynihanLiam Moynihan
35e3634227eClarrified a java doc comment
bcarmenbcarmen
b6d43003a60change shrine.conf to use networkHelpConfig
bcarmenbcarmen
e1aead811a1changed network help url to config.
XavXav
675e1fa9046SHRINE2020-218 : a better way to handle clicking outside of the dialog box, and cancelling in general. Similar to wha...
Liam MoynihanLiam Moynihan
7cf5e438ce4Fixed bug in how network configurations were being fetched
Liam MoynihanLiam Moynihan
eee5d0f9301Fixed bug in closing flag dialog on click outside of box
marc-daniemarc-danie
5d6961bfb49SHRINE2020-140 - As a logged in user, I should view an alert my session may expire, and automatically logged out if m...
XavXav
ccca166c36dSHRINE2020-218 : re-did query name dialog validation -- allow all "common" ASCII characters. Slightly refactored the ...
Liam MoynihanLiam Moynihan
a2a5d000302Added a continue query poll action and updated isNewDataFetch accordingly
XavXav
74d302d2e33SHRINE2020-218 : renamed property name for invalid characters in ValidatedTextField
XavXav
0a172336436SHRINE2020-218 : fixed query-rename validation; slight refactoring of ValidatedTextField and its usage
bcarmenbcarmen
281b055932bpotential solution for including the network help url
bcarmenbcarmen
3d72c250160recommended style changes
Liam MoynihanLiam Moynihan
3eaeae5f9c8Refactored model to separate all query results from selected query result
bcarmenbcarmen
c3790652ba9changes from code review
bcarmenbcarmen
8f179638107Merge branch '2.0-webclient' into feature/SHRINE2020-267
bcarmenbcarmen
76fdbeb793ecode cleanup
Liam MoynihanLiam Moynihan
411c7ac8000Merge pull request #902 in SHRINE/shrine from feature/SHRINE2020-233 to 2.0-webclient * commit '2554a5113cb4c3163a06...
XavXav
2acc0a610fdSHRINE2020-218 : more work on TODOs and comments
XavXav
aaec4d22e24SHRINE2020-218 : add and edit some TODOs
Liam MoynihanLiam Moynihan
dbdc3702535Removed unnecessary todo comments
Liam MoynihanLiam Moynihan
036c691926dPulling flagging related text from shrine conf file
XavXav
a483b7ffbc0SHRINE2020-218 : added back-end validation and its unit tests
XavXav
5d352d7e261SHRINE2020-218 : another way to prevent a back-drop click from affecting the query name
XavXav
be1895fbdc8SHRINE2020-218 : a simple work-around to prevent "backdropClick"
XavXav
9ea1fd75d6bSHRINE2020-218 : added front-end validation
bcarmenbcarmen
bd0ceff4a69updated snapshot test
bcarmenbcarmen
a2104717ac1Potential solution for making all modals look alike.
XavXav
c4137a29201SHRINE2020-218 : comment relative to prvious commit
XavXav
2637b5fe495SHRINE2020-218 : bug when calling fetchQueryUpdateFailed()
XavXav
e8fc639238dSHRINE2020-218 : fixed broken rename-query feature after merging 2.0-webclient
XavXav
376ef4de4c1SHRINE2020-218 : merge 2.0-webclient + rename query is broken
bcarmenbcarmen
3397f3cf4f2saving work
marc-daniemarc-danie
a91c75740f9SHRINE2020-262 - Merge SHRINE 2.0 with Shrine 2020 at the beginning of Sprint 12 - changed network id to be a string ...
Liam MoynihanLiam Moynihan
972e72eb960Changed flag sort ordering to match BA requirements
Liam MoynihanLiam Moynihan
59329386e95Added call for frontend to sort by flag
Liam MoynihanLiam Moynihan
2554a5113cbMerge branch '2.0-webclient' into feature/SHRINE2020-233
Liam MoynihanLiam Moynihan
07f7c5b0cb5Added an additional unit test check
Liam MoynihanLiam Moynihan
a8d242566f8First pass of implementing flagged query sort
Liam MoynihanLiam Moynihan
7b76cb2fb47Changed hover tooltips to not use the word query
marc-daniemarc-danie
a1ef7d6f58bSHRINE2020-262 - Merge SHRINE 2.0 with Shrine 2020 at the beginning of Sprint 12 - fixed merge overwrite
XavXav
82139ac5423SHRINE2020-218 : fix API call signature in front-end
marc-daniemarc-danie
f34cba385bcSHRINE2020-262 - Merge SHRINE 2.0 with Shrine 2020 at the beginning of Sprint 12 - Replaced queryResultPolling refere...
marc-daniemarc-danie
6218bd70a65Merge branch 'release/2.1.0-M6' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-262 ...
XavXav
17f37e82d06SHRINE2020-218 : more code clean-up
marc-daniemarc-danie
38309acd0c4Merge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-262
XavXav
33fb17efc27SHRINE2020-218 : clean up dead code from previous attempts
marc-daniemarc-danie
69d7bcb915cMerge branch 'release/2.1.0-M6' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-262 ...
Liam MoynihanLiam Moynihan
29be7e78964Merge pull request #904 in SHRINE/shrine from feature/SHRINE2020-274 to 2.0-webclient * commit 'eddf19dc07be0a4928aa...
Ben CarmenBen Carmen
cdd165588c9Merge pull request #905 in SHRINE/shrine from feature/SHRINE2020-240 to 2.0-webclient * commit '35aebb449b93d302c196...
marc-daniemarc-danie
4e4bc100782SHRINE2020-140- As a logged in user, I should view an alert my session may expire, and automatically logged out if my...
Liam MoynihanLiam Moynihan
9f671be484dMerge pull request #900 in SHRINE/shrine from feature/SHRINE2020-226 to 2.0-webclient * commit '8dbc7f2bc90b8b4206fb...
Liam MoynihanLiam Moynihan
8dbc7f2bc90Changed queryOptionsSaga to flagQuerySaga
Liam MoynihanLiam Moynihan
eddf19dc07bMerge remote-tracking branch 'origin/feature/SHRINE2020-240' into feature/SHRINE2020-274
Liam MoynihanLiam Moynihan
20111d44910Merge branch '2.0-webclient' into feature/SHRINE2020-233
Liam MoynihanLiam Moynihan
440fde5befcAdded showLoader property to query result view
bcarmenbcarmen
35aebb449b9Potential fix of missing query name and updated property when polling.
Liam MoynihanLiam Moynihan
f7e3232f9b2Renamed queryResultOptionsSaga to queryOptionsSaga
Liam MoynihanLiam Moynihan
74b029ad6c0Removed unused import
Liam MoynihanLiam Moynihan
ebe7d0c2b9fRemoved institution result filter and fixed loading issue
bcarmenbcarmen
fd9e7c83950saving work
bcarmenbcarmen
b264a9dc368saving progress
XavXav
e60f8c9ba12SHRINE2020-218 : merged 2.0-webclient (with conflicts)
Liam MoynihanLiam Moynihan
8271c13d239Merge branch '2.0-webclient' into feature/SHRINE2020-226
Marc-Danie NazaireMarc-Danie Nazaire
62053fb1961Merge pull request #903 in SHRINE/shrine from feature/SHRINE2020-173 to 2.0-webclient * commit '7fc479bdd39232004048...
Liam MoynihanLiam Moynihan
ca814501159Fixed unintended changes due to git merges
Liam MoynihanLiam Moynihan
bab1f70f135Changed frontend flag query call to use network id as path param
Liam MoynihanLiam Moynihan
ee1d05f26e8Merge branch '2.0-webclient' into feature/SHRINE2020-226
Marc-Danie NazaireMarc-Danie Nazaire
0e8e6d411e3Merge pull request #899 in SHRINE/shrine from feature/SHRINE2020-173 to 2.0-webclient * commit '0abaeb36e3c723e7aa1e...
Liam MoynihanLiam Moynihan
5b3facc5cedImplemented 3 stage query status icons with tooltip
marc-daniemarc-danie
7fc479bdd39Merge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-173 # C...
marc-daniemarc-danie
0abaeb36e3cMerge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-173 # C...
marc-daniemarc-danie
3d3fee5568bSHRINE2020-173 - Display a readable format of the query definition on the View Results tab - fixed show less link not...
bcarmenbcarmen
715f74f44a2quick code change
bcarmenbcarmen
f785e2cadc7Potential solution for formatting the footer
XavXav
f4a746ff54fSHRINE2020-218 : minor code clean-up
XavXav
db2a24dd1dfSHRINE2020-218 : clean-up alerts and comments
XavXav
4732f7fb8a3SHRINE2020-218 : make use of FETCH_ALL_QUERIES action; changes committed to try on dev tier
bcarmenbcarmen
66356029817change to make the revision length 11
XavXav
8c5275ca226SHRINE2020-218 : missing import (?) - committing so I can try it out on the dev tier
bcarmenbcarmen
2f52ce5c827code cleanup
bcarmenbcarmen
fbb99df912ePotential solution for short hash
XavXav
7d9898d5f16SHRINE2020-218 : commit in order to test on the dev tier
Marc-Danie NazaireMarc-Danie Nazaire
5878a5e5305Merge pull request #891 in SHRINE/shrine from feature/SHRINE2020-252 to 2.0-webclient * commit 'a1e1b5c6e348c6f8925b...
XavXav
cc4fe43d2cfSHRINE2020-218 : reverted local front-end configuration changes
XavXav
a87940ebfeaSHRINE2020-218 : merged 2.0-webclient
marc-daniemarc-danie
a1e1b5c6e34SHRINE2020-252 - modified to include the networkId as part of the Url Path
marc-daniemarc-danie
3647ae454daSHRINE2020-252 - modified to send a BadRequest response when an invalid change flag query is specified
bcarmenbcarmen
437d3eda81cfix of model
marc-daniemarc-danie
c20661eda87SHRINE2020-173 - Display a readable format of the query definition on the View Results tab - renamed criteria to quer...
XavXav
0d88b5696f9Merge branch '2.0-webclient' into feature/SHRINE2020-218
marc-daniemarc-danie
e10d137088eSHRINE2020-173 - Display a readable format of the query definition on the View Results tab - renamed criteria to quer...
marc-daniemarc-danie
966a14d1d2aSHRINE2020-173 - Display a readable format of the query definition on the View Results tab - modified to return a cle...
Liam MoynihanLiam Moynihan
dc7e6da0349Merge pull request #897 in SHRINE/shrine from feature/SHRINE2020-35 to 2.0-webclient * commit '698082e32a87676071b1e...
marc-daniemarc-danie
b9a9e226809SHRINE2020-173 - Display a readable format of the query definition on the View Results tab - Changed type returned by...
Liam MoynihanLiam Moynihan
c8bbe84574cMerge branch '2.0-webclient' into feature/SHRINE2020-226
Liam MoynihanLiam Moynihan
55eb7164854Fixed flag api call to use a query param for network id
XavXav
c808fc5e1d1SHRINE2020-218 : merged 2.0-webclient
XavXav
6110272ce80SHRINE2020-218 : merged SHRINE2020-226
marc-daniemarc-danie
ad0a2018c29Merge in 2.0-webclient branch
Liam MoynihanLiam Moynihan
698082e32a8Merge branch '2.0-webclient' into feature/SHRINE2020-35
bcarmenbcarmen
ff66ceed3d9fix of header and web server
bcarmenbcarmen
53824c1da68Merge branch 'feature/SHRINE2020-230' into merge
bcarmenbcarmen
9669fcd2a5eMerge branch '2.0-webclient' into merge
marc-daniemarc-danie
dce1aa12c5cSHRINE2020-173 - Display a readable format of the query definition on the View Results tab - generalized OverflowText
bcarmenbcarmen
f167fcbded7fix of failing unit test
Next →