SHRINE
  1. SHRINE

shrine

Public
  1. SHRINE
  2. shrine

All Branches Graph  

        
AuthorCommitMessageCommit dateBuilds
Xavier HaurieXavier Haurie
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
Xavier HaurieXavier Haurie
74d302d2e33SHRINE2020-218 : renamed property name for invalid characters in ValidatedTextField
Xavier HaurieXavier Haurie
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...
Xavier HaurieXavier Haurie
2acc0a610fdSHRINE2020-218 : more work on TODOs and comments
Xavier HaurieXavier Haurie
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
Xavier HaurieXavier Haurie
a483b7ffbc0SHRINE2020-218 : added back-end validation and its unit tests
Xavier HaurieXavier Haurie
5d352d7e261SHRINE2020-218 : another way to prevent a back-drop click from affecting the query name
Xavier HaurieXavier Haurie
be1895fbdc8SHRINE2020-218 : a simple work-around to prevent "backdropClick"
Xavier HaurieXavier Haurie
9ea1fd75d6bSHRINE2020-218 : added front-end validation
bcarmenbcarmen
bd0ceff4a69updated snapshot test
bcarmenbcarmen
a2104717ac1Potential solution for making all modals look alike.
Xavier HaurieXavier Haurie
c4137a29201SHRINE2020-218 : comment relative to prvious commit
Xavier HaurieXavier Haurie
2637b5fe495SHRINE2020-218 : bug when calling fetchQueryUpdateFailed()
Xavier HaurieXavier Haurie
e8fc639238dSHRINE2020-218 : fixed broken rename-query feature after merging 2.0-webclient
Xavier HaurieXavier Haurie
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
Xavier HaurieXavier Haurie
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 ...
Xavier HaurieXavier Haurie
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
Xavier HaurieXavier Haurie
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
Xavier HaurieXavier Haurie
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
Xavier HaurieXavier Haurie
f4a746ff54fSHRINE2020-218 : minor code clean-up
Xavier HaurieXavier Haurie
db2a24dd1dfSHRINE2020-218 : clean-up alerts and comments
Xavier HaurieXavier Haurie
4732f7fb8a3SHRINE2020-218 : make use of FETCH_ALL_QUERIES action; changes committed to try on dev tier
bcarmenbcarmen
66356029817change to make the revision length 11
Xavier HaurieXavier Haurie
8c5275ca226SHRINE2020-218 : missing import (?) - committing so I can try it out on the dev tier
bcarmenbcarmen
2f52ce5c827code cleanup
bcarmenbcarmen
fbb99df912ePotential solution for short hash
Xavier HaurieXavier Haurie
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...
Xavier HaurieXavier Haurie
cc4fe43d2cfSHRINE2020-218 : reverted local front-end configuration changes
Xavier HaurieXavier Haurie
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...
Xavier HaurieXavier Haurie
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
Xavier HaurieXavier Haurie
c808fc5e1d1SHRINE2020-218 : merged 2.0-webclient
Xavier HaurieXavier Haurie
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
bcarmenbcarmen
e635944d218Merge branch 'feature/SHRINE2020-242' into merge
Liam MoynihanLiam Moynihan
ffb737db011Merge branch '2.0-webclient' into feature/SHRINE2020-226
Liam MoynihanLiam Moynihan
f79e76f2d4bUnified flag and unflag api calls and added query id to flag dialog
bcarmenbcarmen
e96ab75e442merge
bcarmenbcarmen
d3c0db075cbMerge branch 'feature/SHRINE2020-245' into merge
Liam MoynihanLiam Moynihan
f01f7edd768Merge branch 'feature/SHRINE2020-252' into feature/SHRINE2020-226
bcarmenbcarmen
8a28ca73226fix of failing snapshot
bcarmenbcarmen
43f9fddb1fesilence failing snapshot tests
marc-daniemarc-danie
73f753502beMerge branch '2.0-webclient' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-173
bcarmenbcarmen
856ee869733merge of SHRINE2020-245
bcarmenbcarmen
f89dd58517dmerge changes
Xavier HaurieXavier Haurie
6ead64cc753Merge branch 'feature/SHRINE2020-226' into feature/SHRINE2020-218
bcarmenbcarmen
b1850bfa84fsaving merge changes
bcarmenbcarmen
35b407dacadMerge branch 'feature/SHRINE2020-238' into merge
bcarmenbcarmen
b9759fab341fixed unit tests
marc-daniemarc-danie
bba4fafe8e0SHRINE2020-252 - Modified sendQueryUpdate to return an IO
marc-daniemarc-danie
41eae238711Merge branches '2.0-webclient' and 'feature/SHRINE2020-173' of https://open.med.harvard.edu/stash/scm/shrine/shrine i...
marc-daniemarc-danie
21462028b09Merge branches '2.0-webclient' and 'feature/SHRINE2020-173' of https://open.med.harvard.edu/stash/scm/shrine/shrine i...
Liam MoynihanLiam Moynihan
26eb4e6b7e5Merge pull request #896 in SHRINE/shrine from feature/SHRINE2020-154 to 2.0-webclient * commit '40b09faca1ef305f564b...
bcarmenbcarmen
bb6fd95ee9cfix of failing unit tests
Liam MoynihanLiam Moynihan
68555809731Merge pull request #895 in SHRINE/shrine from feature/SHRINE2020-212 to 2.0-webclient * commit '55e3ff64657eb1e82dea...
Liam MoynihanLiam Moynihan
55e3ff64657Merge branch '2.0-webclient' into feature/SHRINE2020-212
Liam MoynihanLiam Moynihan
d601de6b3c1Fixed bug causing edit query name dialog to not start with the queries current name
Liam MoynihanLiam Moynihan
40b09faca1eChanged unnecessary lets to consts
Liam MoynihanLiam Moynihan
3be5666e623Merge pull request #892 in SHRINE/shrine from feature/SHRINE2020-211 to 2.0-webclient * commit '0efc9c101a7e560a164e...
marc-daniemarc-danie
7b8b98f5c4aSHRINE2020-252 - moved networkId to be a query parameter
marc-daniemarc-danie
91acf02dd2aSHRINE2020-252 - import cleanup
bcarmenbcarmen
70d7c26510afix of broken snapshot test
marc-daniemarc-danie
e67785bcca2SHRINE2020-252 - fixed typo
Liam MoynihanLiam Moynihan
3de47fe1be2Merge pull request #894 in SHRINE/shrine from feature/SHRINE2020-172 to 2.0-webclient * commit '76aa723aea4f08745011...
marc-daniemarc-danie
fbc117a15afSHRINE2020-252 - updated unit tests
marc-daniemarc-danie
3bce1cfca56SHRINE2020-252 - replaced flag and unflag query api calls with changeQueryFlag api call
marc-daniemarc-danie
dc63dee08a8SHRINE2020-173 - Display a readable format of the query definition on the View Results tab - fixed with placement for...
marc-daniemarc-danie
e495b525bbbSHRINE2020-173 - Display a readable format of the query definition on the View Results tab - changes for hiding and s...
bcarmenbcarmen
25bdb4513bdsaving work
bcarmenbcarmen
b01f2d9897btemporary silence of failing snapshot tests
bcarmenbcarmen
6b00c616ad0saving changes
Xavier HaurieXavier Haurie
ab2ba6d19c7SHRINE2020-218 : added back-end unit test
Xavier HaurieXavier Haurie
a20a2d141eaSHRINE2020-218 : reset js config to original values
Xavier HaurieXavier Haurie
03a2d2890a7SHRINE2020-218 : update snapshot
Liam MoynihanLiam Moynihan
91dca69b0c9Removed unintended code changes caused by git merge
Xavier HaurieXavier Haurie
1efd2ddcfe1SHRINE2020-218 : implement dialog for renaming a query and integrate with back-end
bcarmenbcarmen
9f2f27ed699moved common modal styles to a mixin
bcarmenbcarmen
06edff558affix of snapshot
Liam MoynihanLiam Moynihan
678965b7c2eFixed failing snapshot test
bcarmenbcarmen
0d854d191a5Merge branch 'feature/SHRINE2020-245' into feature/SHRINE2020-242
Liam MoynihanLiam Moynihan
26d512fd964Cleared query name validation errors after generating name
bcarmenbcarmen
4c8bb6057fafix of failing snapshot tests
bcarmenbcarmen
a0a7998837efix of failing unit test
Liam MoynihanLiam Moynihan
595ed23f794Updated query name validity when generating a name
bcarmenbcarmen
88842122190disabled failing snapshot tests
bcarmenbcarmen
fcfba53a490updated unit tests
Liam MoynihanLiam Moynihan
76aa723aea4Incorporated pr feedback for backend sorting of query institution results
Xavier HaurieXavier Haurie
7a7953c3104SHRINE2020-218 : merged SHRINE2020-226
marc-daniemarc-danie
7d386906f4cSHRINE2020-247 - Return readable query definition in queryResult api call - enable code category
marc-daniemarc-danie
173b4915c2fMerge branches '2.0-webclient' and 'feature/SHRINE2020-173' of https://open.med.harvard.edu/stash/scm/shrine/shrine i...
marc-daniemarc-danie
fb61ecd7e35disabled query criteria
Liam MoynihanLiam Moynihan
0efc9c101a7Incorporated pr feedback for observed field in reducer
bcarmenbcarmen
6b44492145eadded recommendations from code reviews
Xavier HaurieXavier Haurie
b819cd3f8e0SHRINE2020-218 : back-end for editing a query name
bcarmenbcarmen
3247da9f996fix of node version
Liam MoynihanLiam Moynihan
59a920d6e25Merge branch 'feature/SHRINE2020-253' into feature/SHRINE2020-226
marc-daniemarc-danie
651825a4383Added flag and unflag api calls
marc-daniemarc-danie
19d36d7496fMerge branch 'feature/SHRINE2020-226' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020...
marc-daniemarc-danie
a0c7fa9d66dAdded flag and unflag api endpoints
bcarmenbcarmen
4c0134fd761updates based on code reviews
marc-daniemarc-danie
b6a40dc2d7cSHRINE2020-252 - temporarily disabled code category
bcarmenbcarmen
ac9f576299dChanges based on code review
Liam MoynihanLiam Moynihan
1d41791933fRemoved wip error status dialog
Liam MoynihanLiam Moynihan
d9e3921c442Merge branch 'feature/SHRINE2020-253' of ssh://open.catalyst.harvard.edu:7999/shrine/shrine into feature/SHRINE2020-253
Liam MoynihanLiam Moynihan
2ae8f377258Split flag and unflag frontend calls into two seperate endpoints
Liam MoynihanLiam Moynihan
bc3e2167199First pass of query result flagging before conecting to backend
Liam MoynihanLiam Moynihan
ff36b625231First iteration of dialog box pop ups for flag renaming and errors
Liam MoynihanLiam Moynihan
be54b2c79e7Split flag and unflag frontend calls into two seperate endpoints
Liam MoynihanLiam Moynihan
1d2a65fddaeFirst pass of query result flagging before conecting to backend
Liam MoynihanLiam Moynihan
5a028b439fdFirst iteration of dialog box pop ups for flag renaming and errors
bcarmenbcarmen
eb89d8f6ffbsaving changes to secure fetch
Liam MoynihanLiam Moynihan
f4c25555adbChanged style of query history name hover text
Liam MoynihanLiam Moynihan
df785c88b44Merge branch 'feature/SHRINE2020-35' of ssh://open.catalyst.harvard.edu:7999/shrine/shrine into feature/SHRINE2020-35
marc-daniemarc-danie
f343b0b217bSHRINE2020-252 - unflag and flag query api calls with unit tests
Liam MoynihanLiam Moynihan
34dbe376199Changed hover text and styling of auto generate query name button
Liam MoynihanLiam Moynihan
083ed2aefc5Changed auto generate icon hover text
marc-daniemarc-danie
35190046755SHRINE2020-252 - unflag and flag query api calls
marc-daniemarc-danie
289edb3b83dSHRINE2020-252 - unflag and flag query api calls
bcarmenbcarmen
63313b81fadFix of failing snapshot
bcarmenbcarmen
4def10a7f44fix of secure fetch
bcarmenbcarmen
c50ed161d56Merge branch 'feature/SHRINE2020-245' into feature/SHRINE2020-242
bcarmenbcarmen
f5c9028c18eupdated steward proxy
bcarmenbcarmen
247df047fc7updated steward request
Next →