SHRINE
  1. SHRINE

shrine

Public
  1. SHRINE
  2. shrine

All Branches Graph  

        
AuthorCommitMessageCommit dateBuilds
marc-daniemarc-danie
671b5f4aa5dSHRINE-2572- Code for checking network health using JMeter Maven plugin - added comment about the SSL redirect host
David WalendDavid Walend
5df8b45360dA little test code to support SHRINE-2566
Marc-Danie NazaireMarc-Danie Nazaire
d484fed462fMerge pull request #136 in SHRINE/shrine from bugfix/SHRINE-2573-modify-mock-crc-to-work-with to develop * commit 'c...
marc-daniemarc-danie
efbf7bb1c87SHRINE-2572- Code for checking network health using JMeter Maven plugin
marc-daniemarc-danie
c8dba40de06SHRINE-2573 - Modify Mock CRC To work with or without trailing slash
bendcarmenbendcarmen
12760d96344A default error message if statusMessage is undefined.
Ben CarmenBen Carmen
1f2feeecbcfMerge pull request #135 in SHRINE/shrine from SHRINE-SHRINE-2551-make-queued-green to develop I moved the queued-sta...
bendcarmenbendcarmen
41de01f9731Moved shared, queued status to query-status.scss
bendcarmenbendcarmen
598e7630062Potential fix of GREEN queued status
bendcarmenbendcarmen
24d26dff400Saving Tab and Container progress
marc-daniemarc-danie
99c73ea887eSHRINE-2569- Add delay to the Mock CRC - modified to use fold()() instead of match
David WalendDavid Walend
52fc8221b33Merge pull request #132 in SHRINE/shrine from bugfix/SHRINE-2562-catch-this-timeout-and-maybe to develop * commit 'b...
marc-daniemarc-danie
715a3776c80SHRINE-2569- Add delay to the Mock CRC - variable renaming and removed triple quotes
David WalendDavid Walend
0ebeed2c957Merge pull request #133 in SHRINE/shrine from bugfix/SHRINE-2566-enable-the-web-client-to-retry to develop * commit ...
bendcarmenbendcarmen
776f7458954merge of developer
marc-daniemarc-danie
f3a13b69907SHRINE-2569- Add delay to the Mock CRC
bendcarmenbendcarmen
4f83c704a8bIncorporated feedback from meeting
David WalendDavid Walend
b9c5d600f2fSome logging for SHRINE-2562
David WalendDavid Walend
065e8f47741Added a special timeout handler for SHRINE-2566
David WalendDavid Walend
76293f95a33Trapping a timeout exception that bubbles all the way to catalina.out for SHRINE-2562
Marc-Danie NazaireMarc-Danie Nazaire
140cbdd1136Merge pull request #131 in SHRINE/shrine from bugfix/SHRINE-2554-upgrade-to-scala-2.11.12 to develop * commit '34d66...
marc-daniemarc-danie
34d660d848aSHRINE-2554 - Upgrade to Scala 2.11.12
David WalendDavid Walend
9c6eba329e7Merge pull request #130 in SHRINE/shrine from feature/SHRINE-2552-create-a-http-client-server-bridge to develop * co...
David WalendDavid Walend
bf1f57cd65bMarc-Danie found a cut-paste problem during review of SRHINE-2552
David WalendDavid Walend
d737ed25633Create just one httpClient for SHRINE-2552
David WalendDavid Walend
8e19d35a232Merge branch 'develop' into feature/SHRINE-2552-create-a-http-client-server-bridge
David WalendDavid Walend
1174602596cJose's suggestion for getting the whole body for SHRINE-2552
David WalendDavid Walend
c8ee473da0cBetter command line parameters and response for SHRINE-2552
David WalendDavid Walend
c4f6db74bbdSome code cleanup for SHRINE-2552
David WalendDavid Walend
96d30a5fbb7Testing vs. real systems for SHRINE-2552
David WalendDavid Walend
49f65567b21Merge pull request #129 in SHRINE/shrine from feature/SHRINE-2452-upgrade-to-akka-2.5.8-if-possible to develop * com...
bendcarmenbendcarmen
911585e79fdIncorporated suggestions from team
Ben CarmenBen Carmen
eb1eeddd709Merge pull request #128 in SHRINE/shrine from feature/tabs-enhancements to develop * commit '4a2579dfb1e7982d32f2ae8...
David WalendDavid Walend
61fdd872edcBuilding up what looks like the right request for SHRINE-2552
David WalendDavid Walend
63dd82a1c85Now seeing a request for SHRINE-2552
David WalendDavid Walend
96bce203d94Hello world works
David WalendDavid Walend
3383ad4a22eCompiles
David WalendDavid Walend
731a54838a5Copied http4s-client-test as the starting point for SHRINE-2552
David WalendDavid Walend
822f699d88fWrong directory to copy
David WalendDavid Walend
2f9447a4889Copied http4s-client-test as the starting point for SHRINE-2552
David WalendDavid Walend
70462a35bc1Merge branch 'develop' into feature/SHRINE-2452-upgrade-to-akka-2.5.8-if-possible
David WalendDavid Walend
65af439199fComment cleanup for SHRINE-2532
David WalendDavid Walend
f9ec3634a58Some cleanup with the new web client for SHRINE-2532
Marc-Danie NazaireMarc-Danie Nazaire
78b41c70fe1Merge pull request #127 in SHRINE/shrine from SHRINE-2534-scaleup-testing-create-mock-crc to develop * commit '4c63d...
David WalendDavid Walend
ebc4d4074daNow using the timeout for SHRINE-2532
David WalendDavid Walend
b48bfc23f0cNow handling java.net.ConnectException, which is different from ConnectionException, for SHRINE-2532
marc-daniemarc-danie
4c63d05f926SHRINE-2534- Scaleup testing: Create Mock CRC - more cleaning up of imports
marc-daniemarc-danie
ef94127ec51SHRINE-2534- Scaleup testing: Create Mock CRC - cleaned up imports
marc-daniemarc-danie
39c1381702bupdated version from 0.18.3 to 0.18.4
marc-daniemarc-danie
b4806812700SHRINE-2534- Scaleup testing: Create Mock CRC - added case to catch any invalid requests and use of triple quotes
marc-daniemarc-danie
cb851175ebfSHRINE-2534- Scaleup testing: Create Mock CRC - removed implicit scheduler since code compiles without it
marc-daniemarc-danie
fce758935caSHRINE-2534- Scaleup testing: Create Mock CRC - removed unnecessary empty ()
David WalendDavid Walend
2334fb7daa1Added support for usernames and passwords for SHRINE-2532
David WalendDavid Walend
71a4af9a831todo cleanup for SHRINE-2532
David WalendDavid Walend
879f1d7a7d2Now down to just my one allowed unsafe call for SHRINE-2532
marc-daniemarc-danie
98f63d48563SHRINE-2534- Scaleup testing: Create Mock CRC - removed wildcard from the imports in Bootstrap and unused dependencie...
David WalendDavid Walend
e0b1ce50212Now sending and receiving messages for SHRINE-2532
David WalendDavid Walend
8a9aabe0dc7Able to read responses back for SHRINE-2532
David WalendDavid Walend
eb7a6169821Checkpointing progress before diving back in
bendcarmenbendcarmen
4a2579dfb1elatest changes
marc-daniemarc-danie
a35d1208e66SHRINE-2534- Scaleup testing: Create Mock CRC - moved to apps directory and add missing web.xml file
marc-daniemarc-danie
496b6654c73SHRINE-2534- Scaleup testing: Create Mock CRC - renamed for naming consistency
marc-daniemarc-danie
8fa617eee84SHRINE-2534- Scaleup testing: Create Mock CRC - changed name of service
marc-daniemarc-danie
72d2f2188ebSHRINE-2534- Scaleup testing: Create Mock CRC - Change from request from GET to POST
bendcarmenbendcarmen
ccdbc85d155Added test automation to the dev environment
bendcarmenbendcarmen
47fb802bad4Saved latest
bendcarmenbendcarmen
8d735cb6dabMerged latest verison of develop
bendcarmenbendcarmen
344eb4cfa07Added Behavior and Snapshot tests to components
bendcarmenbendcarmen
4d737b69142Merged latsest from develop
bendcarmenbendcarmen
631bbb47c87Added React-Redux
bendcarmenbendcarmen
d0d62700ff6Saving work
David WalendDavid Walend
ce6619b4d2bStitched in the new http client for SHRINE-2532
David WalendDavid Walend
c06c01e9589Http4sHttpClient compiles for SHRINE-2532
bendcarmenbendcarmen
991e00f2439Merge of changes from release/1.25.2
David WalendDavid Walend
72d20cfdf22Merge branch 'develop' into feature/SHRINE-2452-upgrade-to-akka-2.5.8-if-possible
David WalendDavid Walend
d1bc7695e1dMerged with release/1.25.2 and updated pom.xmls
David WalendDavid Walend
7b4ab713eacMerge branch 'release/1.25.2' into develop
bendcarmenbendcarmen
c66c45d1eafBuild of js after completed review...should include fix for SHRINE-2458
Ben CarmenBen Carmen
c379225fd72Merge pull request #126 in SHRINE/shrine from bugfix/SHRINE-2548-disappearing-breakdowns to release/1.25.2 * commit ...
marc-daniemarc-danie
56cf59e6d1fMerge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into SHRINE-2534-scaleup-testing-creat...
marc-daniemarc-danie
502f0bece1eSHRINE-2534- Scaleup testing: Create Mock CRC
David WalendDavid Walend
2fc61d0397cMoved pom.xml s to version 1.25.2.3-SNAPSHOT
David WalendDavid Walend
6e63ea0f54eNow with a controlled path for the proxy host and port to try at UCSD
bendcarmenbendcarmen
a4b688e75a8Saving work
bendcarmenbendcarmen
eedbbee843bRebuild of JS to get rid of weird corrupted style
bendcarmenbendcarmen
cbea277d88dsaving work
bendcarmenbendcarmen
c22d3c189a9Potential fix of SHRINE-2458
bendcarmenbendcarmen
ee71dd11540Reversion of unreviewed fix
bendcarmenbendcarmen
fb2a52150dcsaving work
bendcarmenbendcarmen
1ee96cd1962Updated linting to AirBNB
David WalendDavid Walend
cd0658b9cacTrimmed the size of the .zip file by about half for SHRINE-2457
David WalendDavid Walend
8487524168fFirst draft of SHRINE-2547 - to test the http4s client at UCSD
bendcarmenbendcarmen
abea31f5285Update of POMs
bendcarmenbendcarmen
3f2de794687Merge of release/1.25.2
bendcarmenbendcarmen
126952ddfd1JS bundle of reviewed code
Ben CarmenBen Carmen
edf8549854aMerge pull request #125 in SHRINE/shrine from bugfix/SHRINE-2544-tabs-state-sync to release/1.25.2 * commit '5ce76ab...
bendcarmenbendcarmen
6a38672ff19Added Standard Linter
bendcarmenbendcarmen
5ce76abe62cPotential fix for SHRINE-2544
bendcarmenbendcarmen
16415a79498Preemtive spot check
David WalendDavid Walend
5d5db39afedMerge branch 'develop' into feature/SHRINE-2452-upgrade-to-akka-2.5.8-if-possible
bendcarmenbendcarmen
d7cf115e032Added some notes about ESLINT, saving work before switching branches
bendcarmenbendcarmen
5d29745be4fQuick addition to readme
bendcarmenbendcarmen
6438416fca0Ignore build artifacts...ephasize buidling through server integration
bendcarmenbendcarmen
35cecf89b2dAdded testing infrastructure for TDD and BDD
bendcarmenbendcarmen
ca6c243b04eWorking retrofitter
bendcarmenbendcarmen
b18cb53cba9saving dev mode build
bendcarmenbendcarmen
45ab4832038Fix of corrupted CSS causeing issue for SHRINE-2541 - no code change, just a re-compile
bendcarmenbendcarmen
1d78bc984cfupdated POMs to 1.25.2.2-SNAPSHOT
bendcarmenbendcarmen
35693da36efMake sure bundle is built
bendcarmenbendcarmen
d6aa14dee6fRoll back POMs to 1.25.2.1-SNAPSHOT to allow deploy to QA
bendcarmenbendcarmen
629c55ac712Build of latest js bundle
bendcarmenbendcarmen
eadaf2e5e05Merged in changes to fix tabs and graphing
bendcarmenbendcarmen
ab1478771b5Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
bendcarmenbendcarmen
cbffc9b6c12Potential fix of graphing
bendcarmenbendcarmen
e895a8307e5Potential fix of erratic UI behavior in new tabs feature
David WalendDavid Walend
f299fa06a0cVersions back to 1.25.3.1-SNAPSHOT
bendcarmenbendcarmen
f383be45f24Created a js bundle
David WalendDavid Walend
2cb3004c78cMerge branch 'develop' into release/1.25.2
bendcarmenbendcarmen
80792606accCommitting Build of .js files
David WalendDavid Walend
47fbac7de1bMoving develop back to 1.25.2.1-SNAPSHOT to pick up a fix from Ben
David WalendDavid Walend
2c554febfe3Changed pom.xml versions to 1.25.2.2-SNAPSHOT for QA fixes
David WalendDavid Walend
7c3347b7febMoved develop branch of SHRINE to 1.25.3.1-SNAPSHOT
David WalendDavid Walend
c777d7cdfbaBetter syntax for the request header, thanks to http4s gitter.
David WalendDavid Walend
a971122d31fBetter syntax for the request header, thanks to http4s gitter.
Ben CarmenBen Carmen
cb71f5bb121Merge pull request #124 in SHRINE/shrine from feature/add-graphing-tab to develop * commit '72bd715b3634e2e64342f27d...
bendcarmenbendcarmen
72bd715b363per code review, added more descriptive names.
bendcarmenbendcarmen
866d639cf22quick update...moved an if up a line.
bendcarmenbendcarmen
8ff5364b9fdPer code review, fixed a duplicate line of code, changed wording on an error message and refactored confusing return ...
bendcarmenbendcarmen
fa4384b9495Per code review, added some extra defensive checks.
bendcarmenbendcarmen
39a3207ab00Per code review, removved commented out template tag.
bendcarmenbendcarmen
63f67cf27fdAdded References to JIRA tickets for removing IFrame and related cleanup of redundant constants and state
bendcarmenbendcarmen
a71f4dc1711Full feature set of Shrine Webclient with Tabs for review
David WalendDavid Walend
03d5f3c58fdLurching toward using the http4s web client for SHRINE-2532
bendcarmenbendcarmen
2436861d90eSaving work managing views
bendcarmenbendcarmen
fd4ec711f0cSaving the changes to move things into a container that controls that app state
bendcarmenbendcarmen
ee899db9374Merge of some UI changes that did not make it into develop
David WalendDavid Walend
ae5acfd12e7Added the http4s library and renamed the class I'm about to replace for SHRINE-2532
David WalendDavid Walend
2f0f758f518Merge pull request #123 in SHRINE/shrine from feature/SHRINE-2504-consider-implementing-erik-benton-s to develop * c...
David WalendDavid Walend
c13c380abb5localhost is fine as the stewardBaseUrl.
David WalendDavid Walend
ae49d68516fGetting the URLs right for SHRINE-2504
David WalendDavid Walend
4c7907b481dCouple of changes to .conf files to support an external link in audit emails for SHRINE-2504
Ben CarmenBen Carmen
c6f4c3a7816Merge pull request #116 in SHRINE/shrine from bugfix/SHRINE-2499-export-link-disabled-fix to develop * commit 'c5543...
David WalendDavid Walend
fd8a34019ecI messed up a merge and left the compiler with a puzzle it couldn't solveon its own. Should fix it.
David WalendDavid Walend
55785963251Changes to make DSA email link separately customizable for SHRINE-2504
David WalendDavid Walend
92ea60dae69Merge pull request #119 in SHRINE/shrine from bugfix/SHRINE-2239-network-ids-in-query-result-json to develop * commi...
bendcarmenbendcarmen
c5543425d6bMoved styles of export to CSS per review recommendation
Ben CarmenBen Carmen
27bc7bd7e3dMerge pull request #115 in SHRINE/shrine from bugfix/SHRINE-2495-fix-x-y-spacing to develop * commit '726ab547e6f5d4...
David WalendDavid Walend
ba007e94813Merge pull request #118 in SHRINE/shrine from feature/SHRINE-2337-configuration-for-hard-coded to develop * commit '...
David WalendDavid Walend
7891d4da81fMerge pull request #110 in SHRINE/shrine from ~STSOI/shrine:develop to develop * commit 'c4bdac55d27de4703b5b6af140b...
David WalendDavid Walend
e96aa1f83adA snippet of code to work around SHRINE-2239, and some logging to get to the next step of the puzzle
David WalendDavid Walend
ac213c2098dAdded configurable poll timeout for the hub's use of a queue for SHRINE-2337
David WalendDavid Walend
80187e93d4aNot sure why the release branch won the merge, but I'm changing it back to 1.25.2.1-SNAPSHOT
bendcarmenbendcarmen
10e3a2eb708updated POMs from 1.25.1.2-SNAPSHOT to 1.25.1.3-SNAPSHOT
bendcarmenbendcarmen
a9235359f22Merge of a quick change to the Steward app from develop
bendcarmenbendcarmen
37505badad2this is a test, will delete in a moment
bendcarmenbendcarmen
eaeeaa2a031Potential fix of SHRINE-2499
bendcarmenbendcarmen
9010c9ca720build of js
Ben CarmenBen Carmen
716192451a0Merge pull request #112 in SHRINE/shrine from bugfix/SHRINE-2492-graphing-sequence to develop * commit '9ce5a35552dc...
bendcarmenbendcarmen
9ce5a35552dMerged with FETCH_HEAD
bendcarmenbendcarmen
726ab547e6fPotential fix of SHRINE-2495
bendcarmenbendcarmen
fd05ea8779aBuild of js
Ben CarmenBen Carmen
c330d803585Merge pull request #111 in SHRINE/shrine from bugfix/SHRINE-2491-not-working-in-ie to develop * commit 'dc5ef8544187...
Ben CarmenBen Carmen
4cbc73c59dbMerge pull request #113 in SHRINE/shrine from bugfix/SHRINE-2494-broken-error-popup to develop * commit '5d92ed0bf2e...
Ben CarmenBen Carmen
be15ef20f59Merge pull request #114 in SHRINE/shrine from bugfix/SHRINE-2483-unwanted-text-in-header to develop * commit '1ad6aa...
bendcarmenbendcarmen
1ad6aa98f37Fix for SHRINE-2483
bendcarmenbendcarmen
5d92ed0bf2ePotential fix of SHRINE-2494
bendcarmenbendcarmen
5855fc5c569Corrected a spread operator
bendcarmenbendcarmen
5717bce0302Fix of the sorting of graphs
bendcarmenbendcarmen
dc5ef854418Potential fix of SHRINE-2491, not working in IE
bendcarmenbendcarmen
d21f361e170js build
bendcarmenbendcarmen
8a1c7f6998fCleanup of if statement
Sam TsoiSam Tsoi
c4bdac55d27Fixing url links with double quotes instead of single
David WalendDavid Walend
5c29dcc85c1Merge pull request #108 in SHRINE/shrine from bugfix/SHRINE-2487-log-bomb-if-shrine-dev2-fails to release/1.25.1 * c...
Ben CarmenBen Carmen
9ad2317d96aMerge pull request #109 in SHRINE/shrine from bugfix/SHRINE-2485-csv-export to develop * commit '32ffc4f02b0a2c2f17b...
bendcarmenbendcarmen
32ffc4f02b0Resolved merge conflicts wtih develop
bendcarmenbendcarmen
34b4e7f9bc6changed the name of url member and constant to baseUrl to be more descriptive
Ben CarmenBen Carmen
9072f65a02dMerge pull request #107 in SHRINE/shrine from feature/SHRINE-2472-show-404-error to develop * commit '90e9a96919e9a1...
bendcarmenbendcarmen
90e9a96919eIncorporated suggestions from code review
bendcarmenbendcarmen
85c3f07253bExtra insurance in case data coming back from the server is undefined
bendcarmenbendcarmen
5f4440e98a7Made sure data is handled in case it is undefined
bendcarmenbendcarmen
b37f6cf0e6dAdded a double check in case data object is undefined
bendcarmenbendcarmen
546cc47587eSimiplified a conditional per code review
bendcarmenbendcarmen
22c650109e8Renamed some confusing methods and separated out any DOM maninpulation in order to facilitate testability
bendcarmenbendcarmen
c9795a1df87Fixed accidental name redundancy from refactor
bendcarmenbendcarmen
de08d05bd5dFixed accidental name redundancy from refactor
bendcarmenbendcarmen
92deaa68f03refactor
David WalendDavid Walend
f78e91ccc23Now catching and retrying for spray's ConnectionException to fix SHRINE-2487
bendcarmenbendcarmen
8f251f650f5Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
Next →