SHRINE
  1. SHRINE

shrine

Public
  1. SHRINE
  2. shrine

All Branches Graph  

        
AuthorCommitMessageCommit dateBuilds
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...
David WalendDavid Walend
67a90d8f00eFull schema for SHRINE-2671
David WalendDavid Walend
d83ad2fe5f0Cleanup for SHRINE-1970
David WalendDavid Walend
1854e4cb57fMatch sequnece names to hard-coded squiryl values in table definitions for SHRINE-1970
David WalendDavid Walend
99e5c5359dbMatch sequnece names to hard-coded squiryl values in table definitions for SHRINE-1970
marc-daniemarc-danie
c12446ba78cSHRINE-2670 - Make the term configurable in the JMeter automation script
David WalendDavid Walend
6dfe5883fb4Schemas that don't cause Oracle errors for SHRINE-1970
David WalendDavid Walend
0a125fd2d03Fix for SHRINE-2663 - OK to have a null TIME_ELAPSED
bendcarmenbendcarmen
befcfa16536Fix of labeling for error pop-up
bendcarmenbendcarmen
f12b3dc0f1cPolling Sagas
David WalendDavid Walend
3d7723626a3Merge branch 'release/1.25.3' into feature/SHRINE-1970-auto-increment-for-older-oracle
David WalendDavid Walend
dc5e236d488Move the release branch to 1.25.3.4-SNAPSHOT
Ben CarmenBen Carmen
41a6d7fe220Merge pull request #180 in SHRINE/shrine from bugfix/SHRINE-2654-node-name-overflow to release/1.25.3 * commit '3013...
bendcarmenbendcarmen
75263b1ed30Potential fix of empty details tag SHRINE-2602
bendcarmenbendcarmen
3013380ed8aPotential fix of SHRINE-2654 long node name format
Marc-Danie NazaireMarc-Danie Nazaire
458a4c7ba31Merge pull request #169 in SHRINE/shrine from bugfix/SHRINE-2510-webclient-an-unanticipated-problem to release/1.25.3...
bendcarmenbendcarmen
4d25f48bc68Saving work
marc-daniemarc-danie
66f448272cfSHRINE-2510 - Webclient: An unanticipated problem encountered while running a query which takes a while to run - upda...
David WalendDavid Walend
578b396a90cMerge branch 'release/1.25.3' into feature/SHRINE-1970-auto-increment-for-older-oracle
marc-daniemarc-danie
0097176397cSHRINE-2510 - Webclient: An unanticipated problem encountered while running a query which takes a while to run - unco...
David WalendDavid Walend
5ee7f685deeMerge pull request #178 in SHRINE/shrine from bugfix/SHRINE-2636-webclient-requested-breakdowns to release/1.25.3 * ...
marc-daniemarc-danie
4cf866f7df8SHRINE-2510 - Webclient: An unanticipated problem encountered while running a query which takes a while to run - code...
Marc-Danie NazaireMarc-Danie Nazaire
2472aa5a8acMerge pull request #179 in SHRINE/shrine from bugfix/SHRINE-2582-expose-the-username-password to release/1.25.3 * co...
bendcarmenbendcarmen
0a49e7ff954Saving latest
marc-daniemarc-danie
98111b55a46SHRINE-2582 - Expose the username, password, and domain in the JMeter automation script - added additional authentica...
David WalendDavid Walend
cd95918eca7Added more selection criteria to get all of the most recent breakdown results for SHRINE-2636
David WalendDavid Walend
97e1ab49b34Merge pull request #177 in SHRINE/shrine from feature/SHRINE-2535-webclient-qa2-node-with-the-latest to release/1.25....
David WalendDavid Walend
32d96ea03ddAdded TIMEDOUT status detection, and more specific exception contents for new statuses from the i2b2 CRC for SHRINE-2535
bendcarmenbendcarmen
12071a374a7Have not available message for every property on the stack details object if property does not exist
David WalendDavid Walend
2ca49d853a9Merge pull request #175 in SHRINE/shrine from bugfix/SHRINE-2645-4785900730699707794-shrine-scaleup-40 to release/1.2...
David WalendDavid Walend
901ac570415Removed irrelevant todo
David WalendDavid Walend
64d87da2c1fSend SHRINE's adapter database's best answer when communication fails with the CRC for SHRINE-2645
David WalendDavid Walend
0d16d6bb416Merge pull request #174 in SHRINE/shrine from feature/SHRINE-2592-change-default-timeout-adapter to release/1.25.3 *...
David WalendDavid Walend
516d9755dacChange default CRC timeout from 180 to 30 seconds. SHRINE-2592
David WalendDavid Walend
9044efdec9dMerge branch 'release/1.25.3' into feature/SHRINE-2592-change-default-timeout-adapter
bendcarmenbendcarmen
1d2d4da22b3Build of JS to incorporate Jira fixes
Ben CarmenBen Carmen
61e17e07d5aMerge pull request #173 in SHRINE/shrine from bugfix/SHRINE-2599-cell-status-message to release/1.25.3 * commit 'a84...
Ben CarmenBen Carmen
dcda6653906Merge pull request #172 in SHRINE/shrine from bugfix/SHRINE-2631-no-horizontal-scroll to release/1.25.3 * commit 'e1...
bendcarmenbendcarmen
a84d223bdedRemoved a slight variation on the same exact alert pop-up
bendcarmenbendcarmen
6ad3485a76dMoved readme file up a level as it pertains to more than just i2b2-src
bendcarmenbendcarmen
260cd0b973bPotential fix for SHRINE-2599
bendcarmenbendcarmen
17dca220c7aJS build with merged code reviews
Ben CarmenBen Carmen
5781381c085Merge pull request #171 in SHRINE/shrine from bugfix/SHRINE-2630-last-updated-margin to release/1.25.3 * commit '571...
bendcarmenbendcarmen
571b065edcaChanges per code review
bendcarmenbendcarmen
e163a02ad14Potential fix of unwanted scrollbar issue
marc-daniemarc-danie
e72f428e7d4SHRINE-2510- Webclient: An unanticipated problem encountered while running a query which takes a while to run - remov...
Ben CarmenBen Carmen
611c220d214Merge pull request #170 in SHRINE/shrine from bugfix/SHRINE-2632-remove-annoying-line to release/1.25.3 * commit 'ea...
bendcarmenbendcarmen
4dca3d5bf62Potential fix of SHRINE-2630
bendcarmenbendcarmen
ea08e1314b1Potential fix of SHRINE-2632
Marc-Danie NazaireMarc-Danie Nazaire
f6b280f6ba7Merge pull request #168 in SHRINE/shrine from bugfix/SHRINE-2591-update-values-for-context.xml to release/1.25.3 * c...
marc-daniemarc-danie
1571dbd671bSHRINE-2625 - Database tuning on QEP machines
marc-daniemarc-danie
77001ebc4faMerge branch 'release/1.25.3' of https://open.med.harvard.edu/stash/scm/shrine/shrine into bugfix/SHRINE-2510-webclie...
marc-daniemarc-danie
f789930ee1eSHRINE-2510- Webclient: An unanticipated problem encountered while running a query which takes a while to run
David WalendDavid Walend
3834507f145Updated pom.xml files to build SHRINE 1.25.3.3-SNAPSHOT
David WalendDavid Walend
b73af6a3985Missed a hornetq reference in the sample shrine.conf
David WalendDavid Walend
0d9ca75cc07Merge pull request #166 in SHRINE/shrine from bugfix/SHRINE-2624-keep-the-receiver-thread-alive to release/1.25.3 * ...
marc-daniemarc-danie
39695127fd5Merge branch 'release/1.25.3' of https://open.med.harvard.edu/stash/scm/shrine/shrine into bugfix/SHRINE-2591-update-...
marc-daniemarc-danie
63fd0e6e165SHRINE-2591 - Update values for context.xml - added an example context.xml with the updated values for maxTotal, maxI...
bendcarmenbendcarmen
6c9980bedb8Build of js ready for QA
Marc-Danie NazaireMarc-Danie Nazaire
c0179c48e5aMerge pull request #167 in SHRINE/shrine from bugfix/SHRINE-2626-remove-reference-to-local-file to release/1.25.3 * ...
David WalendDavid Walend
9410832bed5Marc-Danie found a typo
marc-daniemarc-danie
eeb46ccd66cSHRINE-2626 - Remove reference to local file path in JMeter automation script
David WalendDavid Walend
fcff187a38dIgnoring all but the worst exceptions while completing for SHRINE-2622
Ben CarmenBen Carmen
ceeefca632aMerge pull request #165 in SHRINE/shrine from bugfix/SHRINE-2606-missing-breakdowns to release/1.25.3 * commit '5454...
Ben CarmenBen Carmen
b2029946e01Merge pull request #164 in SHRINE/shrine from feature/SHRINE-2620-error-tooltip to release/1.25.3 * commit 'a1e95586...
bendcarmenbendcarmen
a1e95586db2Added a max length for tooltip of 40 characters
bendcarmenbendcarmen
31557999c82Saving changes
bendcarmenbendcarmen
2f606e1a24cRefactor of Sagas
bendcarmenbendcarmen
54546b73825Potential fix of SHRINE-2606
Ben CarmenBen Carmen
faa0398f237Merge pull request #161 in SHRINE/shrine from feature/SHRINE-2618-remove-junky-text to release/1.25.3 * commit 'f1c0...
bendcarmenbendcarmen
f1c040a4aefFix of merge conflict
Ben CarmenBen Carmen
ca075b43d00Merge pull request #162 in SHRINE/shrine from feature/SHRINE-2615-consistent-breakdowns-text to release/1.25.3 * com...
Ben CarmenBen Carmen
d58f838bd28Merge pull request #163 in SHRINE/shrine from bugfix/SHRINE-2617-default-query-status-text to release/1.25.3 * commi...
bendcarmenbendcarmen
d621e46f50bPotential solution for SHRINE-2620
bendcarmenbendcarmen
e068ba54b69Potential fix of SHRINE-2617
bendcarmenbendcarmen
52fc0e63db4Changed wording of tabs to Breakdowns
bendcarmenbendcarmen
4a85066a81bWorking on Saga organization
bendcarmenbendcarmen
51c801d8c30Potential Fix of SHRINE-2618
bendcarmenbendcarmen
e76240e77f4Refactor of Redux Saga for threadding
Marc-Danie NazaireMarc-Danie Nazaire
3a759ab469fMerge pull request #160 in SHRINE/shrine from bugfix/SHRINE-2595-modify-the-jmeter-network-check to release/1.25.3 *...
David WalendDavid Walend
37f4ec5647bMerge pull request #159 in SHRINE/shrine from bugfix/SHRINE-2611-trim-shrine-meta.log-file to release/1.25.3 * commi...
David WalendDavid Walend
c8f4c67207eMerge pull request #158 in SHRINE/shrine from bugfix/SHRINE-2604-out-of-memory-due-to-short-threads to release/1.25.3...
marc-daniemarc-danie
32842b8e543SHRINE-2600 - Modify JMeter network check automation code to not include the timestamp in the name of the jtl output ...
marc-daniemarc-danie
7b7b3e46eabSHRINE-2595 - Modify the JMeter network check automation bamboo to fail if a query does not make it pass QEP
Marc-Danie NazaireMarc-Danie Nazaire
b41f216b901Merge pull request #157 in SHRINE/shrine from bugfix/SHRINE-2480-catch-and-log-exceptions-at-startup to release/1.25....
marc-daniemarc-danie
6fd2b542ca8SHRINE-2480 - Catch and log exceptions at startup in shrine.log - added () to the initResources method