SHRINE
  1. SHRINE

shrine

Public
  1. SHRINE
  2. shrine

All Branches Graph  

        
AuthorCommitMessageCommit dateBuilds
Marc-Danie NazaireMarc-Danie Nazaire
94eb5b726ccSHRINE2020-929 - Improve shrine dev docker-compose to be a two node network - Updated log messages in execute.sh
Marc-Danie NazaireMarc-Danie Nazaire
a1312576e4cSHRINE2020-929 - Improve shrine dev docker-compose to be a two node network - Added execute.sh with wait and then kil...
dwalenddwalend
6b85a9d1465Dunno why I had to merge
dwalenddwalend
953fd94f757Changed to have the query id in the path for SHRINE2020-941
dwalenddwalend
6d5a2db72ebA little tidying up for SHRINE2020-941
dwalenddwalend
e5b6240ceebA little tidying up for SHRINE2020-943
dwalenddwalend
6d5d0291484Added secret aggregator endpoints for SHRINE2020-942
dwalenddwalend
da9e573b535Merge branch 'feature/SHRINE2020-942' into feature/SHRINE2020-943
David WalendDavid Walend
246ce06acfeMerge pull request #1201 in SHRINE/shrine from bugfix/SHRINE2020-767 to develop * commit 'a4c45cb4610c3de709ac19855b...
dwalenddwalend
27d69877b1dNice hyphens for the end points for SHRINE2020-942
dwalenddwalend
a74ed8d398bAdded secret aggregator service to shrine-api's hub services for SHRINE2020-942
dwalenddwalend
58cadae0550Added a very basic secret aggregator service for SHRINE2020-942
Marc-Danie NazaireMarc-Danie Nazaire
cb393eba56aSHRINE2020-929 - Improve shrine dev docker-compose to be a two node network - updated README
Marc-Danie NazaireMarc-Danie Nazaire
838e8cea813SHRINE2020-929 - Improve shrine dev docker-compose to be a two node network - separate networks
Marc-Danie NazaireMarc-Danie Nazaire
b8e9db8e82eSHRINE2020-929 - Improve shrine dev docker-compose to be a two node network - separate networks
dwalenddwalend
e1f8c9a563eWayfinding to post a result to the secret aggregator for SHRINE2020-943
dwalenddwalend
a4c45cb4610More qep-ish services to turn off for SHRINE2020-767
dwalenddwalend
f30a900c0efMade the QEP service configure-off for SHRINE2020-767
Marc-Danie NazaireMarc-Danie Nazaire
d617a489880SHRINE2020-929 - Improve shrine dev docker-compose to be a two node network - added password.conf
dwalenddwalend
80ef671f5a5Merge branch 'develop' into feature/SHRINE2020-931
dwalenddwalend
0b2a7b31befSome updates to the docker README.md
Marc-Danie NazaireMarc-Danie Nazaire
0b89bfcbc18SHRINE2020-929 - Improve shrine dev docker-compose to be a two node network - Modified to build one shrine image and ...
Marc-Danie NazaireMarc-Danie Nazaire
9173a67d684Merge branch 'feature/SHRINE2020-929' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRIN...
Marc-Danie NazaireMarc-Danie Nazaire
241871b2cdbSHRINE2020-929 - Improve shrine dev docker-compose to be a two node network - Updated i2b2 web and wildfly versions t...
Marc-Danie NazaireMarc-Danie Nazaire
be11e23f88cSHRINE2020-930 - Dockerize SecretAggregator service and include in docker-compose network - Added SecretAggregator se...
Marc-Danie NazaireMarc-Danie Nazaire
7dfe98ca821SHRINE2020-929 - Improve shrine dev docker-compose to be a two node network - modified to use I2B2_MSSQL_TAG
Marc-Danie NazaireMarc-Danie Nazaire
96c619addb9SHRINE2020-929 - Improve shrine dev docker-compose to be a two node network - updated README
Marc-Danie NazaireMarc-Danie Nazaire
1946d2794abSHRINE2020-929 - Improve shrine dev docker-compose to be a two node network - updated README
Marc-Danie NazaireMarc-Danie Nazaire
d015f69f5bcSHRINE2020-929 - Improve shrine dev docker-compose to be a two node network - modified i2b2 mssql ip
Marc-Danie NazaireMarc-Danie Nazaire
3e399091105SHRINE2020-929 - Improve shrine dev docker-compose to be a two node network - modified i2b2 mssql ip
Marc-Danie NazaireMarc-Danie Nazaire
17a42f62d53SHRINE2020-929 - Improve shrine dev docker-compose to be a two node network - hub and 2 downstream nodes network
Marc-Danie NazaireMarc-Danie Nazaire
aa2bf64c77fSHRINE2020-929 - Improve shrine dev docker-compose to be a two node network - hub and 1 downstream node network
Marc-Danie NazaireMarc-Danie Nazaire
26b35c1dd8cSHRINE2020-929 - Improve shrine dev docker-compose to be a two node network - mods to certs
Marc-Danie NazaireMarc-Danie Nazaire
7892ddda5acSHRINE2020-929 - Improve shrine dev docker-compose to be a two node network - mods to certs
Marc-Danie NazaireMarc-Danie Nazaire
63f0674f599SHRINE2020-929 - Improve shrine dev docker-compose to be a two node network - mods to certs
Marc-Danie NazaireMarc-Danie Nazaire
887e9d13641SHRINE2020-929 - Improve shrine dev docker-compose to be a two node network
Marc-Danie NazaireMarc-Danie Nazaire
18bfd922408Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-929
Marc-Danie NazaireMarc-Danie Nazaire
8630859f8f0Merge pull request #1198 in SHRINE/shrine from feature/SHRINE2020-928 to develop * commit '031441c61981b93f9f2d1e172...
Marc-Danie NazaireMarc-Danie Nazaire
0c4b7fdd532Merge pull request #1197 in SHRINE/shrine from feature/SHRINE2020-908 to develop * commit 'b169b0e94fa959ff18a6ec930...
Marc-Danie NazaireMarc-Danie Nazaire
b169b0e94faSHRINE2020-908 - Optimize performance of Medical Concept index tool - Add code to 2 minute blinking light suggested b...
dwalenddwalend
47e2317d702Merge remote-tracking branch 'origin/feature/SHRINE2020-928' into feature/SHRINE2020-931
dwalenddwalend
42447351ffdSome updates to the readme for SHRINE2020-931
Marc-Danie NazaireMarc-Danie Nazaire
031441c6198SHRINE2020-928 - Include certificates be part of Docker build for a 1 node network - Changed host port to 6443
Marc-Danie NazaireMarc-Danie Nazaire
e7761428278SHRINE2020-908 - Optimize performance of Medical Concept index tool - optimized imports
Marc-Danie NazaireMarc-Danie Nazaire
523f1d8a367SHRINE2020-908 - Optimize performance of Medical Concept index tool - code improvements
Marc-Danie NazaireMarc-Danie Nazaire
76566c1ce55SHRINE2020-928 - Include certificates be part of Docker build for a 1 node network - Change hostname to shrine-hub
Marc-Danie NazaireMarc-Danie Nazaire
65271838364SHRINE2020-928 - Include certificates be part of Docker build for a 1 node network - Changed hostname to shrine-node0...
Marc-Danie NazaireMarc-Danie Nazaire
5b3512b1eddSHRINE2020-928 - Include certificates be part of Docker build for a 1 node network - Remove shrine.keystore file
Marc-Danie NazaireMarc-Danie Nazaire
a0908f2a0fdSHRINE2020-928 - Include certificates be part of Docker build for a 1 node network - Remove shrine.keystore file
Marc-Danie NazaireMarc-Danie Nazaire
98df85817bbSHRINE2020-928 - Include certificates be part of Docker build for a 1 node network - Now builds the certificates in D...
Marc-Danie NazaireMarc-Danie Nazaire
ac4a2994635SHRINE2020-928 - Include certificates be part of Docker build for a 1 node network - Now builds the certificates in D...
Marc-Danie NazaireMarc-Danie Nazaire
023a5c7cb38SHRINE2020-928 - Include certificates be part of Docker build for a 1 node network - Now builds the certificates in D...
David WalendDavid Walend
60d7b555a68Merge pull request #1196 in SHRINE/shrine from bugfix/SHRINE2020-917 to develop * commit '13064c876804bdd35dc5a1625b...
dwalenddwalend
13064c87680Merge remote-tracking branch 'origin/develop' into bugfix/SHRINE2020-917
dwalenddwalend
6f70f1a5cb2Marc-Danie review comments keeping me honest for SHRINE2020-917
Marc-Danie NazaireMarc-Danie Nazaire
100cd2f0275SHRINE2020-928 - Include certificates be part of Docker build for a 1 node network
Marc-Danie NazaireMarc-Danie Nazaire
ea6fc891520SHRINE2020-908 - Optimize performance of Medical Concept index tool - faster to do one commit when creating auto sugg...
Marc-Danie NazaireMarc-Danie Nazaire
0bae891b74fSHRINE2020-908 - Optimize performance of Medical Concept index tool - minor edits
Marc-Danie NazaireMarc-Danie Nazaire
70ee8943915SHRINE2020-908 - Optimize performance of Medical Concept index tool - minor edits
Marc-Danie NazaireMarc-Danie Nazaire
8443228fe09SHRINE2020-908 - Optimize performance of Medical Concept index tool
Marc-Danie NazaireMarc-Danie Nazaire
63f1ab36634SHRINE2020-908 - Optimize performance of Medical Concept index tool
Marc-Danie NazaireMarc-Danie Nazaire
7b65992c8d9SHRINE2020-908 - Optimize performance of Medical Concept index tool
Marc-Danie NazaireMarc-Danie Nazaire
8d04aefe359SHRINE2020-908 - Optimize performance of Medical Concept index tool
Marc-Danie NazaireMarc-Danie Nazaire
796126b9bd4SHRINE2020-908 - Optimize performance of Medical Concept index tool
dwalenddwalend
6a097842cb8Fix 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
acd6c346637Merge release branch release/3.2.0 into master.
Bamboo UserBamboo User
648fab65b56Update POMs with release version 3.2.0.
dwalenddwalend
8de5e1f24abNow caching the network for SHRINE2020-917
Marc-Danie NazaireMarc-Danie Nazaire
a0e41176af3Merge pull request #1195 in SHRINE/shrine from feature/SHRINE2020-921 to develop * commit 'f5c979b509195ed243f51d4de...
Marc-Danie NazaireMarc-Danie Nazaire
f5c979b5091SHRINE2020-921 - Improvements to Lucene indexing tool - Minor edit
Marc-Danie NazaireMarc-Danie Nazaire
5b73b5f78a0SHRINE2020-921 - Improvements to Lucene indexing tool - Minor edit to Delimiter error message prompt
Marc-Danie NazaireMarc-Danie Nazaire
9357d467fd2SHRINE2020-921 - Improvements to Lucene indexing tool
dwalenddwalend
1329d0e931aGeneral fix for lazy IO for SHRINE2020-917
dwalenddwalend
124a845fd65More logging for SHRINE2020-917
dwalenddwalend
ac4133eeee0Working but baroque fix for SHRINE2020-917
Marc-Danie NazaireMarc-Danie Nazaire
6bd3c873843Merge pull request #1194 in SHRINE/shrine from feature/SHRINE2020-560 to develop * commit 'd9e3ec8b14c7f0b57ca7847fd...
Marc-Danie NazaireMarc-Danie Nazaire
8bd96c509d0Merge pull request #1193 in SHRINE/shrine from feature/SHRINE2020-559 to develop * commit '4110671f806f2d9afda9b14f7...
Marc-Danie NazaireMarc-Danie Nazaire
4110671f806SHRINE2020-559 - Upgrade Front End Libraries..i.e. React/Redux..e.t.c. - Update the query library
Marc-Danie NazaireMarc-Danie Nazaire
d9e3ec8b14cSHRINE2020-560 - Update Front End Build Infrastructure...i..e Node/Webpack..e.t.c.
Marc-Danie NazaireMarc-Danie Nazaire
e98173ae2e8SHRINE2020-559 - Upgrade Front End Libraries..i.e. React/Redux..e.t.c. - Updated the react library
Marc-Danie NazaireMarc-Danie Nazaire
416448f3ecaSHRINE2020-920 - Allow the Tutorial title to wrap
Marc-Danie NazaireMarc-Danie Nazaire
8b3f274d7b5SHRINE2020-559 - Upgrade Front End Libraries..i.e. React/Redux..e.t.c.
Marc-Danie NazaireMarc-Danie Nazaire
9d61cb47212Merge pull request #1192 in SHRINE/shrine from bugfix/SHRINE2020-920 to release/3.2.0 * commit '5630234c4ae2de4159f0...
Marc-Danie NazaireMarc-Danie Nazaire
5630234c4aeSHRINE2020-920 - Modified so that the tutorial title wraps
David WalendDavid Walend
46f6f56296fMerge pull request #1190 in SHRINE/shrine from bugfix/SHRINE2020-918 to develop * commit 'ae8635c0307038374cea5e4f0f...
dwalenddwalend
ae8635c0307Error when a downstream node that's configured to not have an adapter is asked to run a query for SHRINE2020-918
David WalendDavid Walend
94b6f6c5171Merge pull request #1187 in SHRINE/shrine from feature/SHRINE2020-896 to develop * commit 'a46d2d7581681ec6023b7af81...
dwalenddwalend
a46d2d75816The delete pass for SHRINE2020-896
dwalenddwalend
ff0dea7f810Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-896
David WalendDavid Walend
2789529d8f2Merge pull request #1189 in SHRINE/shrine from feature/SHRINE2020-894 to develop * commit '42e61fc65719cfee5a8cd5dbd...
David WalendDavid Walend
caf6ee317dbMerge pull request #1188 in SHRINE/shrine from feature/SHRINE2020-554 to develop * commit '630aa3f1d1902f8edd52b2f33...
dwalenddwalend
42e61fc6571opencvs fixed the bug already. Will be in their next release
dwalenddwalend
07024ae7c76Not much to upgrade for 3.3 since we just did it. One comment added to the pom.xml file for SHRINE2020-894
dwalenddwalend
630aa3f1d19Trimmed out these JDK6 optimizations for SHRINE2020-554
dwalenddwalend
7e5e6c2383cAdded a couple of new settings for the compiler to get better error messages maybe. For SHRINE2020-554
dwalenddwalend
8f63f049325Stray changes from scale-up test to clean up
dwalenddwalend
cc0931cfb65Merge branch 'develop' into feature/SHRINE2020-896
dwalenddwalend
63755b2ffa0Removed dependency on scalatest from classes in the util subproject for SHRINE2020-896
Marc-Danie NazaireMarc-Danie Nazaire
53048d49fd3SHRINE2020-915 - Fix version of scopt maven library in pom.xml
Marc-Danie NazaireMarc-Danie Nazaire
485ac3b0d55Merge pull request #1186 in SHRINE/shrine from feature/SHRINE2020-915 to release/3.2.0 * commit 'c4aac7dc32a12a0f5e2...
Marc-Danie NazaireMarc-Danie Nazaire
c4aac7dc32aSHRINE2020-915 - Fix version of scopt maven library in pom.xml
Marc-Danie NazaireMarc-Danie Nazaire
911069d5723Update revision number to 3.3.0
David WalendDavid Walend
4108050935fMerge pull request #1185 in SHRINE/shrine from feature/SHRINE2020-886 to early/3.3.0 * commit '3417bcafb3248a7b91a1c...
dwalenddwalend
373407fbb30Made scalatest a regular dependency instead of a univefrsal dependency before starting to remove it for SHRINE2020-896
dwalenddwalend
3417bcafb32Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-886
dwalenddwalend
de589642efeLots to tidy up in tests, but that's more scalatest than junit - SHRINE2020-886
dwalenddwalend
756a548b012Found a working combination of junit dependencies for SHRINE2020-886
Marc-Danie NazaireMarc-Danie Nazaire
6332d2a1565Merge pull request #1184 in SHRINE/shrine from feature/SHRINE2020-891 to develop * commit '607b4b21044264d70e6da616d...
Marc-Danie NazaireMarc-Danie Nazaire
607b4b21044SHRINE2020-891 - Fix 500 error when attempting to get webclient logo - Changed alt text and fixed flash of null text ...
Marc-Danie NazaireMarc-Danie Nazaire
8ed450e3a6eSHRINE2020-891 - Fix 500 error when attempting to get webclient logo - minor edit to error message
Marc-Danie NazaireMarc-Danie Nazaire
fb194095953SHRINE2020-891 - Fix 500 error when attempting to get webclient logo - minor edit to error message
Marc-Danie NazaireMarc-Danie Nazaire
625417b5462SHRINE2020-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
bbf88b6f81dSHRINE2020-891 - Fix 500 error when attempting to get webclient logo - Moved default logo to the server side
Marc-Danie NazaireMarc-Danie Nazaire
0d79e142a79SHRINE2020-891 - Fix 500 error when attempting to get webclient logo - Modified to return NoContent response if logo ...
Marc-Danie NazaireMarc-Danie Nazaire
f10edf73e19Merge pull request #1176 in SHRINE/shrine from feature/SHRINE2020-866 to develop * commit '0a613c3896c2378e4ec544aa0...
Marc-Danie NazaireMarc-Danie Nazaire
0a613c3896cMerge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-866 # Co...
Marc-Danie NazaireMarc-Danie Nazaire
aa55a1e0739SHRINE2020-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
7887a7d0ed6Merge pull request #1175 in SHRINE/shrine from feature/SHRINE2020-865 to develop * commit '78c4a528f867c2dc5366d6320...
Marc-Danie NazaireMarc-Danie Nazaire
df9fee128dbMerge pull request #1181 in SHRINE/shrine from bugfix/SHRINE2020-862 to develop * commit '8d7b4d0e6e3da31d2a452cf54d...
Marc-Danie NazaireMarc-Danie Nazaire
95187879f28Merge pull request #1183 in SHRINE/shrine from bugfix/SHRINE2020-888 to develop * commit '5142e03cc1f2eee882be89262c...
Marc-Danie NazaireMarc-Danie Nazaire
aa9387a794cMerge pull request #1172 in SHRINE/shrine from feature/SHRINE2020-856 to develop * commit '2df78061c92a0bd8448ff57b5...
Marc-Danie NazaireMarc-Danie Nazaire
2df78061c92SHRINE2020-856 - Remove Dashboard App - Database scripts to remove/drop PROBLEM table (inc. additional tables) - Upda...
Marc-Danie NazaireMarc-Danie Nazaire
71304afbc37SHRINE2020-856 - Remove Dashboard App - Database scripts to remove/drop PROBLEM table (inc. additional tables) - Fixe...
Marc-Danie NazaireMarc-Danie Nazaire
5707877a542SHRINE2020-891 - Fix 500 error when attempting to get webclient logo
Marc-Danie NazaireMarc-Danie Nazaire
5142e03cc1fSHRINE2020-888 - Extra spaces on search filter menu
Marc-Danie NazaireMarc-Danie Nazaire
83874818d3eSHRINE2020-856 - Remove Dashboard App - Database scripts to remove/drop PROBLEM table (inc. additional tables) - Remo...
Marc-Danie NazaireMarc-Danie Nazaire
78c4a528f86SHRINE2020-865 - Edit help text on reloading legacy query into new webclient - Modified so that the unsupported query...
Marc-Danie NazaireMarc-Danie Nazaire
f8fb2ef6d46SHRINE2020-865 - Edit help text on reloading legacy query into new webclient - Moved so that the warning text is only...
David WalendDavid Walend
bea317a1ca2Merge pull request #1182 in SHRINE/shrine from feature/SHRINE2020-850 to develop * commit 'b568fcbcc8e7a4c634661bc7c...
Marc-Danie NazaireMarc-Danie Nazaire
814470e4c96SHRINE2020-856 - Remove Dashboard App - Database scripts to remove/drop PROBLEM table (inc. additional tables) - Remo...
Marc-Danie NazaireMarc-Danie Nazaire
4e32900ba22SHRINE2020-856 - Remove Dashboard App - Database scripts to remove/drop PROBLEM table (inc. additional tables) - Adde...
Marc-Danie NazaireMarc-Danie Nazaire
03d9280e26cSHRINE2020-856 - Remove Dashboard App - Database scripts to remove/drop PROBLEM table (inc. additional tables) - Fixe...
Marc-Danie NazaireMarc-Danie Nazaire
08179912dcaSHRINE2020-856 - Remove Dashboard App - Database scripts to remove/drop PROBLEM table (inc. additional tables) - Fixe...
Marc-Danie NazaireMarc-Danie Nazaire
55e4445a5ebSHRINE2020-856 - Remove Dashboard App - Database scripts to remove/drop PROBLEM table (inc. additional tables) - Remo...
Marc-Danie NazaireMarc-Danie Nazaire
a6f761cf6e1Merge branches 'develop' and 'feature/SHRINE2020-856' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine in...
dwalenddwalend
b568fcbcc8eAdded a new censor regex for SHRINE2020-850
Marc-Danie NazaireMarc-Danie Nazaire
74305a7e78bFixed deprecated bit of unit test
Marc-Danie NazaireMarc-Danie Nazaire
7f431f61232Fixed broken test
Marc-Danie NazaireMarc-Danie Nazaire
50d66550e8cMerge pull request #1177 in SHRINE/shrine from bugfix/SHRINE2020-870 to develop * commit 'c78212c333c23419b64840607a...
Marc-Danie NazaireMarc-Danie Nazaire
01dcd83eb02SHRINE2020-866 - Remove reference to survey link on tutorial and on log out page - Edited text for step 3 and step 5
David WalendDavid Walend
8627f07f279Merge pull request #1180 in SHRINE/shrine from feature/SHRINE2020-823 to develop * commit '82efd7edfdd74f59284cff8d7...
Marc-Danie NazaireMarc-Danie Nazaire
8d7b4d0e6e3SHRINE2020-862 - Criteria is not pre-populated on editing query in case user restores session from the session expiry...
Marc-Danie NazaireMarc-Danie Nazaire
95629b28564SHRINE2020-862 - Criteria is not pre-populated on editing query in case user restores session from the session expiry...
Marc-Danie NazaireMarc-Danie Nazaire
b5f25b576ccMerge pull request #1173 in SHRINE/shrine from feature/SHRINE2020-852 to develop * commit 'e957e92eef6fa32bf120292aa...
Marc-Danie NazaireMarc-Danie Nazaire
46e47ec5faeSHRINE2020-862 - Criteria is not pre-populated on editing query in case user restores session from the session expiry...
dwalenddwalend
82efd7edfddUpdating help link for SHRINE2020-823
David WalendDavid Walend
98d39d847a1Merge pull request #1179 in SHRINE/shrine from feature/SHRINE2020-822 to develop * commit '8ad19cf14983437b8c5f41971...
dwalenddwalend
8ad19cf1498Added a comment about a future ticket
dwalenddwalend
9acb8c90e1aMerge remote-tracking branch 'origin/develop' into feature/SHRINE2020-822
David WalendDavid Walend
57273c6593dMerge pull request #1178 in SHRINE/shrine from feature/SHRINE2020-632 to develop * commit '72c6d779321191bf32842ad6a...
dwalenddwalend
72c6d779321Fix for SHRINE2020-868 from Marc-Danie
dwalenddwalend
3a704b84e5cMore review commets from Marc-Danie
dwalenddwalend
925f4334de5Review comments from Marc-Danie for SHRINE2020-632
dwalenddwalend
7622af50fefLast of the easy library upgrades for SHRINE2020-882
dwalenddwalend
0b41b9bfb4cUpgraded a lot of libraries for SHRINE2020-822
dwalenddwalend
f8694ce764fSimple review cleanup for SHRINE2020-632
dwalenddwalend
8cdb5c1857bMerging and more comments for SHRINE2020-632
dwalenddwalend
64d03b81a12Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-632
dwalenddwalend
ce550e4b8d8scalatest 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
fd321c0b376Merge pull request #1174 in SHRINE/shrine from feature/SHRINE2020-854 to develop * commit 'd51ad2f66c77c5beae024a674...
Marc-Danie NazaireMarc-Danie Nazaire
d51ad2f66c7SHRINE2020-854 - Remove Network Health feature - removed network health frontend dependency
dwalenddwalend
fbfe5e405b9Stray network health front-end dependency removed for SHRINE2020-632
dwalenddwalend
cd2878da3a3Merging in removal of network health for SHRINE2020-632
Marc-Danie NazaireMarc-Danie Nazaire
c78212c333cSHRINE2020-870 - Build version and info is not displayed under user profile - Added to unit test
Marc-Danie NazaireMarc-Danie Nazaire
195a13db44aSHRINE2020-870 - Build version and info is not displayed under user profile
Marc-Danie NazaireMarc-Danie Nazaire
e36014e94b9SHRINE2020-870 - Build version and info is not displayed under user profile
dwalenddwalend
7b12d99547aMerge remote-tracking branch 'origin/develop' into feature/SHRINE2020-632
dwalenddwalend
2dcc65d14abCouple more scala 2.13 parenethesis for SHRINE2020-632
Marc-Danie NazaireMarc-Danie Nazaire
de0cadbef05SHRINE2020-865 - Edit help text on reloading legacy query into new webclient - Removed css for the link to the legacy...
Marc-Danie NazaireMarc-Danie Nazaire
042c66c1472SHRINE2020-866 - Remove reference to survey link on tutorial and on log out page
Marc-Danie NazaireMarc-Danie Nazaire
c42f3d441d9SHRINE2020-865 - Edit help text on reloading legacy query into new webclient - Added testGetUnsupportedQueryReadableF...
dwalenddwalend
8207f081183app and war subproject changes for scala 2.13 for SHRINE2020-632
dwalenddwalend
f183c3e43f9Fixed aim3 services for scala 2.13 for SHRINE2020-632
Marc-Danie NazaireMarc-Danie Nazaire
b71b7b39a9eSHRINE2020-865 - Edit help text on reloading legacy query into new webclient
Marc-Danie NazaireMarc-Danie Nazaire
7ddef8cf80cSHRINE2020-854 - Remove Network Health feature - minor code reformatting
Marc-Danie NazaireMarc-Danie Nazaire
583b56568d3SHRINE2020-854 - Remove Network Health feature - fixed sql update
Marc-Danie NazaireMarc-Danie Nazaire
ba506ce15d6SHRINE2020-854 - Remove Network Health feature - fixed sql update
Marc-Danie NazaireMarc-Danie Nazaire
72da159fe31SHRINE2020-854 - Remove Network Health feature - fixed sql update
Marc-Danie NazaireMarc-Danie Nazaire
8f37706987fSHRINE2020-854 - Remove Network Health feature - fixed sql update
Marc-Danie NazaireMarc-Danie Nazaire
cf736e55c78SHRINE2020-854 - Remove Network Health feature
Marc-Danie NazaireMarc-Danie Nazaire
e957e92eef6SHRINE2020-852 - Clean additional 'dead' code for legacy SHRINE webclient - Fixed to return IO
Marc-Danie NazaireMarc-Danie Nazaire
22494bc318eSHRINE2020-852 - Clean additional 'dead' code for legacy SHRINE webclient - Fixed variable type
Marc-Danie NazaireMarc-Danie Nazaire
03cd2d51e09SHRINE2020-852 - Clean additional 'dead' code for legacy SHRINE webclient - Fixed variable type
Marc-Danie NazaireMarc-Danie Nazaire
1b09b939d5fSHRINE2020-852 - Clean additional 'dead' code for legacy SHRINE webclient
dwalenddwalend
4f6e6aeb015Fixes for the adapter for scala 2.13 for SHRINE2020-632
Marc-Danie NazaireMarc-Danie Nazaire
0c0339b4de5removed commented out code
Marc-Danie NazaireMarc-Danie Nazaire
8de705d998bMerge pull request #1168 in SHRINE/shrine from feature/SHRINE2020-220 to develop * commit '4e30f07b6eb75bfd93a8eb9aa...
Marc-Danie NazaireMarc-Danie Nazaire
a351626d416SHRINE2020-856 - Remove Dashboard App - Database scripts to remove/drop PROBLEM table (inc. additional tables)