 David Walend | 8277234ce03 | Merge pull request #212 in SHRINE/shrine from feature/SHRINE-2760-remove-rotted-json-support-from to develop
* commi... | | |
David Walend | 5754f957c20 | Removed the lift json library for SHRINE-2760 and SHRINE-1860 | | |
 Ben Carmen | 0a79a4d63f6 | Merge pull request #208 in SHRINE/shrine from task/SHRINE-2751-port-retrofitter to develop
* commit 'd4c69e54a964759... | | |
David Walend | 45245c7cba6 | Removed traits and imports for SHRINE-2760 | | |
 bendcarmen | d4c69e54a96 | renamed image files per code review | | |
David Walend | ddf392d964a | Removed the actual methods behind JsonUnmarshaller for SHRINE-2760 | | |
David Walend | d8632987e1d | Removed the actual methods behind JsonMarshaller for SHRINE-2760 | | |
David Walend | bf1f5e9263f | Merging from the release to develop | | |
bendcarmen | f481b280c0a | Incorporated code review changes | | |
David Walend | 464acf3b49e | Merge pull request #209 in SHRINE/shrine from feature/SHRINE-1042-split-the-config-subproject-into to develop
* comm... | | |
 marc-danie | 0734340cf89 | SHRINE-2763 - Modified Mock CRC to simulate QUEUED TO ERROR with no status message | | |
 Ansible Deploy | 73f4bc8e64c | Merge release branch release/1.25.4 into master. | | |
Ansible Deploy | 28afcbfc1b0 | Update POMs with release version 1.25.4. | | |
 Simon Chang | 968cdb8f0a7 | Bump versions to 1.25.4-SNAPSHOT. (ITEAM-2299) | | |
David Walend | 76c4dab14a6 | Merge pull request #210 in SHRINE/shrine from feature/SHRINE-2741-characterize-and-trim-down-the to develop
* commit... | | |
bendcarmen | 7fae3886103 | Updated bower to 1.8.4 | | |
David Walend | 92de6bc88a2 | Down to 16 warnings for SHRINE-2741 | | |
David Walend | 53aaf54a807 | Restored some tests for SHRINE-1042 | | |
David Walend | 07b46e40e82 | Through all the shrine-app tests for SHRINE-1042 | | |
David Walend | e6de3054824 | Through the first shrine-app test for SHRINE-1042 | | |
David Walend | e0a7a371f67 | More for SHRINE-1042, getting close | | |
David Walend | d0b4b377f10 | About to delete the config subproject for SHRINE-1042 | | |
bendcarmen | f03cf70a82f | Some code tweaks | | |
David Walend | df3061311bb | Deleted Keys for SHRINE-1042 | | |
David Walend | 023457b5e2d | Stray bits to move the mapping config into the adapter code for SHRINE-1042 | | |
David Walend | 4cbc3fe0e04 | Progress toward dissolving the config subproject for SHRINE-1042 | | |
bendcarmen | 6643c37b61d | Edit of readme | | |
bendcarmen | 805c265eb11 | Edit of readme | | |
bendcarmen | bd7dc4ce709 | Removed legacy webclient dir | | |
bendcarmen | 5bbad54ea62 | Merge branch 'develop' into task/SHRINE-2751-port-retrofitter | | |
bendcarmen | b94c182e22c | Commit of new project structure for webclient | | |
bendcarmen | 1b2a09c1d95 | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop | | |
bendcarmen | 2af87a57d74 | Update of Bower to most recent version 1.8.4 | | |
bendcarmen | 90bc413d8a5 | Saving most recent | | |
bendcarmen | 760b1aa52a8 | Webclient bootrap and render of tabs | | |
Ben Carmen | de066fef272 | Merge pull request #207 in SHRINE/shrine from bugfix/SHRINE-2609-readquerydefinitionrequest-s to develop
* commit '7... | | |
David Walend | 5123663b917 | Merge pull request #206 in SHRINE/shrine from bugfix/SHRINE-2511-webclient-application-should to develop
* commit '3... | | |
 marc-danie | 39cf960e141 | SHRINE-2511 - Webclient: Application should say 'CRC could not find the results for queued query' instead of 'No resu... | | |
