SHRINE
  1. SHRINE

shrine

Public
  1. SHRINE
  2. shrine

All Branches Graph  

        
AuthorCommitMessageCommit dateBuilds
dwalenddwalend
abd2785f471Refactor before sender policy for SHRINE2020-982
dwalenddwalend
9501a5bcd15Receiver policy for SHRINE2020-982
dwalenddwalend
7d36527df0aFound a way to add permissions - but only for whole account IDs. checkpointing before digging into SQS policies for S...
dwalenddwalend
e0365c97b00Removed some API we don't need for SHRINE2020-982
dwalenddwalend
3dac7688210Tested out getting the queue properties from the hub for SHRINE2020-982
dwalenddwalend
dcf6ac5e6ecGet the config from the hub's shrine.conf or (even better) Network json, and share it through sharing the Network jso...
dwalenddwalend
3873960f85eMoved the creation of the MessageQueueService out to the ShrineQueueClient where it can use the configuration shared ...
dwalenddwalend
a2c844412d2The hub can now serve AWS config for SHRINE2020-982
Bamboo UserBamboo User
6a4a8e374afMerge release branch release/3.2.1 into master.
Bamboo UserBamboo User
027a1673fccUpdate POMs with release version 3.2.1.
dwalenddwalend
3ab6b35030aSome surpise changes around signatures, and a quick patchfix for SHRINE2020-982
David WalendDavid Walend
92c64cfa830Merge pull request #1266 in SHRINE/shrine from merge3.2.1-attempt2 to develop * commit '93016ebb3ecba6ab3171a3e51393...
Marc-Danie NazaireMarc-Danie Nazaire
3243ea44d4cMerge pull request #1265 in SHRINE/shrine from feature/SHRINE2020-1077-merge-javscript-remaining-bits-from-3.2.1-to-d...
dwalenddwalend
93016ebb3ecCherry-picked changes from release/3.2.1
Marc-Danie NazaireMarc-Danie Nazaire
babd3d0242eSHRINE2020-1077 - Merge javascript remaining bits from 3.2.1 to develop
dwalenddwalend
1cfa418dc1fMore better comments for SHRINE2020-999
dwalenddwalend
aa07daf9cc1Added a shrine version to checkmarx ignore commens for SHRINE2020-999
dwalenddwalend
ecb63c5be75Marked false positives from CheckMarx with comments for SHRINE2020-999
Marc-Danie NazaireMarc-Danie Nazaire
c35e99ab6f2Merge remote-tracking branch 'origin/develop' into develop
Marc-Danie NazaireMarc-Danie Nazaire
e147a7e3366Added missing shrine-docker-custom-lifecycle plugin back to docker pom.xml file
David WalendDavid Walend
e18911b3c01Merge pull request #1260 in SHRINE/shrine from feature/SHRINE2020-1047-one-line-docker-command-to-build-shrine to dev...
dwalenddwalend
6e043fb2914Review comments from Marc-Danie for SHRINE2020-1047
Marc-Danie NazaireMarc-Danie Nazaire
30e4c0593dbSHRINE2020-1061- Fix error caused by duplicate Content-Security-Policy service
Marc-Danie NazaireMarc-Danie Nazaire
2954152abefMerge pull request #1263 in SHRINE/shrine from bugfix/SHRINE2020-1061 to release/3.2.1 * commit 'b7ea7e38a8645cb4f18...
Marc-Danie NazaireMarc-Danie Nazaire
b7ea7e38a86SHRINE2020-1061- Fix definition of CSPReportService
Marc-Danie NazaireMarc-Danie Nazaire
b5e9ad4c2b7SHRINE2020 - 1061Fix error caused by duplicate Content-Security-Policy service
Marc-Danie NazaireMarc-Danie Nazaire
a1eeac43ed3Merge pull request #1262 in SHRINE/shrine from bugfix/SHRINE2020-1051 to develop * commit '53c8364971ecfe77434f49e73...
Marc-Danie NazaireMarc-Danie Nazaire
53c8364971eSHRINE2020-1051-Build the dsa/frontend code just once, not twice
Marc-Danie NazaireMarc-Danie Nazaire
df7b889ea91SHRINE2020-1052 - Search Concepts > space is considered as invalid input and validation error is displayed in case of...
Marc-Danie NazaireMarc-Danie Nazaire
5211d41e82eMerge pull request #1261 in SHRINE/shrine from bugfix/SHRINE2020-1052 to release/3.2.1 * commit 'edfe318292a1d6780fc...
Marc-Danie NazaireMarc-Danie Nazaire
edfe318292aSHRINE2020-1052 - Search Concepts > space is considered as invalid input and validation error is displayed in case of...
Marc-Danie NazaireMarc-Danie Nazaire
4ba4d1f63c2SHRINE2020-1052 - Search Concepts > space is considered as invalid input and validation error is displayed in case of...
Marc-Danie NazaireMarc-Danie Nazaire
7637cbdd2c5SHRINE2020-1052 - Search Concepts > space is considered as invalid input and validation error is displayed in case of...
Marc-Danie NazaireMarc-Danie Nazaire
17047b13e8bSHRINE2020-1052 - Search Concepts > space is considered as invalid input and validation error is displayed in case of...
David WalendDavid Walend
89355af83a9Merge pull request #1258 in SHRINE/shrine from feature/SHRINE2020-1048-take-advantage-of-external-volumes-source-code...
dwalenddwalend
7fb1c7e758cReadme.md for SHRINE2020-1047
dwalenddwalend
2b7f554079aCommand line cleanup for SHRINE2020-1047
dwalenddwalend
8ab720f2f01Script for automatic builds for SHRINE2020-1047
dwalenddwalend
5a0a8ce22c3Refactoring to have common parts between developer and automated builds for SHRINE2020-1047
David WalendDavid Walend
a43f7422cb3Merge pull request #1251 in SHRINE/shrine from feature/SHRINE2020-1045-examine-and-maybe-tune-performance-of-building...
dwalenddwalend
682a175d172Got the setup script working for SHRINE2020-1047
dwalenddwalend
af3f5597306Got it in one - script to build shrine in docker for SHRINE2020-1047
dwalenddwalend
a8d7a2fe786Merge branch 'feature/SHRINE2020-1048-take-advantage-of-external-volumes-source-code-maven-repo' into feature/SHRINE2...
Marc-Danie NazaireMarc-Danie Nazaire
adac7a946fdMerge pull request #1259 in SHRINE/shrine from feature/SHRINE2020-1033 to develop * commit 'e218ea1614da637376a682bd...
Marc-Danie NazaireMarc-Danie Nazaire
e218ea1614dSHRINE2020-1033 -Add Content-Security-Policy header to all api responses from the server-side
Marc-Danie NazaireMarc-Danie Nazaire
f0b0f44da6eMerge pull request #1250 in SHRINE/shrine from feature/SHRINE2020-1012 to release/3.2.1 * commit '935087dd11c73c406e...
dwalenddwalend
10f5f2fe0b2Looks like -v mounts are fine for .m2 and .npm caches for SHRINE2020-1048
Marc-Danie NazaireMarc-Danie Nazaire
935087dd11cSHRINE2020-1012 - Add Content-Security-Policy header to all api responses from the server-side - Also added Strict-Tr...
Marc-Danie NazaireMarc-Danie Nazaire
2f5a951868dMerge pull request #1257 in SHRINE/shrine from feature/SHRINE2020-1034 to develop * commit 'e2fb1a0eda55607609169d2e...
Marc-Danie NazaireMarc-Danie Nazaire
e2fb1a0eda5SHRINE2020-1034 - Do not store username and password in dsa
Marc-Danie NazaireMarc-Danie Nazaire
6b038575c8eMerge pull request #1256 in SHRINE/shrine from feature/SHRINE2020-1032 to develop * commit 'f5fc8d3017b72bac5c6abc05...
Marc-Danie NazaireMarc-Danie Nazaire
f5fc8d3017bSHRINE2020-1032 - Add Strict-Transport-Security header to all api responses from the server-side
Marc-Danie NazaireMarc-Danie Nazaire
80c3d74eda8SHRINE2020-1032 - Add Strict-Transport-Security header to all api responses from the server-side
Marc-Danie NazaireMarc-Danie Nazaire
e0ed6f53429Merge pull request #1255 in SHRINE/shrine from feature/SHRINE2020-1029 to develop * commit '04cb8b895da61f693e9ea11f...
Marc-Danie NazaireMarc-Danie Nazaire
04cb8b895daSHRINE2020-1029 - Sanitize user input data in dsa
Marc-Danie NazaireMarc-Danie Nazaire
3d93021ec82Merge pull request #1254 in SHRINE/shrine from feature/SHRINE2020-1028 to develop * commit 'bf0524071cfc21d700163501...
Marc-Danie NazaireMarc-Danie Nazaire
bf0524071cfSHRINE2020-1028 - Sanitize user input data in shrine-webclient
Marc-Danie NazaireMarc-Danie Nazaire
069b7b76125Merge pull request #1253 in SHRINE/shrine from feature/SHRINE2020-1031 to develop * commit 'babfcdd8be8350716fe4e1c0...
Marc-Danie NazaireMarc-Danie Nazaire
babfcdd8be8SHRINE2020-1031 - Set "rel" attribute in link to Data Steward help pdf - removed shrine-docker-custom-lifecycle-plugi...
Marc-Danie NazaireMarc-Danie Nazaire
d037a73da44SHRINE2020-1031 - Set "rel" attribute in link to Data Steward help pdf
Marc-Danie NazaireMarc-Danie Nazaire
1d0e783cab6SHRINE2020-1012 - Add Content-Security-Policy header to all api responses from the server-side - Also added Strict-Tr...
Marc-Danie NazaireMarc-Danie Nazaire
c2790924aaeMerge pull request #1252 in SHRINE/shrine from feature/SHRINE2020-1030 to develop * commit '8ca02e5ef916d46eb931798d...
Marc-Danie NazaireMarc-Danie Nazaire
8ca02e5ef91SHRINE2020-1030 - Move unit tests into a separate folder in dsa - added kafka to docker readme when starting docker f...
Marc-Danie NazaireMarc-Danie Nazaire
36f4b9aa152SHRINE2020-1030 - Move unit tests into a separate folder in dsa - added docker custom lifecycle build extension
Marc-Danie NazaireMarc-Danie Nazaire
cca35898706SHRINE2020-1030 - Move unit tests into a separate folder in dsa - uncommented build extension
Marc-Danie NazaireMarc-Danie Nazaire
037b3038e0bSHRINE2020-1030 - Move unit tests into a separate folder in dsa - minor edit to rebuild
dwalenddwalend
b19463415f5No need to keep alpine around for SHRINE2020-1045
dwalenddwalend
e071ca155bfPesky facts in a comment
dwalenddwalend
b26e491d7e8Cleanup espeically of the mutagen option for SHRINE2020-1045
Marc-Danie NazaireMarc-Danie Nazaire
99b14d73cb6SHRINE2020-1030 - Move unit tests into a separate folder in dsa
Marc-Danie NazaireMarc-Danie Nazaire
063cf9352b0Merge pull request #1249 in SHRINE/shrine from feature/SHRINE2020-1013 to release/3.2.1 * commit 'c5d65956374fbec1e3...
Marc-Danie NazaireMarc-Danie Nazaire
b67c7619d6eMerge branch 'feature/SHRINE2020-1012' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRI...
Marc-Danie NazaireMarc-Danie Nazaire
7c7ff738812SHRINE2020-1012 - Add Content-Security-Policy header to all api responses from the server-side - Also added Strict-Tr...
Marc-Danie NazaireMarc-Danie Nazaire
edacb7bbab4SHRINE-1012 - Add Content-Security-Policy header to all api responses from the server-side - Mounted CSPReportService...
dwalenddwalend
b0466a22f5dPretty good results with Mutagen SHRINE2020-1045
Marc-Danie NazaireMarc-Danie Nazaire
dfb5884878dSHRINE2020-1012 - Add Content-Security-Policy header to all api responses from the server-side - Added unsafe-eval to...
dwalenddwalend
4b071efc5aeCleaned up the nfs-on-hosted parts and put some results in comments for SHRINE2020-1045
Marc-Danie NazaireMarc-Danie Nazaire
aa210901e36SHRINE2020-1012 - Add Content-Security-Policy header to all api responses from the server-side - Removed styles src elem
Marc-Danie NazaireMarc-Danie Nazaire
d8355cb8b15SHRINE2020-1012 - Add Content-Security-Policy header to all api responses from the server-side - Added Content securi...
Marc-Danie NazaireMarc-Danie Nazaire
ba376c96259SHRINE2020-1012 - Add Content-Security-Policy header to all api responses from the server-side
Marc-Danie NazaireMarc-Danie Nazaire
2cc5af1a607SHRINE2020-1012 - Add Content-Security-Policy header to all api responses from the server-side
Marc-Danie NazaireMarc-Danie Nazaire
c5d65956374SHRINE2020-1013 - Do not store username and password in dsa - renamed toBase64 function
Marc-Danie NazaireMarc-Danie Nazaire
08d8071a6fbSHRINE2020-1013 - Do not store username and password in dsa - css changes
Marc-Danie NazaireMarc-Danie Nazaire
ea1ff2fc473SHRINE2020-1013 - Do not store username and password in dsa - Improved output on api call failure
dwalenddwalend
df6e42bea6bBit of magic to get the host system to mount nfs
dwalenddwalend
dd188063d69exploring nfs for SHRINE2020-1045
Marc-Danie NazaireMarc-Danie Nazaire
5f0f34ba1e2SHRINE2020-1013 - Do not store username and password in dsa - Modified to logout on authentication error
Marc-Danie NazaireMarc-Danie Nazaire
d4c67ee808dSHRINE2020-1013 - Do not store username and password in dsa
dwalenddwalend
9eb218cf23aStashing CentOS work to switch to an alpine nfs starting point for SHRINE2020-1045
Marc-Danie NazaireMarc-Danie Nazaire
92bd388c28fMerge pull request #1248 in SHRINE/shrine from feature/SHRINE2020-1039 to develop * commit '5f2ff45246a06061e7c153fa...
David WalendDavid Walend
1f13514487bMerge pull request #1243 in SHRINE/shrine from feature/SHRINE2020-1044-get-the-shrine-javascript-building-on-both-the...
Marc-Danie NazaireMarc-Danie Nazaire
5f2ff45246aSHRINE2020-1039 - Pickup docker kafka versions from pom file - Fixed working kakfa dir
Marc-Danie NazaireMarc-Danie Nazaire
85cd22dc058SHRINE2020-1039 - Pickup docker kafka versions from pom file - Added SCALA_VERSION variable to pom
Marc-Danie NazaireMarc-Danie Nazaire
7767d578b32SHRINE2020-1039 - Pickup docker kafka versions from pom file - Added SCALA_VERSION variable
Marc-Danie NazaireMarc-Danie Nazaire
9e5537e5007SHRINE2020-1039 - Pickup docker kafka versions from pom file - Added SCALA_VERSION variable
David WalendDavid Walend
e79a178a183Merge pull request #1241 in SHRINE/shrine from feature/SHRINE2020-1042 to develop * commit '8abb63205cb66af8325ec92f...
Marc-Danie NazaireMarc-Danie Nazaire
cca1fc7b501SHRINE2020-1039 - Pickup docker kafka versions from pom file - removed docker scripts from pom file
Marc-Danie NazaireMarc-Danie Nazaire
e012b3f665eSHRINE2020-1039 - Pickup docker kafka versions from pom file
Marc-Danie NazaireMarc-Danie Nazaire
897b687536dSHRINE2020-1039 - Pickup docker kafka versions from pom file
Marc-Danie NazaireMarc-Danie Nazaire
c25b66d6e9dMerge pull request #1247 in SHRINE/shrine from bugfix/SHRINE2020-1007 to feature/SHRINE2020-1020 * commit 'b5a562f0c...
Marc-Danie NazaireMarc-Danie Nazaire
0fe169ebd94Merge pull request #1246 in SHRINE/shrine from bugfix/SHRINE2020-1007 to release/3.2.1 * commit 'b5a562f0c3ff4bf17a4...
Marc-Danie NazaireMarc-Danie Nazaire
b5a562f0c3fSHRINE2020-1007 - Sanitize user input data in shrine-webclient - Fixed frontend test
Marc-Danie NazaireMarc-Danie Nazaire
1ac12602d76Merge pull request #1245 in SHRINE/shrine from bugfix/SHRINE2020-1007 to release/3.2.1 * commit '9f07b4bf6d29136d347...
Marc-Danie NazaireMarc-Danie Nazaire
7c64ecbd484Merge pull request #1244 in SHRINE/shrine from bugfix/SHRINE2020-1007 to feature/SHRINE2020-1020 * commit '9f07b4bf6...
Marc-Danie NazaireMarc-Danie Nazaire
9f07b4bf6d2SHRINE2020-1007 - Sanitize user input data in shrine-webclient - made topic validation same on webclient and dsq app
dwalenddwalend
d5446d9a48eChaser for a review comment from Marc-Danie for SHRINE2020-1042
Marc-Danie NazaireMarc-Danie Nazaire
76473e5e2cbMerge pull request #1235 in SHRINE/shrine from feature/SHRINE2020-989 to develop * commit '7b2eca443f0b39dbc2e92a32e...
Marc-Danie NazaireMarc-Danie Nazaire
ee5b1112f9aMerge pull request #1242 in SHRINE/shrine from bugfix/SHRINE2020-1011 to feature/SHRINE2020-1020 * commit 'f9ea2a0e7...
Marc-Danie NazaireMarc-Danie Nazaire
7b2eca443f0SHRINE2020-989- Research, Prototype and Choose client library to use for Kafka - Added fs2-kafka dependency version n...
Marc-Danie NazaireMarc-Danie Nazaire
744fd2ab556SHRINE2020-989- Research, Prototype and Choose client library to use for Kafka - removed wildcard import
Marc-Danie NazaireMarc-Danie Nazaire
d642713846cSHRINE2020-989- Research, Prototype and Choose client library to use for Kafka
Marc-Danie NazaireMarc-Danie Nazaire
1e38d890e43Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-989
dwalenddwalend
f826f272140Fix for SHRINE2020-1044 - get the build working when sharing a source directory between a host OS and a docker-hosted OS
Marc-Danie NazaireMarc-Danie Nazaire
f9ea2a0e7dcSHRINE2020-1011 - Add Strict-Transport-Security header to all api responses from the server-side - Added check for ma...
Marc-Danie NazaireMarc-Danie Nazaire
7d8d544eb3aSHRINE2020-1011 - Add Strict-Transport-Security header to all api responses from the server-side - Added missing depe...
Marc-Danie NazaireMarc-Danie Nazaire
31150d446b5SHRINE2020-1011 - Add Strict-Transport-Security header to all api responses from the server-side - Add unit test
dwalenddwalend
8abb63205cbSome cleanup before sending SHRINE2020-1041 SHRINE2020-1042 SHRINE2020-1043 for review
Marc-Danie NazaireMarc-Danie Nazaire
92e0afa650cSHRINE2020-1011 - Add Strict-Transport-Security header to all api responses from the server-side
dwalenddwalend
57d222c67f1Updating the hub tests to use junit 5 for SHRINE2020-1043
dwalenddwalend
4ef5e64dedfTry switching to just junit 5 to see if that fixes the intermittant failures for SHRINE2020-1043
dwalenddwalend
cb53ecdc9f3Try switching to just junit 5 to see if that fixes the intermittant failures for SHRINE2020-1043
Marc-Danie NazaireMarc-Danie Nazaire
bd25b50496cMerge pull request #1240 in SHRINE/shrine from bugfix/SHRINE2020-1008 to feature/SHRINE2020-1020 * commit '7be6236d0...
Marc-Danie NazaireMarc-Danie Nazaire
7be6236d00bSHRINE2020-1008 - Sanitize user input data in dsa - removed debug code
Marc-Danie NazaireMarc-Danie Nazaire
d2ba5047237SHRINE2020-1008 - Sanitize user input data in dsa - added comment
dwalenddwalend
1ca83819891Cleaned up a funky bit of unit test boilerplate to see if that helps SHRINE2020-1042
Marc-Danie NazaireMarc-Danie Nazaire
7c21904a0e6SHRINE2020-1008 - Sanitize user input data in dsa - minor edit
Marc-Danie NazaireMarc-Danie Nazaire
802ee4ab456SHRINE2020-1008 - Sanitize user input data in dsa - Added custom validation message when editing topic name and descr...
Marc-Danie NazaireMarc-Danie Nazaire
37640673aa1SHRINE2020-1008 - Sanitize user input data in dsa - Added custom validation message when editing topic name and descr...
Marc-Danie NazaireMarc-Danie Nazaire
e7c600fe524SHRINE2020-1008 - Sanitize user input data in dsa - Added custom validation message for new topic name and description
dwalenddwalend
6670c5e6264Cleaned up a funky bit of unit test boilerplate to see if that helps SHRINE2020-1042
Marc-Danie NazaireMarc-Danie Nazaire
5e6b30f767aSHRINE2020-1008 - Sanitize user input data in dsa - Added validation message for required inputs
Marc-Danie NazaireMarc-Danie Nazaire
c119f3e4995SHRINE2020-1008 - Sanitize user input data in dsa - Updated color of invalid text
Marc-Danie NazaireMarc-Danie Nazaire
7923e1aa836SHRINE2020-1008 - Sanitize user input data in dsa - Add validation to new topic input form
Marc-Danie NazaireMarc-Danie Nazaire
598c1b247d9Merge pull request #1239 in SHRINE/shrine from bugfix/SHRINE2020-1007 to feature/SHRINE2020-1020 * commit 'a862f8b71...
Marc-Danie NazaireMarc-Danie Nazaire
f648c44dfdcSHRINE2020-1008 - Sanitize user input data in dsa - Add validation to new topic input form
Marc-Danie NazaireMarc-Danie Nazaire
42682b76233SHRINE2020-1008 - Sanitize user input data in dsa - Add validation to new topic input form
Marc-Danie NazaireMarc-Danie Nazaire
312a3e740feSHRINE2020-1008 - Sanitize user input data in dsa - Add validation to new topic input form
Marc-Danie NazaireMarc-Danie Nazaire
0de226f8e57SHRINE2020-1008 - Sanitize user input data in dsa - Add validation to new topic input form
Marc-Danie NazaireMarc-Danie Nazaire
7604f9e37a0SHRINE2020-1008 - Sanitize user input data in dsa - Add validation to new topic input form
Marc-Danie NazaireMarc-Danie Nazaire
900299201c9SHRINE2020-1008 - Sanitize user input data in dsa - Add validation to new topic input form
Marc-Danie NazaireMarc-Danie Nazaire
74d3d2b4d3fSHRINE2020-1008 - Sanitize user input data in dsa - Add validation to new topic input form
dwalenddwalend
791df5f7683Try sorting the files to stabalize a test for SHRINE2020-1042
dwalenddwalend
acf12068927Fixed a problem with brittle time tests for SHRINE2020-1042
Marc-Danie NazaireMarc-Danie Nazaire
a862f8b71acSHRINE2020-1007 - Sanitize user input data in shrine-webclient - Fixed frontend tests
Marc-Danie NazaireMarc-Danie Nazaire
8f08dc64e3fSHRINE2020-1007 - Sanitize user input data in shrine-webclient - Add check for invalid characters in the medical conc...
Marc-Danie NazaireMarc-Danie Nazaire
9a15b9cf1e6SHRINE2020-1007 - Sanitize user input data in shrine-webclient - Add check for invalid characters in the medical conc...
Marc-Danie NazaireMarc-Danie Nazaire
5e67a5e5ca0SHRINE2020-1007 - Sanitize user input data in shrine-webclient - removed unused property
Marc-Danie NazaireMarc-Danie Nazaire
fe0bf55a634SHRINE2020-1007 - Sanitize user input data in shrine-webclient - removed unused property
Marc-Danie NazaireMarc-Danie Nazaire
2c30076d5f1SHRINE2020-1007 - Sanitize user input data in shrine-webclient - Add check for invalid characters in the topic name a...
David WalendDavid Walend
25c9a5a18c0Merge pull request #1238 in SHRINE/shrine from feature/SHRINE2020-1022 to feature/SHRINE2020-1020 * commit '8101da7e...
David WalendDavid Walend
58a790389fcMerge pull request #1233 in SHRINE/shrine from feature/SHRINE2020-1023 to feature/SHRINE2020-1020 * commit '7fefb83d...
David WalendDavid Walend
3f9ba2027daMerge pull request #1232 in SHRINE/shrine from feature/SHRINE2020-1024 to feature/SHRINE2020-1020 * commit 'c217481a...
dwalenddwalend
c217481a0ddReview from Marc-Danie for SHRINE2020-1024
David WalendDavid Walend
4ef68962d5cMerge pull request #1231 in SHRINE/shrine from feature/SHRINE2020-1025 to feature/SHRINE2020-1020 * commit '0c90f09f...
Marc-Danie NazaireMarc-Danie Nazaire
31d56946531Merge pull request #1236 in SHRINE/shrine from bugfix/SHRINE2020-1010 to feature/SHRINE2020-1020 * commit '8a421830c...
David WalendDavid Walend
e8683ea968bMerge pull request #1230 in SHRINE/shrine from bugfix/SHRINE2020-1035 to feature/SHRINE2020-1020 * commit 'd785ab0e7...
dwalenddwalend
0c90f09f0a8Review fix for SHRINE2020-1025
dwalenddwalend
d785ab0e727Don't need these arguments for SHRINE2020-1035
Marc-Danie NazaireMarc-Danie Nazaire
8a421830c2aMerge branch 'feature/SHRINE2020-1020' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into bugfix/SHRIN...
Marc-Danie NazaireMarc-Danie Nazaire
30fd3b7cc03Merge pull request #1237 in SHRINE/shrine from bugfix/SHRINE2020-1009 to feature/SHRINE2020-1020 * commit '9518a8983...
Marc-Danie NazaireMarc-Danie Nazaire
780a3c6cdd5SHRINE2020-1010 - Set "rel" attribute in link to Data Steward help pdf
Marc-Danie NazaireMarc-Danie Nazaire
9518a898390SHRINE2020-1009 - Move unit tests into a separate folder in dsa - Moved all dsa frontend tests to a __tests__ directory
Marc-Danie NazaireMarc-Danie Nazaire
686b7f1a189SHRINE2020-1009 - Move unit tests into a separate folder in dsa - Modified so that dsa frontend tests are run and fix...
David WalendDavid Walend
e8dc5882509Merge pull request #1234 in SHRINE/shrine from bugfix/SHRINE2020-1036 to develop * commit '16c110e7e33cd3a2d87b0fbac...
Marc-Danie NazaireMarc-Danie Nazaire
309a04cfcabSHRINE2020-989 - Research, Prototype and Choose client library to use for Kafka - Renamed some variables
Marc-Danie NazaireMarc-Danie Nazaire
e98235d4407SHRINE2020-989 - Research, Prototype and Choose client library to use for Kafka - Cleanup up debug statements and ren...
Marc-Danie NazaireMarc-Danie Nazaire
ae6dfdfc827SHRINE2020-989 - Research, Prototype and Choose client library to use for Kafka - Added KafkaClientTest
Marc-Danie NazaireMarc-Danie Nazaire
85c296964c6SHRINE2020-989 - Research, Prototype and Choose client library to use for Kafka - Added environment variables to mvn ...
Marc-Danie NazaireMarc-Danie Nazaire
03f70911712SHRINE2020-989 - Research, Prototype and Choose client library to use for Kafka - Removed kafka directory and moved k...
Marc-Danie NazaireMarc-Danie Nazaire
2490943c18fSHRINE2020-989 - Research, Prototype and Choose client library to use for Kafka - Remove commented out section from p...
dwalenddwalend
16c110e7e33Changed bach to 'name' for SHRINE2020-1036
dwalenddwalend
8101da7e7bcCherry-picking SHRINE2020-1000 for SHRINE2020-1022
dwalenddwalend
a1b419df2d4Switched to using secure random, even for IDs for SHRINE2020-1000
dwalenddwalend
7fefb83d7e8Cherry-picking SHRINE2020-1001 for SHRINE2020-1023
dwalenddwalend
56bb0b769beMore Cherry-picking SHRINE2020-1002 for SHRINE2020-1024
dwalenddwalend
cd50f5bebe4Cherry-picking SHRINE2020-1002 for SHRINE2020-1024
dwalenddwalend
5919a119e53Cherry picking from SHRINE2020-1003 for SHRINE2020-1025
dwalenddwalend
85d0e431d8bDon't need that CredentialsConfig object, deleted for SHRINE2020-1003
dwalenddwalend
548393f36caPlanning for SHRINE2020-1003
Marc-Danie NazaireMarc-Danie Nazaire
19cccb72aa7SHRINE2020-989 - Research, Prototype and Choose client library to use for Kafka - Added example kafka config to shrin...
Marc-Danie NazaireMarc-Danie Nazaire
5c469a7e096Merge remote-tracking branch 'origin/feature/SHRINE2020-989' into feature/SHRINE2020-989
Marc-Danie NazaireMarc-Danie Nazaire
b90bef43d63Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-989  Co...
Marc-Danie NazaireMarc-Danie Nazaire
2d154045c45Merge pull request #1224 in SHRINE/shrine from feature/SHRINE2020-977 to develop * commit 'ee7151036ffdb7d26869fe811...
Marc-Danie NazaireMarc-Danie Nazaire
ee7151036ffMerge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-977  Co...
dwalenddwalend
a9bfa8b4cdcPulled in the fixes to tests to get the build working for SHRINE2020-1035
dwalenddwalend
df5a1778d88More of the test fixes for SHRINE2020-1035
dwalenddwalend
06b75ae3f73Cherry picking test fixes for SHRINE2020-1035
Marc-Danie NazaireMarc-Danie Nazaire
2fe0e3b6fb0Merge pull request #1220 in SHRINE/shrine from feature/SHRINE2020-974 to develop * commit 'c77d971d850258a197fe09354...