SHRINE
  1. SHRINE

shrine

Public
  1. SHRINE
  2. shrine

All Branches Graph  

        
AuthorCommitMessageCommit dateBuilds
Marc-Danie NazaireMarc-Danie Nazaire
636f0d65bdfSHRINE2020-908 - Optimize performance of Medical Concept index tool
dwalenddwalend
d58bb9876c7Fix for SHRINE2020-917 - cache calls to some web API and report an error so that a researcher doesn't have to reenter...
Bamboo UserBamboo User
0b136f5501fMerge release branch release/3.2.0 into master.
Bamboo UserBamboo User
d81addc9b12Update POMs with release version 3.2.0.
dwalenddwalend
251cdc44160Now caching the network for SHRINE2020-917
Marc-Danie NazaireMarc-Danie Nazaire
4c70cc6f6a9Merge pull request #1195 in SHRINE/shrine from feature/SHRINE2020-921 to develop * commit '920477b84dc59598200106f68...
Marc-Danie NazaireMarc-Danie Nazaire
920477b84dcSHRINE2020-921 - Improvements to Lucene indexing tool - Minor edit
Marc-Danie NazaireMarc-Danie Nazaire
9a4ea3a57c7SHRINE2020-921 - Improvements to Lucene indexing tool - Minor edit to Delimiter error message prompt
Marc-Danie NazaireMarc-Danie Nazaire
fe60609e434SHRINE2020-921 - Improvements to Lucene indexing tool
dwalenddwalend
b54b6c8df5aGeneral fix for lazy IO for SHRINE2020-917
dwalenddwalend
9a12f24099aMore logging for SHRINE2020-917
dwalenddwalend
43c4dc71870Working but baroque fix for SHRINE2020-917
Marc-Danie NazaireMarc-Danie Nazaire
d28ad5f01caMerge pull request #1194 in SHRINE/shrine from feature/SHRINE2020-560 to develop * commit '130b86e5a4827588d31081ca9...
Marc-Danie NazaireMarc-Danie Nazaire
9d165cb464cMerge pull request #1193 in SHRINE/shrine from feature/SHRINE2020-559 to develop * commit '9fb3aa8c201b2214835d51cd9...
Marc-Danie NazaireMarc-Danie Nazaire
9fb3aa8c201SHRINE2020-559 - Upgrade Front End Libraries..i.e. React/Redux..e.t.c. - Update the query library
Marc-Danie NazaireMarc-Danie Nazaire
130b86e5a48SHRINE2020-560 - Update Front End Build Infrastructure...i..e Node/Webpack..e.t.c.
Marc-Danie NazaireMarc-Danie Nazaire
6c632ad0715SHRINE2020-559 - Upgrade Front End Libraries..i.e. React/Redux..e.t.c. - Updated the react library
Marc-Danie NazaireMarc-Danie Nazaire
48b28fe2510SHRINE2020-920 - Allow the Tutorial title to wrap
Marc-Danie NazaireMarc-Danie Nazaire
bab13884a70SHRINE2020-559 - Upgrade Front End Libraries..i.e. React/Redux..e.t.c.
Marc-Danie NazaireMarc-Danie Nazaire
109bdb916c6Merge pull request #1192 in SHRINE/shrine from bugfix/SHRINE2020-920 to release/3.2.0 * commit '26389877c775ee495f5c...
Marc-Danie NazaireMarc-Danie Nazaire
26389877c77SHRINE2020-920 - Modified so that the tutorial title wraps
David WalendDavid Walend
3215513143aMerge pull request #1190 in SHRINE/shrine from bugfix/SHRINE2020-918 to develop * commit 'd1d9fdc737dd884bfa9a3467cf...
dwalenddwalend
d1d9fdc737dError when a downstream node that's configured to not have an adapter is asked to run a query for SHRINE2020-918
David WalendDavid Walend
48749c2c23eMerge pull request #1187 in SHRINE/shrine from feature/SHRINE2020-896 to develop * commit '20f1f87ed0bbd6a23065dc844...
dwalenddwalend
20f1f87ed0bThe delete pass for SHRINE2020-896
dwalenddwalend
26523b8a108Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-896
David WalendDavid Walend
a50741320afMerge pull request #1189 in SHRINE/shrine from feature/SHRINE2020-894 to develop * commit '6eea3cdb0055cee1e7d6ce8bc...
David WalendDavid Walend
582f755d5e5Merge pull request #1188 in SHRINE/shrine from feature/SHRINE2020-554 to develop * commit '0bd80b5731213d3b6e2fa8440...
dwalenddwalend
6eea3cdb005opencvs fixed the bug already. Will be in their next release
dwalenddwalend
10a34461ca9Not much to upgrade for 3.3 since we just did it. One comment added to the pom.xml file for SHRINE2020-894
dwalenddwalend
0bd80b57312Trimmed out these JDK6 optimizations for SHRINE2020-554
dwalenddwalend
f39231193bfAdded a couple of new settings for the compiler to get better error messages maybe. For SHRINE2020-554
dwalenddwalend
c50f439f53bStray changes from scale-up test to clean up
dwalenddwalend
3d350c3b0c2Merge branch 'develop' into feature/SHRINE2020-896
dwalenddwalend
049ab0e6be0Removed dependency on scalatest from classes in the util subproject for SHRINE2020-896
Marc-Danie NazaireMarc-Danie Nazaire
5398f139067SHRINE2020-915 - Fix version of scopt maven library in pom.xml
Marc-Danie NazaireMarc-Danie Nazaire
ae6d883247aMerge pull request #1186 in SHRINE/shrine from feature/SHRINE2020-915 to release/3.2.0 * commit '5b5cbbb97c25a45c5a2...
Marc-Danie NazaireMarc-Danie Nazaire
5b5cbbb97c2SHRINE2020-915 - Fix version of scopt maven library in pom.xml
Marc-Danie NazaireMarc-Danie Nazaire
ec739735f86Update revision number to 3.3.0
David WalendDavid Walend
fc844ffa9ebMerge pull request #1185 in SHRINE/shrine from feature/SHRINE2020-886 to early/3.3.0 * commit '55d146eb2daebc3a8c95f...
dwalenddwalend
04b296e9990Made scalatest a regular dependency instead of a univefrsal dependency before starting to remove it for SHRINE2020-896
dwalenddwalend
55d146eb2daMerge remote-tracking branch 'origin/develop' into feature/SHRINE2020-886
dwalenddwalend
50b25a12171Lots to tidy up in tests, but that's more scalatest than junit - SHRINE2020-886
dwalenddwalend
ba2aa894adbFound a working combination of junit dependencies for SHRINE2020-886
Marc-Danie NazaireMarc-Danie Nazaire
a3fc11f0dcfMerge pull request #1184 in SHRINE/shrine from feature/SHRINE2020-891 to develop * commit '5a15b9a491630e096400b5c38...
Marc-Danie NazaireMarc-Danie Nazaire
5a15b9a4916SHRINE2020-891 - Fix 500 error when attempting to get webclient logo - Changed alt text and fixed flash of null text ...
Marc-Danie NazaireMarc-Danie Nazaire
f5ee0d67fe4SHRINE2020-891 - Fix 500 error when attempting to get webclient logo - minor edit to error message
Marc-Danie NazaireMarc-Danie Nazaire
1417bdb90a4SHRINE2020-891 - Fix 500 error when attempting to get webclient logo - minor edit to error message
Marc-Danie NazaireMarc-Danie Nazaire
0915add2bb5SHRINE2020-891 - Fix 500 error when attempting to get webclient logo - Fixed to return default logo if there is an ex...
Marc-Danie NazaireMarc-Danie Nazaire
55cd31e780cSHRINE2020-891 - Fix 500 error when attempting to get webclient logo - Moved default logo to the server side
Marc-Danie NazaireMarc-Danie Nazaire
0c08805ddd2SHRINE2020-891 - Fix 500 error when attempting to get webclient logo - Modified to return NoContent response if logo ...
Marc-Danie NazaireMarc-Danie Nazaire
dbc7c87befbMerge pull request #1176 in SHRINE/shrine from feature/SHRINE2020-866 to develop * commit '660872bff8db76aeca9ed7866...
Marc-Danie NazaireMarc-Danie Nazaire
660872bff8dMerge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-866 # Co...
Marc-Danie NazaireMarc-Danie Nazaire
db7ab67b4faSHRINE2020-866 - Remove reference to survey link on tutorial and on log out page - Fix position of arrow on the Defin...
Marc-Danie NazaireMarc-Danie Nazaire
4c358d264a6Merge pull request #1175 in SHRINE/shrine from feature/SHRINE2020-865 to develop * commit '98cd850f649c5ee3d460d6afc...
Marc-Danie NazaireMarc-Danie Nazaire
9af246f58cfMerge pull request #1181 in SHRINE/shrine from bugfix/SHRINE2020-862 to develop * commit '37eaf5732fe3369478c08f088f...
Marc-Danie NazaireMarc-Danie Nazaire
470b3c98f1dMerge pull request #1183 in SHRINE/shrine from bugfix/SHRINE2020-888 to develop * commit 'be6c9b0030dd78507fa0ea931c...
Marc-Danie NazaireMarc-Danie Nazaire
cefe4417e8dMerge pull request #1172 in SHRINE/shrine from feature/SHRINE2020-856 to develop * commit '8f1823a7b57fb3730261d63b1...
Marc-Danie NazaireMarc-Danie Nazaire
8f1823a7b57SHRINE2020-856 - Remove Dashboard App - Database scripts to remove/drop PROBLEM table (inc. additional tables) - Upda...
Marc-Danie NazaireMarc-Danie Nazaire
274e886b804SHRINE2020-856 - Remove Dashboard App - Database scripts to remove/drop PROBLEM table (inc. additional tables) - Fixe...
Marc-Danie NazaireMarc-Danie Nazaire
92ec69da629SHRINE2020-891 - Fix 500 error when attempting to get webclient logo
Marc-Danie NazaireMarc-Danie Nazaire
be6c9b0030dSHRINE2020-888 - Extra spaces on search filter menu
Marc-Danie NazaireMarc-Danie Nazaire
a98219cb9dfSHRINE2020-856 - Remove Dashboard App - Database scripts to remove/drop PROBLEM table (inc. additional tables) - Remo...
Marc-Danie NazaireMarc-Danie Nazaire
98cd850f649SHRINE2020-865 - Edit help text on reloading legacy query into new webclient - Modified so that the unsupported query...
Marc-Danie NazaireMarc-Danie Nazaire
87a38d45c9cSHRINE2020-865 - Edit help text on reloading legacy query into new webclient - Moved so that the warning text is only...
David WalendDavid Walend
d21adee47b2Merge pull request #1182 in SHRINE/shrine from feature/SHRINE2020-850 to develop * commit 'dc660c7c04c7891640984ffa7...
Marc-Danie NazaireMarc-Danie Nazaire
eeceeb1208bSHRINE2020-856 - Remove Dashboard App - Database scripts to remove/drop PROBLEM table (inc. additional tables) - Remo...
Marc-Danie NazaireMarc-Danie Nazaire
4e6c8d1c4a1SHRINE2020-856 - Remove Dashboard App - Database scripts to remove/drop PROBLEM table (inc. additional tables) - Adde...
Marc-Danie NazaireMarc-Danie Nazaire
26716e2485cSHRINE2020-856 - Remove Dashboard App - Database scripts to remove/drop PROBLEM table (inc. additional tables) - Fixe...
Marc-Danie NazaireMarc-Danie Nazaire
4de4affbf51SHRINE2020-856 - Remove Dashboard App - Database scripts to remove/drop PROBLEM table (inc. additional tables) - Fixe...
Marc-Danie NazaireMarc-Danie Nazaire
0f73873d62aSHRINE2020-856 - Remove Dashboard App - Database scripts to remove/drop PROBLEM table (inc. additional tables) - Remo...
Marc-Danie NazaireMarc-Danie Nazaire
65b4b5e69f8Merge branches 'develop' and 'feature/SHRINE2020-856' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine in...
dwalenddwalend
dc660c7c04cAdded a new censor regex for SHRINE2020-850
Marc-Danie NazaireMarc-Danie Nazaire
c97f17fec9aFixed deprecated bit of unit test
Marc-Danie NazaireMarc-Danie Nazaire
ee6658d101bFixed broken test
Marc-Danie NazaireMarc-Danie Nazaire
fd4c673b2d9Merge pull request #1177 in SHRINE/shrine from bugfix/SHRINE2020-870 to develop * commit '26f7c19bedf980f8fe06a8f2bd...
Marc-Danie NazaireMarc-Danie Nazaire
409ec92fa53SHRINE2020-866 - Remove reference to survey link on tutorial and on log out page - Edited text for step 3 and step 5
David WalendDavid Walend
2573c6d725bMerge pull request #1180 in SHRINE/shrine from feature/SHRINE2020-823 to develop * commit '4e0d0443347241a62814999e9...
Marc-Danie NazaireMarc-Danie Nazaire
37eaf5732feSHRINE2020-862 - Criteria is not pre-populated on editing query in case user restores session from the session expiry...
Marc-Danie NazaireMarc-Danie Nazaire
025b68bbd2fSHRINE2020-862 - Criteria is not pre-populated on editing query in case user restores session from the session expiry...
Marc-Danie NazaireMarc-Danie Nazaire
8937136974fMerge pull request #1173 in SHRINE/shrine from feature/SHRINE2020-852 to develop * commit '51a6e1f9d9e342a3691276882...
Marc-Danie NazaireMarc-Danie Nazaire
48151623c39SHRINE2020-862 - Criteria is not pre-populated on editing query in case user restores session from the session expiry...
dwalenddwalend
4e0d0443347Updating help link for SHRINE2020-823
David WalendDavid Walend
10efbf30061Merge pull request #1179 in SHRINE/shrine from feature/SHRINE2020-822 to develop * commit 'eaa61ad20abccae96ba8f184c...
dwalenddwalend
eaa61ad20abAdded a comment about a future ticket
dwalenddwalend
18c14579295Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-822
David WalendDavid Walend
7ec904f1ccaMerge pull request #1178 in SHRINE/shrine from feature/SHRINE2020-632 to develop * commit 'c334365784d5cc2e35d1dc0ff...
dwalenddwalend
c334365784dFix for SHRINE2020-868 from Marc-Danie
dwalenddwalend
e0ee524ecfdMore review commets from Marc-Danie
dwalenddwalend
ef44b6dbc74Review comments from Marc-Danie for SHRINE2020-632
dwalenddwalend
43fa8aa8519Last of the easy library upgrades for SHRINE2020-882
dwalenddwalend
3161f78cfebUpgraded a lot of libraries for SHRINE2020-822
dwalenddwalend
20527dcf948Simple review cleanup for SHRINE2020-632
dwalenddwalend
c8d73681db9Merging and more comments for SHRINE2020-632
dwalenddwalend
a1d1b13ef5dMerge remote-tracking branch 'origin/develop' into feature/SHRINE2020-632
dwalenddwalend
9295fc9b9fbscalatest was bringing in an old version of scala-xml in the .war file. Forced it with the correct version in the .wa...
Marc-Danie NazaireMarc-Danie Nazaire
897b7df4c4bMerge pull request #1174 in SHRINE/shrine from feature/SHRINE2020-854 to develop * commit '426c46d1377e8e3faeeca98f3...
Marc-Danie NazaireMarc-Danie Nazaire
426c46d1377SHRINE2020-854 - Remove Network Health feature - removed network health frontend dependency
dwalenddwalend
a657dc6b23bStray network health front-end dependency removed for SHRINE2020-632
dwalenddwalend
f2158746792Merging in removal of network health for SHRINE2020-632
Marc-Danie NazaireMarc-Danie Nazaire
26f7c19bedfSHRINE2020-870 - Build version and info is not displayed under user profile - Added to unit test
Marc-Danie NazaireMarc-Danie Nazaire
7cc1a68d644SHRINE2020-870 - Build version and info is not displayed under user profile
Marc-Danie NazaireMarc-Danie Nazaire
afbe2b2716eSHRINE2020-870 - Build version and info is not displayed under user profile
dwalenddwalend
7cd7b2afaf9Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-632
dwalenddwalend
b3126cee13cCouple more scala 2.13 parenethesis for SHRINE2020-632
Marc-Danie NazaireMarc-Danie Nazaire
acf9043ef7fSHRINE2020-865 - Edit help text on reloading legacy query into new webclient - Removed css for the link to the legacy...
Marc-Danie NazaireMarc-Danie Nazaire
6dcbcd44f92SHRINE2020-866 - Remove reference to survey link on tutorial and on log out page
Marc-Danie NazaireMarc-Danie Nazaire
fdabc9a8056SHRINE2020-865 - Edit help text on reloading legacy query into new webclient - Added testGetUnsupportedQueryReadableF...
dwalenddwalend
d3378a2711bapp and war subproject changes for scala 2.13 for SHRINE2020-632
dwalenddwalend
6d47e533208Fixed aim3 services for scala 2.13 for SHRINE2020-632
Marc-Danie NazaireMarc-Danie Nazaire
9dd57599cc3SHRINE2020-865 - Edit help text on reloading legacy query into new webclient
Marc-Danie NazaireMarc-Danie Nazaire
b158c347af5SHRINE2020-854 - Remove Network Health feature - minor code reformatting
Marc-Danie NazaireMarc-Danie Nazaire
3e89c91175dSHRINE2020-854 - Remove Network Health feature - fixed sql update
Marc-Danie NazaireMarc-Danie Nazaire
4781c65d8a5SHRINE2020-854 - Remove Network Health feature - fixed sql update
Marc-Danie NazaireMarc-Danie Nazaire
e9a4314b691SHRINE2020-854 - Remove Network Health feature - fixed sql update
Marc-Danie NazaireMarc-Danie Nazaire
cdb1d10f347SHRINE2020-854 - Remove Network Health feature - fixed sql update
Marc-Danie NazaireMarc-Danie Nazaire
10229bb8a76SHRINE2020-854 - Remove Network Health feature
Marc-Danie NazaireMarc-Danie Nazaire
51a6e1f9d9eSHRINE2020-852 - Clean additional 'dead' code for legacy SHRINE webclient - Fixed to return IO
Marc-Danie NazaireMarc-Danie Nazaire
08893d7dd1bSHRINE2020-852 - Clean additional 'dead' code for legacy SHRINE webclient - Fixed variable type
Marc-Danie NazaireMarc-Danie Nazaire
c8a32620965SHRINE2020-852 - Clean additional 'dead' code for legacy SHRINE webclient - Fixed variable type
Marc-Danie NazaireMarc-Danie Nazaire
9960406acedSHRINE2020-852 - Clean additional 'dead' code for legacy SHRINE webclient
dwalenddwalend
86d9145a5b1Fixes for the adapter for scala 2.13 for SHRINE2020-632
Marc-Danie NazaireMarc-Danie Nazaire
1b9f3d2998fremoved commented out code
Marc-Danie NazaireMarc-Danie Nazaire
c8582ed981bMerge pull request #1168 in SHRINE/shrine from feature/SHRINE2020-220 to develop * commit '75819f9def18017bf1ff823cd...
Marc-Danie NazaireMarc-Danie Nazaire
864f2b1f18cSHRINE2020-856 - Remove Dashboard App - Database scripts to remove/drop PROBLEM table (inc. additional tables)
Marc-Danie NazaireMarc-Danie Nazaire
1183f4e38c1SHRINE2020-856 - Remove Dashboard App - Database scripts to remove/drop PROBLEM table (inc. additional tables)
Marc-Danie NazaireMarc-Danie Nazaire
82869facc14Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-856
Marc-Danie NazaireMarc-Danie Nazaire
75819f9def1Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-220 # Co...
dwalenddwalend
ec4bd83be61Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-632
dwalenddwalend
a8bbe05d4a3QEP for scala 3.2 for SHRINE2020-632
Marc-Danie NazaireMarc-Danie Nazaire
66f570c73a6Merge pull request #1171 in SHRINE/shrine from feature/SHRINE2020-858 to develop * commit 'b013803420e510dd3a34c786b...
Marc-Danie NazaireMarc-Danie Nazaire
b013803420eSHRINE2020-858 - Remove Dashboard App - delete server code (inc static code analysis to make sure we've removed it al...
Marc-Danie NazaireMarc-Danie Nazaire
be50aff5645Merge branch 'feature/SHRINE2020-858' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRIN...
Marc-Danie NazaireMarc-Danie Nazaire
37ab0487da4SHRINE2020-858 - Remove Dashboard App - delete server code (inc static code analysis to make sure we've removed it al...
Marc-Danie NazaireMarc-Danie Nazaire
b2238c3b698SHRINE2020-858 - Remove Dashboard App - delete server code (inc static code analysis to make sure we've removed it al...
Marc-Danie NazaireMarc-Danie Nazaire
9d4fe13ad6cMerge branch 'feature/SHRINE2020-858' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRIN...
Marc-Danie NazaireMarc-Danie Nazaire
6f49cb07aeaMerge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-856 # Co...
dwalenddwalend
7dd565f0336Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-632
Marc-Danie NazaireMarc-Danie Nazaire
e0d524e86f0Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-858 # Co...
Marc-Danie NazaireMarc-Danie Nazaire
36946c10fa1Merge pull request #1170 in SHRINE/shrine from feature/SHRINE2020-857 to develop * commit 'bcb189350e0e57c6ed44bdfcf...
dwalenddwalend
7f65c7584acHub service changes for scala 2.13 for SHRINE2020-632
dwalenddwalend
d862e42604eWork in the message queue service with scala 2.13 for SHRINE2020-623
Marc-Danie NazaireMarc-Danie Nazaire
247a018c158Merge pull request #1166 in SHRINE/shrine from feature/SHRINE2020-855 to develop * commit '33a75f5f880d6e7484e350d18...
Marc-Danie NazaireMarc-Danie Nazaire
345de6a575cFixed merge with develop by removing reference to legacy
dwalenddwalend
e31f2966c59Now building auth with scala 2.13 for SHRINE2020-632
dwalenddwalend
4b1b564c7faGot protocol subproject building with scala 2.13.5 for SHRINE2020-632
Marc-Danie NazaireMarc-Danie Nazaire
bcb189350e0Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-857 # Co...
David WalendDavid Walend
d7825b129deMerge pull request #1155 in SHRINE/shrine from feature/SHRINE2020-837 to develop * commit 'c3b61dd20bd67f1ec5743034d...
dwalenddwalend
7551f45dde9Query protocol tests are passing for SHRINE2020-632
Marc-Danie NazaireMarc-Danie Nazaire
008d9db5ef5Removed reference to legacy in POM after merge with develop
Marc-Danie NazaireMarc-Danie Nazaire
51b73d82c5aMerge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-858 # Co...
dwalenddwalend
c3b61dd20bdReview comments from Marc-Danie for SHRINE2020-837
dwalenddwalend
b1de3b8e7d5Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-837
dwalenddwalend
5d67222596fCheckpoint - the protocol package is passing all tests, and the build is running into the first databases for the Sca...
dwalenddwalend
3d540d2c270Merge branch 'develop' into feature/SHRINE2020-632
Marc-Danie NazaireMarc-Danie Nazaire
6530bb1a313Merge pull request #1167 in SHRINE/shrine from feature/SHRINE2020-851 to develop * commit '0aabc9ec94edcbc13df2e4662...
Marc-Danie NazaireMarc-Danie Nazaire
776981a9db4Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-858
Marc-Danie NazaireMarc-Danie Nazaire
ad9fb387357Merge pull request #1163 in SHRINE/shrine from feature/SHRINE2020-843 to develop * commit '4919231d3ea4d4be617a6e55d...
Marc-Danie NazaireMarc-Danie Nazaire
b6355ba329cfixed legacy service pom version
Marc-Danie NazaireMarc-Danie Nazaire
33a75f5f880SHRINE2020-855 - Remove Dashboard App -Implement API call to return a site's security filtered shrine.conf settings -...
Marc-Danie NazaireMarc-Danie Nazaire
ada3d8b106bfixed circe version variable
Marc-Danie NazaireMarc-Danie Nazaire
3e16353a532fixed to use 3.2.0 revision variables instead of hardcode revision 3.1.0
Marc-Danie NazaireMarc-Danie Nazaire
ab37a9fc9e0fixed to use revision variables
Marc-Danie NazaireMarc-Danie Nazaire
abfeb6e2f1bfixed revision number
Marc-Danie NazaireMarc-Danie Nazaire
11b822277f7Moved updates for 3.1.0 into base SQL for 3.2.0
Marc-Danie NazaireMarc-Danie Nazaire
d88f34eeacdMerge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into develop
Marc-Danie NazaireMarc-Danie Nazaire
0aabc9ec94eSHRINE2020-851 - Delete legacy SHRINE webclient code - removed more references to the legacy webclient
Marc-Danie NazaireMarc-Danie Nazaire
c390e9eb4dfSHRINE2020-851 - Delete legacy SHRINE webclient code - removed more references to the legacy webclient
dwalenddwalend
104ad8f3f8aMy own review SHRINE2020-837
Marc-Danie NazaireMarc-Danie Nazaire
4658cee3428SHRINE2020-855 - Remove Dashboard App -Implement API call to return a site's security filtered shrine.conf settings -...
dwalenddwalend
9faf0c64d4aMerge remote-tracking branch 'origin/develop' into feature/SHRINE2020-837
dwalenddwalend
97ffe1a2535Found a spot where exception handling was dropping some information. Made sure that was preserved. As part of SHRINE2...
Marc-Danie NazaireMarc-Danie Nazaire
444fc6256b8SHRINE2020-855 - Remove Dashboard App -Implement API call to return a site's security filtered shrine.conf settings -...
Marc-Danie NazaireMarc-Danie Nazaire
f6b2825ed1aSHRINE2020-858 - Remove Dashboard App - delete server code (inc static code analysis to make sure we've removed it all
dwalenddwalend
968d1c63f4bUpdating to the very latest http client for SHRINE2020-837
Marc-Danie NazaireMarc-Danie Nazaire
79d62a20291Merge pull request #1162 in SHRINE/shrine from feature/SHRINE2020-839 to develop * commit 'e48cbf0851ff3dcc842dd4759...
Marc-Danie NazaireMarc-Danie Nazaire
b4bcf8b785cMerge branch 'feature/SHRINE2020-857' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRIN...
Marc-Danie NazaireMarc-Danie Nazaire
e0918ab499cSHRINE2020-855 - Remove Dashboard App -Implement API call to return a site's security filtered shrine.conf settings -...
Marc-Danie NazaireMarc-Danie Nazaire
449c49ffc17SHRINE2020-855 - Remove Dashboard App -Implement API call to return a site's security filtered shrine.conf settings
David WalendDavid Walend
983e51c6957Merge pull request #1165 in SHRINE/shrine from feature/SHRINE2020-842 to feature/SHRINE2020-837 * commit '3b711de060...
dwalenddwalend
3b711de060aRevived the old http client test to use the JDK11 http client for SHRINE2020-842
Marc-Danie NazaireMarc-Danie Nazaire
26a0eec4b90Merge pull request #1164 in SHRINE/shrine from feature/SHRINE2020-859 to develop * commit '78157a6b5b9f4eff0ef0659d6...
dwalenddwalend
e9c75a0f738Merge branch 'develop' into feature/SHRINE2020-837
Marc-Danie NazaireMarc-Danie Nazaire
db109b4f72eMerge branch 'release/3.1.0' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into develop
Marc-Danie NazaireMarc-Danie Nazaire
4bdf5ddee4fSHRINE2020-857 - Remove Dashboard App - delete UI code
Bamboo UserBamboo User
aad194c78d2Merge release branch release/3.1.0 into master.
Bamboo UserBamboo User
b734caca952Update POMs with release version 3.1.0.
Marc-Danie NazaireMarc-Danie Nazaire
52ff09f1635SHRINE2020-851 - Delete legacy SHRINE webclient code