SHRINE
  1. SHRINE

shrine

Public
  1. SHRINE
  2. shrine

All Branches Graph  

        
AuthorCommitMessageCommit dateBuilds
David WalendDavid Walend
c67a118b5cfFigured out the jawn dependency for SHRINE-2794
David WalendDavid Walend
271ccb02647Trailer
David WalendDavid Walend
0b96ae1d763Cleanup for using circe in SHRINE-2794
bendcarmenbendcarmen
4cd3185aa88Merge branch 'develop' into code-review/for-marc-danie
Ben CarmenBen Carmen
c72221b2c5fMerge pull request #220 in SHRINE/shrine from task/SHRINE-2755-port-query-status to code-review/for-marc-danie * com...
David WalendDavid Walend
21e3b128362Now with circe. It lets me not have to list out the classes anywhere. SHRINE-2794
bendcarmenbendcarmen
a62719b6a6bincorporated suggestions from code review
David WalendDavid Walend
4bfbd0b0939Adding circe and setting the stage for SHRINE-2770
David WalendDavid Walend
1177fd1ad5aMerge pull request #219 in SHRINE/shrine from feature/SHRINE-2778-build-out-common-currency-data to develop * commit...
bendcarmenbendcarmen
8d09ad878b6Merge branch 'code-review/for-marc-danie' into task/SHRINE-2755-port-query-status
bendcarmenbendcarmen
350f5cfd900Merge branch 'develop' into code-review/for-marc-danie
bendcarmenbendcarmen
db03ba14daaAdded prop types to query status
David WalendDavid Walend
d4429f1479cReview comments from Marc-Danie for SHRINE-2778
bendcarmenbendcarmen
516ea653871Potential solution for SHRINE-2755
David WalendDavid Walend
aab2736556fRound trip throught the database for results for SHRINE-2778
David WalendDavid Walend
20491810ecaAdded json serialization for expected results for SHRINE-2778
David WalendDavid Walend
0a85e345d82Added json serialization for results for SHRINE-2778
David WalendDavid Walend
33d3e99a50fSome stray bits of hms-support
David WalendDavid Walend
eba35da3522Added a first test of results for the database for SHRINE-2778
David WalendDavid Walend
365e4d76d7eAdded mysql schema for SHRINE-2778
David WalendDavid Walend
bfc5486c2ddResult table first version for SHRINE-2778
David WalendDavid Walend
d20ea2c11e9Some generics for more type safty around ids for SHRINE-2777
David WalendDavid Walend
4cb3cc40472Typesafe ids for SHRINE-2777
David WalendDavid Walend
54be79235ddI decided not to have a bunch of optional-ish bits in all results to support the answer from the CRC for SHRINE-2777
Ben CarmenBen Carmen
757c7308ccfMerge pull request #218 in SHRINE/shrine from task/SHRINE-2753 to code-review/for-marc-danie * commit '03b063667d466...
David WalendDavid Walend
9a595798fb0Moving up some forever thigns for SHRINE-2777
bendcarmenbendcarmen
03b063667d4Removed some pasted stuff
bendcarmenbendcarmen
52ffaf6b282Working verion of poll reducer + View Container
David WalendDavid Walend
aac76e5bc2bBeginning of Result json for SHRINE-2777
David WalendDavid Walend
f603595e43eVersionInfo class for SHRINE-2777
David WalendDavid Walend
8d2dc6cab92Moving up the Envelope class before digging into the v26 storage structures for SHRINE-2777
Ben CarmenBen Carmen
06334fb7f8eMerge pull request #217 in SHRINE/shrine from task/SHRINE-2743-unit-tests to task/SHRINE-2743 * commit 'e8ebe7feff09...
bendcarmenbendcarmen
e8ebe7feff0Saga unit tests
bendcarmenbendcarmen
0c58ba400d3Added Unit Tests for queryFetchSaga
bendcarmenbendcarmen
d3362d21a16A quick fix of some imports
Ben CarmenBen Carmen
eca0b170d20Merge pull request #216 in SHRINE/shrine from task/SHRINE-2743-query-poll-saga to task/SHRINE-2743 * commit '8fcf358...
bendcarmenbendcarmen
8fcf3585b64Created query poll saga and wired everything together
bendcarmenbendcarmen
fbb00620df4Create the fetch Saga
bendcarmenbendcarmen
3d6ac821dd4Merge branch 'task/SHRINE-2743' into task/SHRINE-2743-fetch-saga
Ben CarmenBen Carmen
6974a2747c4Merge pull request #214 in SHRINE/shrine from feature/SHRINE-2759-auth-header to task/SHRINE-2743 * commit '5a00c640...
bendcarmenbendcarmen
2b6f7492e38fetch Saga commit
bendcarmenbendcarmen
5a00c640df0Potential solution for saving the auth header and deleting it when pulling it from session storage
Ben CarmenBen Carmen
5fdc68335b6Merge pull request #213 in SHRINE/shrine from task/SHRINE-2743-actions to task/SHRINE-2743 * commit '98090fb800cbca2...
bendcarmenbendcarmen
98090fb800cMade method signatures more consistent for actions
bendcarmenbendcarmen
064278f4c13polling redux actions
David WalendDavid Walend
8277234ce03Merge pull request #212 in SHRINE/shrine from feature/SHRINE-2760-remove-rotted-json-support-from to develop * commi...
David WalendDavid Walend
5754f957c20Removed the lift json library for SHRINE-2760 and SHRINE-1860
Ben CarmenBen Carmen
0a79a4d63f6Merge pull request #208 in SHRINE/shrine from task/SHRINE-2751-port-retrofitter to develop * commit 'd4c69e54a964759...
David WalendDavid Walend
45245c7cba6Removed traits and imports for SHRINE-2760
bendcarmenbendcarmen
d4c69e54a96renamed image files per code review
David WalendDavid Walend
ddf392d964aRemoved the actual methods behind JsonUnmarshaller for SHRINE-2760
David WalendDavid Walend
d8632987e1dRemoved the actual methods behind JsonMarshaller for SHRINE-2760
David WalendDavid Walend
bf1f5e9263fMerging from the release to develop
bendcarmenbendcarmen
f481b280c0aIncorporated code review changes
David WalendDavid Walend
464acf3b49eMerge pull request #209 in SHRINE/shrine from feature/SHRINE-1042-split-the-config-subproject-into to develop * comm...
marc-daniemarc-danie
0734340cf89SHRINE-2763 - Modified Mock CRC to simulate QUEUED TO ERROR with no status message
Ansible DeployAnsible Deploy
73f4bc8e64cMerge release branch release/1.25.4 into master.
Ansible DeployAnsible Deploy
28afcbfc1b0Update POMs with release version 1.25.4.
Simon ChangSimon Chang
968cdb8f0a7Bump versions to 1.25.4-SNAPSHOT. (ITEAM-2299)
David WalendDavid Walend
76c4dab14a6Merge pull request #210 in SHRINE/shrine from feature/SHRINE-2741-characterize-and-trim-down-the to develop * commit...
bendcarmenbendcarmen
7fae3886103Updated bower to 1.8.4
David WalendDavid Walend
92de6bc88a2Down to 16 warnings for SHRINE-2741
David WalendDavid Walend
53aaf54a807Restored some tests for SHRINE-1042
David WalendDavid Walend
07b46e40e82Through all the shrine-app tests for SHRINE-1042
David WalendDavid Walend
e6de3054824Through the first shrine-app test for SHRINE-1042
David WalendDavid Walend
e0a7a371f67More for SHRINE-1042, getting close
David WalendDavid Walend
d0b4b377f10About to delete the config subproject for SHRINE-1042
bendcarmenbendcarmen
f03cf70a82fSome code tweaks
David WalendDavid Walend
df3061311bbDeleted Keys for SHRINE-1042
David WalendDavid Walend
023457b5e2dStray bits to move the mapping config into the adapter code for SHRINE-1042
David WalendDavid Walend
4cbc3fe0e04Progress toward dissolving the config subproject for SHRINE-1042
bendcarmenbendcarmen
6643c37b61dEdit of readme
bendcarmenbendcarmen
805c265eb11Edit of readme
bendcarmenbendcarmen
bd7dc4ce709Removed legacy webclient dir
bendcarmenbendcarmen
5bbad54ea62Merge branch 'develop' into task/SHRINE-2751-port-retrofitter
bendcarmenbendcarmen
b94c182e22cCommit of new project structure for webclient
bendcarmenbendcarmen
1b2a09c1d95Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
bendcarmenbendcarmen
2af87a57d74Update of Bower to most recent version 1.8.4
bendcarmenbendcarmen
90bc413d8a5Saving most recent
bendcarmenbendcarmen
760b1aa52a8Webclient bootrap and render of tabs
Ben CarmenBen Carmen
de066fef272Merge pull request #207 in SHRINE/shrine from bugfix/SHRINE-2609-readquerydefinitionrequest-s to develop * commit '7...
David WalendDavid Walend
5123663b917Merge pull request #206 in SHRINE/shrine from bugfix/SHRINE-2511-webclient-application-should to develop * commit '3...
marc-daniemarc-danie
39cf960e141SHRINE-2511 - Webclient: Application should say 'CRC could not find the results for queued query' instead of 'No resu...
David WalendDavid Walend
71648828301Tidying up for SHRINE-2609
David WalendDavid Walend
2373d2f9e70Switched to a for comprehension for SHRINE-2609
David WalendDavid Walend
a49d5e2a474Maybe got things working without touching the adapter for query definitions for SHRINE-2609
marc-daniemarc-danie
e890290bebbSHRINE-2511- Webclient: Application should say 'CRC could not find the results for queued query' instead of 'No resul...
bendcarmenbendcarmen
57314735487Shrine Bootstrapping to enable React
Marc-Danie NazaireMarc-Danie Nazaire
1be9b56620fMerge pull request #205 in SHRINE/shrine from bugfix/SHRINE-1718-get-rid-of-happy to develop * commit 'de21b403ad822...
marc-daniemarc-danie
de21b403ad8SHRINE-1718 - Get rid of Happy - removed stray character
marc-daniemarc-danie
f62c6b431a4SHRINE-1718 - Get rid of Happy - removed test for /admin/messWithHappyVersion endpoint
marc-daniemarc-danie
729dd1d5f57SHRINE-1718 - Get rid of Happy - modified the default VAGRANT_CONTEXT location
marc-daniemarc-danie
28842ed3345SHRINE-1718 - Get rid of Happy - removed the happy test xml files
bendcarmenbendcarmen
3a73f37af4dSaving latest changes
marc-daniemarc-danie
c1777069297Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into bugfix/SHRINE-1718-get-rid-of-happy
marc-daniemarc-danie
656cacb66feSHRINE-1718- Get rid of Happy
bendcarmenbendcarmen
17094c238d8Working Sagas in Webclient tested on dev2
David WalendDavid Walend
2a43da70c73Merge pull request #204 in SHRINE/shrine from feature/SHRINE-2733-remove-obsolete-tools to develop * commit 'aaaeadc...
David WalendDavid Walend
7e4e1d48a79Added -feature flag for scala compiles to SHRINE-2738
David WalendDavid Walend
aaaeadc82adWeird lingering dependencies for SHRINE-2733
David WalendDavid Walend
9d18a66a777Removed most of the tools subproject for SHRINE-2733
bendcarmenbendcarmen
b50d2daecffMerge branch 'develop' into feature/js-infrastructure
Ben CarmenBen Carmen
a8fc1458e92Merge pull request #203 in SHRINE/shrine from bugfix/SHRINE-2703 to develop * commit '909acd4381fb1b9fb90fd166382076...
bendcarmenbendcarmen
909acd4381fIncorporated suggestions from code review
David WalendDavid Walend
34d8bd0dad5reverting the scala maven plugin version to 3.2.2 due to problems on the build server
David WalendDavid Walend
2cd33120832Merge pull request #202 in SHRINE/shrine from bugfix/SHRINE-2728-easy-library-upgrades-for-1.26 to develop * commit ...
bendcarmenbendcarmen
ae3525c18afPotential fix of the Number of terms exceeded pop up issue
David WalendDavid Walend
a44933b11efRenamed a subproject
Ben CarmenBen Carmen
6c3846a062aMerge pull request #199 in SHRINE/shrine from bugfix/SHRINE-2722-remove-shouldQuerySelf to develop * commit 'c6c9b17...
bendcarmenbendcarmen
c6c9b173ec9Merge into develop
David WalendDavid Walend
97b4d00cc3bMerge branch 'develop' into bugfix/SHRINE-2728-easy-library-upgrades-for-1.26
David WalendDavid Walend
e1e58220fc9The rest of the easy library upgrades for SHRINE-2728
David WalendDavid Walend
207872415daMerge pull request #197 in SHRINE/shrine from bugfix/SHRINE-1661-remove-the-lockout-feature-in to develop * commit '...
David WalendDavid Walend
b63e20e8212Somehow hms-support crept back in
David WalendDavid Walend
45f467feb5dA little cleanup from the merge for SHRINE-1661
David WalendDavid Walend
8c9b37c586cUpgraded scala-maven-plugin, squeryl, typesafe-config, and h2 for SHRINE-2728
David WalendDavid Walend
c5c959d1056Merge pull request #201 in SHRINE/shrine from feature/SHRINE-2062-remove-special-code-for-hms-support to develop * c...
Ben CarmenBen Carmen
dbf86674fecMerge pull request #200 in SHRINE/shrine from bugfix/SHRINE-2721-remove-lockout to develop * commit '45a53ff177173c6...
David WalendDavid Walend
363d6f5103cA few last hms refereces cleared up for SHRINE-2062
David WalendDavid Walend
c8d89f8e66dMerging
David WalendDavid Walend
4fd6ea9b34fRemoved scanner tool (which had lots of HMS dependencies) for SHRINE-2725, and bumped pom.xml files to ease the merge
David WalendDavid Walend
788684d0f50Merge pull request #198 in SHRINE/shrine from bugfix/SHRINE-1430-replace-shouldqueryself-with to develop * commit '6...
bendcarmenbendcarmen
ee43310c565Fix the build!
bendcarmenbendcarmen
1cee7d60a10attempt to fix broken build
bendcarmenbendcarmen
45a53ff1771Potential fix of SHRINE-2721
bendcarmenbendcarmen
dc82ab5d570Potential fix of SHRINE-2722 removing shouldQuerySelf references
bendcarmenbendcarmen
81e7f261074Merge of 1.25.3
bendcarmenbendcarmen
4c411d0e0dfMerge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
bendcarmenbendcarmen
409a8c139ecBump of pom to 1.25.3.7-SNAPSHOT
David WalendDavid Walend
663f81809e4Marc-Danie found another shouldQuerySelf down in some test code for SHRINE-1430
David WalendDavid Walend
fa39aa339c9Removed HMS-ecommons-specific identity code for SHRINE-2062
David WalendDavid Walend
831d336d00aRemoved shouldQuerySelf references for SHRINE-1430
David WalendDavid Walend
455fd197ca5More tailings from SHRINE-1661
David WalendDavid Walend
b94026af7b6Last vestiges of lockout for SHRINE-1661
David WalendDavid Walend
920960937eeFirst pass of getting rid of all things lockout for SHRINE-1661
David WalendDavid Walend
f18e4dc95e7Merged changes from release/1.25.3
David WalendDavid Walend
a64c5071350Merge branch 'release/1.25.3' into develop
David WalendDavid Walend
620e93bce71Getting ready to merge the 1.25 release branch - messing with pom.xmls to make the merge easier
David WalendDavid Walend
e399b968081Merge pull request #196 in SHRINE/shrine from bugfix/SHRINE-2719-webclient-query-status-completed to release/1.25.3 ...
David WalendDavid Walend
8245b682e38MS SQL Server schema fixes for SHRINE-2719
David WalendDavid Walend
84f8bb95af3Merge pull request #195 in SHRINE/shrine from bugfix/SHRINE-2592-change-default-timeout-again to release/1.25.3 * co...
David WalendDavid Walend
2af80541142Ben says this is the right file with the CRC timeout to change to make it stay forever for SHRINE-2592
David WalendDavid Walend
2a296e85962Yet another attempt to change the CRC timeout from 180 to 30 seconds for SHRINE-2592
marc-daniemarc-danie
5464078da6dUpdated POMs to version 1.25.3.6-SNAPSHOT
Marc-Danie NazaireMarc-Danie Nazaire
99cbe38c7bbMerge pull request #194 in SHRINE/shrine from bugfix/SHRINE-2718-donebuthasnoresultsforqueuedqueryexception to releas...
marc-daniemarc-danie
412eb8b6a16SHRINE-2718 - DoneButHasNoResultsForQueuedQueryException is not being propagated through
David WalendDavid Walend
894006415cbMerge pull request #193 in SHRINE/shrine from bugfix/SHRINE-2715-status-column-is-too-short-for to release/1.25.3 * ...
David WalendDavid Walend
4308b65dac3Schema fixes to remove the constraint in QUERY_RESULT for SHRINE-2715
David WalendDavid Walend
27328818d40Merge pull request #191 in SHRINE/shrine from bugfix/SHRINE-2708-for-some-reason-the-dashboard to release/1.25.3 * c...
David WalendDavid Walend
140f237009aMerge pull request #192 in SHRINE/shrine from bugfix/SHRINE-2709-shrine-qa1-is-not-using-the-right to release/1.25.3 ...
Ansible DeployAnsible Deploy
b8b4e25e081Merge release branch release/1.25.3.3 into master.
Ansible DeployAnsible Deploy
afba6115925Update POMs with release version 1.25.3.3.
David WalendDavid Walend
d847e53c0b5Patch fix for Squiryl using the wrong sequence name in Oracle SHRINE-2709
David WalendDavid Walend
e480e57684aMoved pom.xml files to 1.25.3.5-SNAPSHOT
bendcarmenbendcarmen
b894bbbc7edMerge branch 'release/1.25.3' into develop
bendcarmenbendcarmen
73268f4168cSaving work
David WalendDavid Walend
e75ffaf13bbJust when I think I understand Oracle it decides it likes everything in double quotes. SHRINE-2708
Marc-Danie NazaireMarc-Danie Nazaire
26257a04757Merge pull request #190 in SHRINE/shrine from feature/SHRINE-2439-add-urls-to-shrine-meta-with to release/1.25.3 * c...
bendcarmenbendcarmen
e2c0dda39b7Merge branch 'develop' into feature/js-infrastructure
bendcarmenbendcarmen
55a96c2d29eMere of release/1.25.3
bendcarmenbendcarmen
56a90f5fab1Quick Build to make sure latest is out there
marc-daniemarc-danie
57e83b2c1ffSHRINE-2439 - Add urls to shrine-meta with diagnostic information to help Sam debug remotely - minor naming edits
bendcarmenbendcarmen
f6616d773ebAdded updated shrine-client-guide.pdf for 1.25
marc-daniemarc-danie
9ff97e5c418SHRINE-2439 - Add urls to shrine-meta with diagnostic information to help Sam debug remotely
David WalendDavid Walend
f417ebdb0b0Merging from release/1.25.3 pom.xml update
marc-daniemarc-danie
f56d71b8ce6Merge branch 'release/1.25.3' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE-2439-add-ur...
marc-daniemarc-danie
276125f80daSHRINE-2670 - Make the term configurable in the JMeter automation script
David WalendDavid Walend
fb663c0e9d3Merge pull request #187 in SHRINE/shrine from bugfix/SHRINE-2666-webclient-query-not-found-message to release/1.25.3 ...
David WalendDavid Walend
4a050eb2485Merge pull request #188 in SHRINE/shrine from bugfix/SHRINE-2651-webclient-an-unanticipated-problem to release/1.25.3...
David WalendDavid Walend
85a4c21af5dTypo for SHRINE-2666
David WalendDavid Walend
fa1ffa580e8Detection of new i2b2 CRC status types for SHRINE-2561
David WalendDavid Walend
f173f1c056bMarc-Danie suggested breaking up the logic a bit for SHRINE-2666
bendcarmenbendcarmen
7fa195335a1Checking in bundle of Webclient with fixes from reviews
Ben CarmenBen Carmen
c374ab0a331Merge pull request #181 in SHRINE/shrine from bugfix/SHRINE-2602-error-details-still-collapsing to release/1.25.3 * ...
bendcarmenbendcarmen
6ba91dc41c5Finalized wording of default message in case there is no problemDigest element
David WalendDavid Walend
037eecf47c8Nasty, hacky fix for SHRINE-2666 - control via exception
bendcarmenbendcarmen
0f49f765b33Merge branch 'bugfix/SHRINE-2523-default-error-msg' into bugfix/SHRINE-2602-error-details-still-collapsing
bendcarmenbendcarmen
8030e8c59f6Going to merge this in with SHRINE-2602
Ben CarmenBen Carmen
afb93ed5bddMerge pull request #186 in SHRINE/shrine from bugfix/SHRINE-2701-breakdown-pending-wording-fix to release/1.25.3 * c...
David WalendDavid Walend
a87623ee4cfMerge pull request #185 in SHRINE/shrine from feature/SHRINE-1970-auto-increment-for-older-oracle to release/1.25.3 ...
bendcarmenbendcarmen
2f03fe7c0e9Fix of wording on pending previous query when Graphs tab is selected
Ben CarmenBen Carmen
06ad2c00ab8Merge pull request #184 in SHRINE/shrine from SHRINE-2661/-csv-export-extra-rows to release/1.25.3 * commit '4f464ce...
Marc-Danie NazaireMarc-Danie Nazaire
41f89137299Merge pull request #183 in SHRINE/shrine from bugfix/SHRINE-2670-make-the-term-configurable-in to release/1.25.3 * c...
David WalendDavid Walend
8b94009fff5Cleanup for SHRINE-2671
bendcarmenbendcarmen
4f464ce7712Merge branch 'release/1.25.3' into SHRINE-2661/-csv-export-extra-rows
bendcarmenbendcarmen
dd7f3f81aacPotential fix of SHRINE-2661
Ben CarmenBen Carmen
abbc8aec9c2Merge pull request #176 in SHRINE/shrine from bugfix/SHRINE-2523-default-error-msg to release/1.25.3 * commit '12071...
Ben CarmenBen Carmen
0de3d267a56Merge pull request #182 in SHRINE/shrine from bugfix/SHRINE-2657-error-detail-labels to release/1.25.3 * commit 'bef...