SHRINE
  1. SHRINE

shrine

Public
  1. SHRINE
  2. shrine

All Branches Graph  

        
AuthorCommitMessageCommit dateBuilds
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
David WalendDavid Walend
bfe22026449Moved pom.xml shrine versions on develop to 1.25.2.1-SNAPSHOT
David WalendDavid Walend
e509f56f345Updated pom.xml s to 1.25.1.2-SNAPSHOT
bendcarmenbendcarmen
c748121ca72Candidate foror fix of SHRINE-2472
bendcarmenbendcarmen
435b32cf465Candidate foror fix of SHRINE-2472
bendcarmenbendcarmen
7b01943b5f3Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
bendcarmenbendcarmen
1369f69a01bMerge of feature/SHRINE-2472-show-404-error
David WalendDavid Walend
cff90d5129cMerge pull request #106 in SHRINE/shrine from bugfix/SHRINE-2481-scale-up-testing-with-jmeter to develop * commit 'e...
David WalendDavid Walend
eb05e6d89d7Merge branch 'develop' into bugfix/SHRINE-2481-scale-up-testing-with-jmeter
David WalendDavid Walend
f0defbdc7bfNo need to close the host-level spray connector, fixes SHRINE-2481
bendcarmenbendcarmen
62154054ffeCommit of feature to display network errors
Sam TsoiSam Tsoi
1a155a3351dMore changes for simplicity
Sam TsoiSam Tsoi
b045cb90d86Simplifying shrine.conf for 1.22.8
bendcarmenbendcarmen
7c6b86adfecCreated branch for SHRINE-2472
bendcarmenbendcarmen
9527c9c6069Merged in changes for SHRINE-2471
bendcarmenbendcarmen
a6c2d82d02fBuild out of sync
bendcarmenbendcarmen
bd00dc8dcacFixed an issue where require(*.scss) and harmony imports were confliting in jest, also requirie statements in main.js...
bendcarmenbendcarmen
b606a4419beBuild of merge with develop
bendcarmenbendcarmen
40f40affb39Merge of develop
David WalendDavid Walend
9ec53f4ba4ctodo for SHRINE-2481
bendcarmenbendcarmen
87b400c32a0Fix of recommended changes from code review, also added JEST test runner to verify no conclict with inlining the requ...
bendcarmenbendcarmen
03c2535bc48Added call to readApproved entries that was removed accidentally
bendcarmenbendcarmen
ac6fc8078cbsaving latest
David WalendDavid Walend
acbc30aaa8dMerge pull request #103 in SHRINE/shrine from bugfix/SHRINE-2476-message-service-client-is-rapidly to develop * comm...
David WalendDavid Walend
71512742ee8Tracking comment in the pom.xml for SHRINE-2478
David WalendDavid Walend
ed7555fb552Downgraded bouncy castle for SHRINE-2478
David WalendDavid Walend
8ea491ff688Marc-Danie's review comments for SHRINE-2476
David WalendDavid Walend
83725b36effQuick fix for a DoS attack from SHRINE on itself. SHRINE-2476
David WalendDavid Walend
d11afa55eceMerge pull request #101 in SHRINE/shrine from bugfix/SHRINE-2468-shrine-no-longer-requests-an to develop * commit '8...
David WalendDavid Walend
8fe0f076fb6Marc-Danie's review comments for SHRINE-2468
bendcarmenbendcarmen
89edff85cfaCleanup of .scss files
bendcarmenbendcarmen
5c7345239b3Cleanup and more tests
David WalendDavid Walend
4f81389d63dSome stray bits for SHRINE-2468 I found while walking the pull request
David WalendDavid Walend
607f1a8aafaMerging SHRINE-2468 to develop branch
David WalendDavid Walend
897a3424362Added a property to control the time we allow the CRC to tell us about queued queries for SHRINE-2468
bendcarmenbendcarmen
40c90ac77e7Saving fully integrated local webclient
David WalendDavid Walend
9eb7b5f48cdconfig and some error handling for SHRINE-2468
bendcarmenbendcarmen
d05a4292502Code cleanup
bendcarmenbendcarmen
b53ef3a6c4esaved latest
bendcarmenbendcarmen
f32ee63d574Full functionality, some failing tests that need to be filled in
bendcarmenbendcarmen
ac72533115csaving the latest
David WalendDavid Walend
7b9d743da1cGot things working on vagrant for SHRINE-2468
David WalendDavid Walend
0ab5c71fb1aThrough to the old shrine servlet for SHRINE-2468
bendcarmenbendcarmen
5414873f8eelatest
bendcarmenbendcarmen
ad90597d033Added tests for graph
bendcarmenbendcarmen
d2c7d1e5993latest
David WalendDavid Walend
f9e9fe26b0cBuilding the request for SHRINE-2468
bendcarmenbendcarmen
f956bd0e25aUpdated css reset
bendcarmenbendcarmen
c2f4a8a49d1saving latest
bendcarmenbendcarmen
2607cb5f48esave latest
bendcarmenbendcarmen
37e3c1c7cd1added graph
David WalendDavid Walend
0cda35184fcBuilt the insides of the request (maybe) for SHRINE-2469
David WalendDavid Walend
bbf68db31c5Logic for when to fire off the QUEUED query request for SHRINE-2468
David WalendDavid Walend
880ef141edeSkelital work for SHRINE-2468
David WalendDavid Walend
94064bc1ca8More planning comments for SHRINE-2468
David WalendDavid Walend
5e83c3fb89cMerge pull request #100 in SHRINE/shrine from feature/SHRINE-2423-indicate-that-crc-errors-come to develop * commit ...
David WalendDavid Walend
c0c7fb56dccCommented the code to call for SHRINE-2468
David WalendDavid Walend
c8b94bd540eMerge branch 'release/1.24.3' into bugfix/SHRINE-2468-shrine-no-longer-requests-an
David WalendDavid Walend
9689e8477ffpom.xml version updates for 1.24.3 hotfixes
David WalendDavid Walend
16b012dc808Added planning comments for SHRINE-2468
David WalendDavid Walend
dc3d9faddc3Added some words for a case where the CRC tells us ERROR for SHRINE-2423
David WalendDavid Walend
b86ed49f063Merge pull request #99 in SHRINE/shrine from feature/SHRINE-2441-remove-the-install-subproject to develop * commit '...
David WalendDavid Walend
48c343ef761Removed the abandoned install subproject for SHRINE-2441
bendcarmenbendcarmen
adc39be0584Merge branch 'develop' of https://open.med.harvard.edu/stash/scm/shrine/shrine into develop
bendcarmenbendcarmen
7eb72a1246fFix of SHRINE-1147
bendcarmenbendcarmen
1789dadc2e9Fixed labels on pagination
David WalendDavid Walend
44d68e0aa78Merge pull request #98 in SHRINE/shrine from feature/SHRINE-2453-upgrade-scalatest to develop * commit '667b5ea0c6f5...
David WalendDavid Walend
667b5ea0c6fUpdated scalatest version to 3.0.1 for SHRINE-2453
Yifan XingYifan Xing
d4ba16c4d5bMerge pull request #96 in SHRINE/shrine from ~YXING/shrine:json to develop * commit '402bf67b29d889ad0346c988d454c6b...
yifan xingyifan xing
402bf67b29dimplemented review comments, use plain text
marc-daniemarc-danie
6cbd665327aSHRINE-2176 - Fix 2 failed tests in DashboardServiceTest
yifan xingyifan xing
85400f110f1get rid of wildcard imports
yifan xingyifan xing
887324e92f5set content type to json
yifan xingyifan xing
874b1ef580aadded test that checks the media type
David WalendDavid Walend
04d80a59e36Update about the December 21st maven scala plugin bug ITEAM-2030
yifan xingyifan xing
671d3884accset message content to json
Yifan XingYifan Xing
29e63eb6209Merge pull request #95 in SHRINE/shrine from ~YXING/shrine:json to develop * commit '866e382d9f961adfa956242868c168c...
yifan xingyifan xing
866e382d9f9SHRINE-2173 fill in test json
Yifan XingYifan Xing
21691177683Merge pull request #89 in SHRINE/shrine from ~YXING/shrine:webapitry to develop * commit 'a0c923418996d8ef7e288ea29b...
yifan xingyifan xing
a0c92341899implement Dave's review comments
yifan xingyifan xing
2ef70685c24used Future instead of Try in send and receive
yifan xingyifan xing
f8c6c371a1eMerge branch 'webapitry' of https://open.med.harvard.edu/stash/scm/~yxing/shrine into webapitry
yifan xingyifan xing
631c9280396merging conflicts
Yifan XingYifan Xing
8fc4325831dMerge pull request #91 in SHRINE/shrine from ~YXING/shrine:status to develop * commit '026c937d8ebf5aafb69473db705b9...
yifan xingyifan xing
026c937d8ebadded a statusCode for send failure
Next →