David Walend | 71648828301 | Tidying up for SHRINE-2609 | | |
David Walend | 2373d2f9e70 | Switched to a for comprehension for SHRINE-2609 | | |
David Walend | a49d5e2a474 | Maybe got things working without touching the adapter for query definitions for SHRINE-2609 | | |
marc-danie | e890290bebb | SHRINE-2511- Webclient: Application should say 'CRC could not find the results for queued query' instead of 'No resul... | | |
bendcarmen | 57314735487 | Shrine Bootstrapping to enable React | | |
 Marc-Danie Nazaire | 1be9b56620f | Merge pull request #205 in SHRINE/shrine from bugfix/SHRINE-1718-get-rid-of-happy to develop
* commit 'de21b403ad822... | | |
marc-danie | de21b403ad8 | SHRINE-1718 - Get rid of Happy - removed stray character | | |
marc-danie | f62c6b431a4 | SHRINE-1718 - Get rid of Happy - removed test for /admin/messWithHappyVersion endpoint | | |
marc-danie | 729dd1d5f57 | SHRINE-1718 - Get rid of Happy - modified the default VAGRANT_CONTEXT location | | |
marc-danie | 28842ed3345 | SHRINE-1718 - Get rid of Happy - removed the happy test xml files | | |
bendcarmen | 3a73f37af4d | Saving latest changes | | |
marc-danie | c1777069297 | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into bugfix/SHRINE-1718-get-rid-of-happy | | |
marc-danie | 656cacb66fe | SHRINE-1718- Get rid of Happy | | |
bendcarmen | 17094c238d8 | Working Sagas in Webclient tested on dev2 | | |
David Walend | 2a43da70c73 | Merge pull request #204 in SHRINE/shrine from feature/SHRINE-2733-remove-obsolete-tools to develop
* commit 'aaaeadc... | | |
David Walend | 7e4e1d48a79 | Added -feature flag for scala compiles to SHRINE-2738 | | |
David Walend | aaaeadc82ad | Weird lingering dependencies for SHRINE-2733 | | |
David Walend | 9d18a66a777 | Removed most of the tools subproject for SHRINE-2733 | | |
bendcarmen | b50d2daecff | Merge branch 'develop' into feature/js-infrastructure | | |
Ben Carmen | a8fc1458e92 | Merge pull request #203 in SHRINE/shrine from bugfix/SHRINE-2703 to develop
* commit '909acd4381fb1b9fb90fd166382076... | | |
bendcarmen | 909acd4381f | Incorporated suggestions from code review | | |
David Walend | 34d8bd0dad5 | reverting the scala maven plugin version to 3.2.2 due to problems on the build server | | |
David Walend | 2cd33120832 | Merge pull request #202 in SHRINE/shrine from bugfix/SHRINE-2728-easy-library-upgrades-for-1.26 to develop
* commit ... | | |
bendcarmen | ae3525c18af | Potential fix of the Number of terms exceeded pop up issue | | |
David Walend | a44933b11ef | Renamed a subproject | | |
Ben Carmen | 6c3846a062a | Merge pull request #199 in SHRINE/shrine from bugfix/SHRINE-2722-remove-shouldQuerySelf to develop
* commit 'c6c9b17... | | |
bendcarmen | c6c9b173ec9 | Merge into develop | | |
David Walend | 97b4d00cc3b | Merge branch 'develop' into bugfix/SHRINE-2728-easy-library-upgrades-for-1.26 | | |
David Walend | e1e58220fc9 | The rest of the easy library upgrades for SHRINE-2728 | | |
David Walend | 207872415da | Merge pull request #197 in SHRINE/shrine from bugfix/SHRINE-1661-remove-the-lockout-feature-in to develop
* commit '... | | |
David Walend | b63e20e8212 | Somehow hms-support crept back in | | |
David Walend | 45f467feb5d | A little cleanup from the merge for SHRINE-1661 | | |
David Walend | 8c9b37c586c | Upgraded scala-maven-plugin, squeryl, typesafe-config, and h2 for SHRINE-2728 | | |
David Walend | c5c959d1056 | Merge pull request #201 in SHRINE/shrine from feature/SHRINE-2062-remove-special-code-for-hms-support to develop
* c... | | |
Ben Carmen | dbf86674fec | Merge pull request #200 in SHRINE/shrine from bugfix/SHRINE-2721-remove-lockout to develop
* commit '45a53ff177173c6... | | |
David Walend | 363d6f5103c | A few last hms refereces cleared up for SHRINE-2062 | | |
David Walend | c8d89f8e66d | Merging | | |
David Walend | 4fd6ea9b34f | Removed scanner tool (which had lots of HMS dependencies) for SHRINE-2725, and bumped pom.xml files to ease the merge | | |
David Walend | 788684d0f50 | Merge pull request #198 in SHRINE/shrine from bugfix/SHRINE-1430-replace-shouldqueryself-with to develop
* commit '6... | | |
bendcarmen | ee43310c565 | Fix the build! | | |
bendcarmen | 1cee7d60a10 | attempt to fix broken build | | |
bendcarmen | 45a53ff1771 | Potential fix of SHRINE-2721 | | |
bendcarmen | dc82ab5d570 | Potential fix of SHRINE-2722 removing shouldQuerySelf references | | |
bendcarmen | 81e7f261074 | Merge of 1.25.3 | | |
bendcarmen | 4c411d0e0df | Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop | | |
bendcarmen | 409a8c139ec | Bump of pom to 1.25.3.7-SNAPSHOT | | |
David Walend | 663f81809e4 | Marc-Danie found another shouldQuerySelf down in some test code for SHRINE-1430 | | |
David Walend | fa39aa339c9 | Removed HMS-ecommons-specific identity code for SHRINE-2062 | | |
David Walend | 831d336d00a | Removed shouldQuerySelf references for SHRINE-1430 | | |
David Walend | 455fd197ca5 | More tailings from SHRINE-1661 | | |
David Walend | b94026af7b6 | Last vestiges of lockout for SHRINE-1661 | | |
David Walend | 920960937ee | First pass of getting rid of all things lockout for SHRINE-1661 | | |
David Walend | f18e4dc95e7 | Merged changes from release/1.25.3 | | |
David Walend | a64c5071350 | Merge branch 'release/1.25.3' into develop | | |
David Walend | 620e93bce71 | Getting ready to merge the 1.25 release branch - messing with pom.xmls to make the merge easier | | |
David Walend | e399b968081 | Merge pull request #196 in SHRINE/shrine from bugfix/SHRINE-2719-webclient-query-status-completed to release/1.25.3
... | | |
David Walend | 8245b682e38 | MS SQL Server schema fixes for SHRINE-2719 | | |
David Walend | 84f8bb95af3 | Merge pull request #195 in SHRINE/shrine from bugfix/SHRINE-2592-change-default-timeout-again to release/1.25.3
* co... | | |
David Walend | 2af80541142 | Ben says this is the right file with the CRC timeout to change to make it stay forever for SHRINE-2592 | | |
David Walend | 2a296e85962 | Yet another attempt to change the CRC timeout from 180 to 30 seconds for SHRINE-2592 | | |
marc-danie | 5464078da6d | Updated POMs to version 1.25.3.6-SNAPSHOT | | |
Marc-Danie Nazaire | 99cbe38c7bb | Merge pull request #194 in SHRINE/shrine from bugfix/SHRINE-2718-donebuthasnoresultsforqueuedqueryexception to releas... | | |
marc-danie | 412eb8b6a16 | SHRINE-2718 - DoneButHasNoResultsForQueuedQueryException is not being propagated through | | |
David Walend | 894006415cb | Merge pull request #193 in SHRINE/shrine from bugfix/SHRINE-2715-status-column-is-too-short-for to release/1.25.3
* ... | | |
David Walend | 4308b65dac3 | Schema fixes to remove the constraint in QUERY_RESULT for SHRINE-2715 | | |
David Walend | 27328818d40 | Merge pull request #191 in SHRINE/shrine from bugfix/SHRINE-2708-for-some-reason-the-dashboard to release/1.25.3
* c... | | |
David Walend | 140f237009a | Merge pull request #192 in SHRINE/shrine from bugfix/SHRINE-2709-shrine-qa1-is-not-using-the-right to release/1.25.3
... | | |
Ansible Deploy | b8b4e25e081 | Merge release branch release/1.25.3.3 into master. | | |
Ansible Deploy | afba6115925 | Update POMs with release version 1.25.3.3. | | |
David Walend | d847e53c0b5 | Patch fix for Squiryl using the wrong sequence name in Oracle SHRINE-2709 | | |
David Walend | e480e57684a | Moved pom.xml files to 1.25.3.5-SNAPSHOT | | |
bendcarmen | b894bbbc7ed | Merge branch 'release/1.25.3' into develop | | |
bendcarmen | 73268f4168c | Saving work | | |
David Walend | e75ffaf13bb | Just when I think I understand Oracle it decides it likes everything in double quotes. SHRINE-2708 | | |
Marc-Danie Nazaire | 26257a04757 | Merge pull request #190 in SHRINE/shrine from feature/SHRINE-2439-add-urls-to-shrine-meta-with to release/1.25.3
* c... | | |
bendcarmen | e2c0dda39b7 | Merge branch 'develop' into feature/js-infrastructure | | |
bendcarmen | 55a96c2d29e | Mere of release/1.25.3 | | |
bendcarmen | 56a90f5fab1 | Quick Build to make sure latest is out there | | |
marc-danie | 57e83b2c1ff | SHRINE-2439 - Add urls to shrine-meta with diagnostic information to help Sam debug remotely - minor naming edits | | |
bendcarmen | f6616d773eb | Added updated shrine-client-guide.pdf for 1.25 | | |
marc-danie | 9ff97e5c418 | SHRINE-2439 - Add urls to shrine-meta with diagnostic information to help Sam debug remotely | | |
David Walend | f417ebdb0b0 | Merging from release/1.25.3 pom.xml update | | |
marc-danie | f56d71b8ce6 | Merge branch 'release/1.25.3' of https://open.med.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE-2439-add-ur... | | |
marc-danie | 276125f80da | SHRINE-2670 - Make the term configurable in the JMeter automation script | | |
David Walend | fb663c0e9d3 | Merge pull request #187 in SHRINE/shrine from bugfix/SHRINE-2666-webclient-query-not-found-message to release/1.25.3
... | | |
David Walend | 4a050eb2485 | Merge pull request #188 in SHRINE/shrine from bugfix/SHRINE-2651-webclient-an-unanticipated-problem to release/1.25.3... | | |
David Walend | 85a4c21af5d | Typo for SHRINE-2666 | | |
David Walend | fa1ffa580e8 | Detection of new i2b2 CRC status types for SHRINE-2561 | | |
David Walend | f173f1c056b | Marc-Danie suggested breaking up the logic a bit for SHRINE-2666 | | |
bendcarmen | 7fa195335a1 | Checking in bundle of Webclient with fixes from reviews | | |
Ben Carmen | c374ab0a331 | Merge pull request #181 in SHRINE/shrine from bugfix/SHRINE-2602-error-details-still-collapsing to release/1.25.3
* ... | | |
bendcarmen | 6ba91dc41c5 | Finalized wording of default message in case there is no problemDigest element | | |
David Walend | 037eecf47c8 | Nasty, hacky fix for SHRINE-2666 - control via exception | | |
bendcarmen | 0f49f765b33 | Merge branch 'bugfix/SHRINE-2523-default-error-msg' into bugfix/SHRINE-2602-error-details-still-collapsing | | |
bendcarmen | 8030e8c59f6 | Going to merge this in with SHRINE-2602 | | |
Ben Carmen | afb93ed5bdd | Merge pull request #186 in SHRINE/shrine from bugfix/SHRINE-2701-breakdown-pending-wording-fix to release/1.25.3
* c... | | |
David Walend | a87623ee4cf | Merge pull request #185 in SHRINE/shrine from feature/SHRINE-1970-auto-increment-for-older-oracle to release/1.25.3
... | | |
bendcarmen | 2f03fe7c0e9 | Fix of wording on pending previous query when Graphs tab is selected | | |
Ben Carmen | 06ad2c00ab8 | Merge pull request #184 in SHRINE/shrine from SHRINE-2661/-csv-export-extra-rows to release/1.25.3
* commit '4f464ce... | | |
Marc-Danie Nazaire | 41f89137299 | Merge pull request #183 in SHRINE/shrine from bugfix/SHRINE-2670-make-the-term-configurable-in to release/1.25.3
* c... | | |
David Walend | 8b94009fff5 | Cleanup for SHRINE-2671 | | |
bendcarmen | 4f464ce7712 | Merge branch 'release/1.25.3' into SHRINE-2661/-csv-export-extra-rows | | |
bendcarmen | dd7f3f81aac | Potential fix of SHRINE-2661 | | |
Ben Carmen | abbc8aec9c2 | Merge pull request #176 in SHRINE/shrine from bugfix/SHRINE-2523-default-error-msg to release/1.25.3
* commit '12071... | | |
Ben Carmen | 0de3d267a56 | Merge pull request #182 in SHRINE/shrine from bugfix/SHRINE-2657-error-detail-labels to release/1.25.3
* commit 'bef... | | |
David Walend | 67a90d8f00e | Full schema for SHRINE-2671 | | |
David Walend | d83ad2fe5f0 | Cleanup for SHRINE-1970 | | |
David Walend | 1854e4cb57f | Match sequnece names to hard-coded squiryl values in table definitions for SHRINE-1970 | | |
David Walend | 99e5c5359db | Match sequnece names to hard-coded squiryl values in table definitions for SHRINE-1970 | | |
marc-danie | c12446ba78c | SHRINE-2670 - Make the term configurable in the JMeter automation script | | |
David Walend | 6dfe5883fb4 | Schemas that don't cause Oracle errors for SHRINE-1970 | | |
David Walend | 0a125fd2d03 | Fix for SHRINE-2663 - OK to have a null TIME_ELAPSED | | |
bendcarmen | befcfa16536 | Fix of labeling for error pop-up | | |
bendcarmen | f12b3dc0f1c | Polling Sagas | | |
David Walend | 3d7723626a3 | Merge branch 'release/1.25.3' into feature/SHRINE-1970-auto-increment-for-older-oracle | | |
David Walend | dc5e236d488 | Move the release branch to 1.25.3.4-SNAPSHOT | | |
Ben Carmen | 41a6d7fe220 | Merge pull request #180 in SHRINE/shrine from bugfix/SHRINE-2654-node-name-overflow to release/1.25.3
* commit '3013... | | |
bendcarmen | 75263b1ed30 | Potential fix of empty details tag SHRINE-2602 | | |
bendcarmen | 3013380ed8a | Potential fix of SHRINE-2654 long node name format | | |
Marc-Danie Nazaire | 458a4c7ba31 | Merge pull request #169 in SHRINE/shrine from bugfix/SHRINE-2510-webclient-an-unanticipated-problem to release/1.25.3... | | |
bendcarmen | 4d25f48bc68 | Saving work | | |
marc-danie | 66f448272cf | SHRINE-2510 - Webclient: An unanticipated problem encountered while running a query which takes a while to run - upda... | | |
David Walend | 578b396a90c | Merge branch 'release/1.25.3' into feature/SHRINE-1970-auto-increment-for-older-oracle | | |
marc-danie | 0097176397c | SHRINE-2510 - Webclient: An unanticipated problem encountered while running a query which takes a while to run - unco... | | |
David Walend | 5ee7f685dee | Merge pull request #178 in SHRINE/shrine from bugfix/SHRINE-2636-webclient-requested-breakdowns to release/1.25.3
* ... | | |
marc-danie | 4cf866f7df8 | SHRINE-2510 - Webclient: An unanticipated problem encountered while running a query which takes a while to run - code... | | |
Marc-Danie Nazaire | 2472aa5a8ac | Merge pull request #179 in SHRINE/shrine from bugfix/SHRINE-2582-expose-the-username-password to release/1.25.3
* co... | | |
bendcarmen | 0a49e7ff954 | Saving latest | | |
marc-danie | 98111b55a46 | SHRINE-2582 - Expose the username, password, and domain in the JMeter automation script - added additional authentica... | | |
David Walend | cd95918eca7 | Added more selection criteria to get all of the most recent breakdown results for SHRINE-2636 | | |
David Walend | 97e1ab49b34 | Merge pull request #177 in SHRINE/shrine from feature/SHRINE-2535-webclient-qa2-node-with-the-latest to release/1.25.... | | |
David Walend | 32d96ea03dd | Added TIMEDOUT status detection, and more specific exception contents for new statuses from the i2b2 CRC for SHRINE-2535 | | |
bendcarmen | 12071a374a7 | Have not available message for every property on the stack details object if property does not exist | | |
David Walend | 2ca49d853a9 | Merge pull request #175 in SHRINE/shrine from bugfix/SHRINE-2645-4785900730699707794-shrine-scaleup-40 to release/1.2... | | |
David Walend | 901ac570415 | Removed irrelevant todo | | |
David Walend | 64d87da2c1f | Send SHRINE's adapter database's best answer when communication fails with the CRC for SHRINE-2645 | | |
David Walend | 0d16d6bb416 | Merge pull request #174 in SHRINE/shrine from feature/SHRINE-2592-change-default-timeout-adapter to release/1.25.3
*... | | |
David Walend | 516d9755dac | Change default CRC timeout from 180 to 30 seconds. SHRINE-2592 | | |
David Walend | 9044efdec9d | Merge branch 'release/1.25.3' into feature/SHRINE-2592-change-default-timeout-adapter | | |
bendcarmen | 1d2d4da22b3 | Build of JS to incorporate Jira fixes | | |
Ben Carmen | 61e17e07d5a | Merge pull request #173 in SHRINE/shrine from bugfix/SHRINE-2599-cell-status-message to release/1.25.3
* commit 'a84... | | |
Ben Carmen | dcda6653906 | Merge pull request #172 in SHRINE/shrine from bugfix/SHRINE-2631-no-horizontal-scroll to release/1.25.3
* commit 'e1... | | |
bendcarmen | a84d223bded | Removed a slight variation on the same exact alert pop-up | | |
bendcarmen | 6ad3485a76d | Moved readme file up a level as it pertains to more than just i2b2-src | | |
bendcarmen | 260cd0b973b | Potential fix for SHRINE-2599 | | |
bendcarmen | 17dca220c7a | JS build with merged code reviews | | |
Ben Carmen | 5781381c085 | Merge pull request #171 in SHRINE/shrine from bugfix/SHRINE-2630-last-updated-margin to release/1.25.3
* commit '571... | | |
bendcarmen | 571b065edca | Changes per code review | | |
bendcarmen | e163a02ad14 | Potential fix of unwanted scrollbar issue | | |
marc-danie | e72f428e7d4 | SHRINE-2510- Webclient: An unanticipated problem encountered while running a query which takes a while to run - remov... | | |
| Next → |
