 David Walend | 318e3a96b90 | Merge pull request #1281 in SHRINE/shrine from feature/SHRINE2020-1098 to develop
* commit 'ddc762553ebf579d82b6a00b... | | |
David Walend | 30c825a976b | Merge pull request #1280 in SHRINE/shrine from feature/SHRINE2020-1099 to develop
* commit '552bac5df834083dad11a66e... | | |
 Marc-Danie Nazaire | 48f627d6417 | Merge pull request #1284 in SHRINE/shrine from feature/SHRINE2020-1118 to develop
* commit '11df011ce110808fada49ee4... | | |
Marc-Danie Nazaire | 229946f77b1 | Merge pull request #1283 in SHRINE/shrine from bugfix/SHRINE2020-1105 to develop
* commit 'fb3ad47622b6becbaa62a9f3e... | | |
 dwalend | 6cf09b884ef | Almost got it in two - SHRINE2020-1100 | | |
dwalend | 1be72e890bc | Figuring out how these sql scripts get used for SHRINE2020-1100 | | |
Marc-Danie Nazaire | 11df011ce11 | Merge branch 'bugfix/SHRINE2020-1105' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRIN... | | |
Marc-Danie Nazaire | fb3ad47622b | SHRINE2020-1105 - Fix Kafka version in docker - Added new kafka url in zookeeper image | | |
dwalend | 9f9fcc4612f | First try at full translation for SHRINE2020-1100 | | |
Marc-Danie Nazaire | eb3d7183cca | SHRINE2020-1118 - Adjust user setup configuration for Kafka - remove unused file | | |
Marc-Danie Nazaire | a2a30769337 | SHRINE2020-1118 - Adjust user setup configuration for Kafka - code cleanup | | |
Marc-Danie Nazaire | cc535292e5c | SHRINE2020-1118 - Adjust user setup configuration for Kafka | | |
Marc-Danie Nazaire | 951172ebdbb | SHRINE2020-1105 - Fix Kafka version in docker | | |
dwalend | 1a7b806bd83 | Merge branch 'feature/SHRINE2020-1098' into feature/SHRINE2020-1098-post-rearrange | | |
dwalend | ddc762553eb | Merging | | |
dwalend | 552bac5df83 | merging | | |
David Walend | 0fe51bb399f | Merge pull request #1279 in SHRINE/shrine from feature/SHRINE2020-1073-design-v2-query-structure to develop
* commit... | | |
dwalend | 067c17eed3a | occursAtLeast is not an option for SHRINE2020-1098 | | |
dwalend | 7cf950e42ef | Clearer logic for a fix for SHRINE2020-1098 | | |
dwalend | 2508ad2cdac | Fixed some initial bugs for SHRINE2020-1098 | | |
dwalend | 8d10cb882fe | Found a bit of dead code to delete later from the DSA | | |
dwalend | fdadd33c8f0 | First try at interpreting the new query structure into i2b2 xml for SHRINE2020-1098 | | |
dwalend | f37c2b11644 | No longer building the i2b2 query .jar file for SHRINE2020-1098 | | |
dwalend | 02c14d06dea | Great rearrangement for SHRINE2020-1098 | | |
dwalend | 99a4a044f2e | More renaming - including that dreaded lower-case expressions.scala - for SHRINE2020-1098 | | |
dwalend | 8e78cd9b5b8 | Added an I2b2 prefix to the xml-basee QueryDefinition for SHRINE2020-1098 | | |
dwalend | 3b8ace41fc3 | Merging | | |
dwalend | 43a876b6b45 | Merging | | |
David Walend | 61593d1d69f | Merge pull request #1278 in SHRINE/shrine from feature/SHRINE2020-1114-replace-i2b2-resultoutputtype-with-queryoutput... | | |
dwalend | 1e0e261cee5 | Translating queries from QEP to v2 for SHRINE2020-1099 | | |
dwalend | e45e24f9305 | Merging | | |
dwalend | 7a7d40efb91 | Merge branch 'feature/SHRINE2020-1114-replace-i2b2-resultoutputtype-with-queryoutputs-in-v2-result' into feature/SHRI... | | |
dwalend | afd11b69982 | Need to merge, must commit first for SHRINE2020-1099 | | |
dwalend | 67fad7edebb | Turnd back on a test while working on SHRINE2020-1073 | | |
dwalend | 6951c891431 | Merging | | |
dwalend | deb704285e0 | Seqs are fine for SHRHINE2020-1073 | | |
dwalend | ebe66abba83 | merging | | |
dwalend | e71cd972f6d | Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-1114-replace-i2b2-resultoutputtype-with-queryou... | | |
dwalend | 615ca1fe7dc | Grand renaming for SHRINE2020-1073 | | |
dwalend | 89c4d4dcdea | Query structure initial design SHRINE2020-1073 | | |
David Walend | 9832d58adba | Merge pull request #1277 in SHRINE/shrine from feature/SHRINE2020-1113 to develop
* commit '081eb8ea5e183ccd795b8c0b... | | |
David Walend | 882a5dcd0a4 | Merge pull request #1276 in SHRINE/shrine from feature/SHRINE2020-1112 to develop
* commit '3be0b48ae80e63c356a0bf4f... | | |
dwalend | 3f558416220 | Checkpoint - cleaned out some old tests, but need to replace them for SHRINE2020-1114 | | |
dwalend | dd456fdaf52 | A little cleanup for SHRINE2020-1114 | | |
dwalend | 575374f769a | Field I needed to update was unused for SHRINE2020-1114 | | |
David Walend | 61e3c99d82d | Merge pull request #1275 in SHRINE/shrine from feature/SHRINE2020-1111 to develop
* commit '3fe3530b31411cd3583257b7... | | |
dwalend | 081eb8ea5e1 | Carry through the obfuscation parameters for SHRINE2020-1113 SHRINE-1717 and a piece of SHRINE-1716 | | |
dwalend | 63dd86565f6 | Merge branch 'feature/SHRINE2020-1112' into feature/SHRINE2020-1113 | | |
dwalend | 3be0b48ae80 | Passing the crc query id all the way through to the hub for SHRINE2020-1112 | | |
dwalend | 5356c950688 | SHRINE2020-1113 planning | | |
dwalend | 9e18bd6cc67 | Merging to pick up changes in test code and avoid something nasty later | | |
dwalend | 2cfed7e7fdc | Commit before merge for SHRINE2020-1112 and SHRINE-3109 | | |
dwalend | 64abe83ef9b | Need for that column to be nullable for SHRINE2020-703 | | |
dwalend | b7f08c9be66 | Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-1095 | | |
dwalend | 34323322f1b | merging | | |
David Walend | fb928281660 | Merge pull request #1274 in SHRINE/shrine from feature/SHRINE2020-703 to develop
* commit '3b0b1f0268c5e88866165b978... | | |
dwalend | 3fe3530b314 | Added shrine version to protocol for SHRINE2020-1111 and SHRINE-3581 | | |
dwalend | 3b0b1f0268c | Needs a table name for SHRINE2020-703 | | |
dwalend | 15b4632aa7f | Result status column for SHRINE2020-703 | | |
dwalend | 1409da4217f | Pausing work on SHRINE2020-703 until Bill is back Monday | | |
dwalend | 9db65f82973 | Tree structure examples for SHRINE2020-1073 to share with Bill (will not compile) | | |
David Walend | b1587a2dbb6 | Merge pull request #1272 in SHRINE/shrine from feature/SHRINE-3738 to develop
* commit '5e40a4d24c03881fbc0abdf4d12b... | | |
dwalend | ca73ef3d6b8 | Merge branch 'feature/SHRINE-3738' into feature/SHRINE2020-1073-design-v2-query-structure | | |
dwalend | 5e40a4d24c0 | Marc-Danie review suggestions for SHRINE-3738 | | |
dwalend | 9c60513029d | Query structure before review for SHRINE2020-1073 | | |
dwalend | 34f8655b564 | Made momId required for SHIRNE020-1095 | | |
dwalend | 2d1c89da48f | merge with develop | | |
dwalend | 395f7a2d650 | Merge woes | | |
David Walend | 71fb498fae5 | Merge pull request #1271 in SHRINE/shrine from SHRINE2020-710 to develop
* commit '3de39ccb788cbbb556ddeafa7d42f3f2a... | | |
dwalend | 3de39ccb788 | Review from Marc-Danie for SHRINE2020-710 | | |
dwalend | d9ba26b1b5c | Review check for SHRINE3738 | | |
dwalend | 5d634d0e79c | Removed the output xml from v2 Query for SHRINE-3738 | | |
dwalend | b58f123e018 | Added an enum of output types to Query for SHRINE-3738 | | |
David Walend | d8b7861861b | Merge pull request #1270 in SHRINE/shrine from feature/SHRINE2020-991-make-network-and-node-configuration-its-own-too... | | |
dwalend | 93988eb804e | Renamed the tool to ...lifecycle... for SHRINE2020-991 | | |
dwalend | fae054282b2 | Merge branch 'develop' into feature/SHRINE2020-991-make-network-and-node-configuration-its-own-tool-external-to-tomcat | | |
dwalend | 973bffb4afc | Adapter time required for UpdateResults for SHRINE2020-710 | | |
dwalend | 61ac3491eda | Marc-Danie found this prize while revewing SHRINE2020-991. I think it came from the first windows CMD in shrine and h... | | |
dwalend | ae3f2c8a4a0 | Review comments from Marc-Danie for SHRINE2020-991 | | |
dwalend | e53b4455f92 | Couple of peer review chasers from me for SHRINE2020-991 | | |
David Walend | 9f88d8acbe5 | Merge pull request #1269 in SHRINE/shrine from bugfix/SHRINE2020-1104 to develop
* commit '89a8b2a1e9d93a39d29ca3627... | | |
dwalend | f9b05a2d1c7 | Lots of doc and help for SHRINE2020-991 | | |
David Walend | 9205669fa42 | Merge pull request #1268 in SHRINE/shrine from feature/SHRINE2020-1096 to develop
* commit '1fb0c218b2583b2487d335f3... | | |
dwalend | 18f846b6754 | Removing some old scaffolding for SHRINE2020-991 | | |
dwalend | aab695b183a | Added the full suite of options for the network tool for SHRINE2020-991 | | |
dwalend | a0a517213e1 | shrine.conf location can be set via a -D property for SHRINE2020-991 | | |
dwalend | 3e8363a545d | Renamed the subproject for SHRINE2020-991 | | |
dwalend | 9d755303f93 | Logging cleanup for SHRINE2020-991 | | |
dwalend | f591c0cb583 | Added a delete network queues command to help clean up for SHRINE2020-991 | | |
dwalend | 80e88d882c5 | Add a node for SHRINE2020-991 | | |
dwalend | d1b6b5d277c | Some cleanup of create network before moving on to create node for SHRINE2020-991 | | |
dwalend | 7a03e2e4643 | Creating AWS SQS queues for SHRINE2020-991 | | |
dwalend | 38c2067caa2 | Creating the network in the database from a conf file for SHRINE2020-991 | | |
dwalend | b4f5bebeade | Bones of a command line tool to create a new network for SHRINE2020-991 | | |
dwalend | 89a8b2a1e9d | Comments to guide whoever fixes SHRINE2020-1104 | | |
 Carl Woolf | 0b704eb7b02 | Merge remote-tracking branch 'origin/develop' into develop | | |
Carl Woolf | 0f644f3fe93 | update kafka-version | | |
dwalend | 1fb0c218b25 | Merge remote-tracking branch 'origin/develop' into feature/SHRINE2018-1096 | | |
David Walend | aca8c9e13ec | Merge pull request #1267 in SHRINE/shrine from feature/SHRINE2020-982 to develop
* commit '7a302af939098dbdca6f07faa... | | |
dwalend | f022dddb649 | Kicking a bugfix into the future for SHRINE2020-1096 | | |
dwalend | 96b3524fc49 | Copied test code for the v2 protocol starting point for SHRINE2020-1096 | | |
dwalend | ae8782883dd | Added v2 parts as a copy of v1 parts for SHRINE2020-1096 | | |
dwalend | f0c8a054b43 | Start the move to v2 for SHRINE2020-1096 | | |
dwalend | 7a302af9390 | Wireup to test changes for SHRINE2020-982 | | |
dwalend | dca12f84f39 | Added the queue name to the policy name for SHRINE2020-982 | | |
dwalend | 23cce7f69bb | Got the AWS message queue service parts tied together for SHRINE2020-982 | | |
dwalend | b8c67f8ad3e | Added send actions for SHRINE2020-982 | | |
dwalend | 8395e7161b6 | Refactor before sender policy for SHRINE2020-982 | | |
dwalend | 7ed59c1007f | Receiver policy for SHRINE2020-982 | | |
dwalend | 198a3342eb7 | Found a way to add permissions - but only for whole account IDs. checkpointing before digging into SQS policies for S... | | |
dwalend | 37072fc83e8 | Removed some API we don't need for SHRINE2020-982 | | |
dwalend | db2a7b11880 | Tested out getting the queue properties from the hub for SHRINE2020-982 | | |
dwalend | 35f89fa8e88 | Get the config from the hub's shrine.conf or (even better) Network json, and share it through sharing the Network jso... | | |
dwalend | 0c534118369 | Moved the creation of the MessageQueueService out to the ShrineQueueClient where it can use the configuration shared ... | | |
dwalend | c10c11a00c9 | The hub can now serve AWS config for SHRINE2020-982 | | |
 Bamboo User | b8e82ab31ce | Merge release branch release/3.2.1 into master. | | |
Bamboo User | 0570b2453a8 | Update POMs with release version 3.2.1. | | |
dwalend | b74f18dc369 | Some surpise changes around signatures, and a quick patchfix for SHRINE2020-982 | | |
David Walend | ba07e6a9eec | Merge pull request #1266 in SHRINE/shrine from merge3.2.1-attempt2 to develop
* commit '290ef5209b57831fd579560da8bc... | | |
Marc-Danie Nazaire | b1f0a2fe2d7 | Merge pull request #1265 in SHRINE/shrine from feature/SHRINE2020-1077-merge-javscript-remaining-bits-from-3.2.1-to-d... | | |
dwalend | 290ef5209b5 | Cherry-picked changes from release/3.2.1 | | |
Marc-Danie Nazaire | b96d2716f90 | SHRINE2020-1077 - Merge javascript remaining bits from 3.2.1 to develop | | |
dwalend | d303b6f4cb2 | More better comments for SHRINE2020-999 | | |
dwalend | e32d07fa96e | Added a shrine version to checkmarx ignore commens for SHRINE2020-999 | | |
dwalend | ceaf1a27798 | Marked false positives from CheckMarx with comments for SHRINE2020-999 | | |
Marc-Danie Nazaire | 929f4eb300f | Merge remote-tracking branch 'origin/develop' into develop | | |
Marc-Danie Nazaire | 0328755a948 | Added missing shrine-docker-custom-lifecycle plugin back to docker pom.xml file | | |
David Walend | 72a35ecc6dc | Merge pull request #1260 in SHRINE/shrine from feature/SHRINE2020-1047-one-line-docker-command-to-build-shrine to dev... | | |
dwalend | dd909af6d41 | Review comments from Marc-Danie for SHRINE2020-1047 | | |
Marc-Danie Nazaire | 72f111d98bb | SHRINE2020-1061- Fix error caused by duplicate Content-Security-Policy service | | |
Marc-Danie Nazaire | efdb18536a0 | Merge pull request #1263 in SHRINE/shrine from bugfix/SHRINE2020-1061 to release/3.2.1
* commit '5e53cdd4f8d04a4a4b7... | | |
Marc-Danie Nazaire | 5e53cdd4f8d | SHRINE2020-1061- Fix definition of CSPReportService | | |
Marc-Danie Nazaire | 106e64aa763 | SHRINE2020 - 1061Fix error caused by duplicate Content-Security-Policy service | | |
Marc-Danie Nazaire | 76a6e16ed79 | Merge pull request #1262 in SHRINE/shrine from bugfix/SHRINE2020-1051 to develop
* commit '7a971d6a4852b7804f72df4d2... | | |
Marc-Danie Nazaire | 7a971d6a485 | SHRINE2020-1051-Build the dsa/frontend code just once, not twice | | |
Marc-Danie Nazaire | b9015cb1ec8 | SHRINE2020-1052 - Search Concepts > space is considered as invalid input and validation error is displayed in case of... | | |
Marc-Danie Nazaire | f5aa401e40c | Merge pull request #1261 in SHRINE/shrine from bugfix/SHRINE2020-1052 to release/3.2.1
* commit '777c25a340b143a57b8... | | |
Marc-Danie Nazaire | 777c25a340b | SHRINE2020-1052 - Search Concepts > space is considered as invalid input and validation error is displayed in case of... | | |
Marc-Danie Nazaire | 5c6c97f2593 | SHRINE2020-1052 - Search Concepts > space is considered as invalid input and validation error is displayed in case of... | | |
Marc-Danie Nazaire | da6101de8a4 | SHRINE2020-1052 - Search Concepts > space is considered as invalid input and validation error is displayed in case of... | | |
Marc-Danie Nazaire | b3f22021371 | SHRINE2020-1052 - Search Concepts > space is considered as invalid input and validation error is displayed in case of... | | |
David Walend | e18ccc3e35c | Merge pull request #1258 in SHRINE/shrine from feature/SHRINE2020-1048-take-advantage-of-external-volumes-source-code... | | |
dwalend | 5ac3e6fa878 | Readme.md for SHRINE2020-1047 | | |
dwalend | 11a3df4cef9 | Command line cleanup for SHRINE2020-1047 | | |
dwalend | 2226cb0fb65 | Script for automatic builds for SHRINE2020-1047 | | |
dwalend | 6cd6feaa4a0 | Refactoring to have common parts between developer and automated builds for SHRINE2020-1047 | | |
David Walend | 96d97aa3473 | Merge pull request #1251 in SHRINE/shrine from feature/SHRINE2020-1045-examine-and-maybe-tune-performance-of-building... | | |
dwalend | 47ab295f737 | Got the setup script working for SHRINE2020-1047 | | |
dwalend | c293a189c38 | Got it in one - script to build shrine in docker for SHRINE2020-1047 | | |
dwalend | a2c6d8d70f0 | Merge branch 'feature/SHRINE2020-1048-take-advantage-of-external-volumes-source-code-maven-repo' into feature/SHRINE2... | | |
Marc-Danie Nazaire | 733f021043d | Merge pull request #1259 in SHRINE/shrine from feature/SHRINE2020-1033 to develop
* commit 'a64a52e29dcf0e2273f92908... | | |
Marc-Danie Nazaire | a64a52e29dc | SHRINE2020-1033 -Add Content-Security-Policy header to all api responses from the server-side | | |
Marc-Danie Nazaire | cd6dab99fa5 | Merge pull request #1250 in SHRINE/shrine from feature/SHRINE2020-1012 to release/3.2.1
* commit '658d7e677cced397fb... | | |
dwalend | 54a25672ce3 | Looks like -v mounts are fine for .m2 and .npm caches for SHRINE2020-1048 | | |
Marc-Danie Nazaire | 658d7e677cc | SHRINE2020-1012 - Add Content-Security-Policy header to all api responses from the server-side - Also added Strict-Tr... | | |
Marc-Danie Nazaire | a6fdc4d13cf | Merge pull request #1257 in SHRINE/shrine from feature/SHRINE2020-1034 to develop
* commit 'f23d9b828bfddb8a0e2ddd35... | | |
Marc-Danie Nazaire | f23d9b828bf | SHRINE2020-1034 - Do not store username and password in dsa | | |
Marc-Danie Nazaire | 76546991fba | Merge pull request #1256 in SHRINE/shrine from feature/SHRINE2020-1032 to develop
* commit '5366f82d4955769004b42eb2... | | |
Marc-Danie Nazaire | 5366f82d495 | SHRINE2020-1032 - Add Strict-Transport-Security header to all api responses from the server-side | | |
Marc-Danie Nazaire | 25f09da620e | SHRINE2020-1032 - Add Strict-Transport-Security header to all api responses from the server-side | | |
Marc-Danie Nazaire | 3e972acf299 | Merge pull request #1255 in SHRINE/shrine from feature/SHRINE2020-1029 to develop
* commit '15919f0e9e1bf59dcae036d1... | | |
Marc-Danie Nazaire | 15919f0e9e1 | SHRINE2020-1029 - Sanitize user input data in dsa | | |
Marc-Danie Nazaire | 516d467571c | Merge pull request #1254 in SHRINE/shrine from feature/SHRINE2020-1028 to develop
* commit 'db0942e3a5be7ea73b215575... | | |
Marc-Danie Nazaire | db0942e3a5b | SHRINE2020-1028 - Sanitize user input data in shrine-webclient | | |
Marc-Danie Nazaire | ecd96445f5f | Merge pull request #1253 in SHRINE/shrine from feature/SHRINE2020-1031 to develop
* commit '4e9266010c39019c8be93ee9... | | |
Marc-Danie Nazaire | 4e9266010c3 | SHRINE2020-1031 - Set "rel" attribute in link to Data Steward help pdf - removed shrine-docker-custom-lifecycle-plugi... | | |
Marc-Danie Nazaire | 0a671fc4438 | SHRINE2020-1031 - Set "rel" attribute in link to Data Steward help pdf | | |
Marc-Danie Nazaire | 0d97dc8bbd3 | SHRINE2020-1012 - Add Content-Security-Policy header to all api responses from the server-side - Also added Strict-Tr... | | |
Marc-Danie Nazaire | 970707663f8 | Merge pull request #1252 in SHRINE/shrine from feature/SHRINE2020-1030 to develop
* commit 'b33c6bde8ca85c17851106d6... | | |
Marc-Danie Nazaire | b33c6bde8ca | SHRINE2020-1030 - Move unit tests into a separate folder in dsa - added kafka to docker readme when starting docker f... | | |
Marc-Danie Nazaire | 345e5e829d2 | SHRINE2020-1030 - Move unit tests into a separate folder in dsa - added docker custom lifecycle build extension | | |
Marc-Danie Nazaire | f33d12c26f9 | SHRINE2020-1030 - Move unit tests into a separate folder in dsa - uncommented build extension | | |
Marc-Danie Nazaire | 573bc804652 | SHRINE2020-1030 - Move unit tests into a separate folder in dsa - minor edit to rebuild | | |
dwalend | 7901a3b5f6d | No need to keep alpine around for SHRINE2020-1045 | | |
dwalend | 1cb6cdc88b4 | Pesky facts in a comment | | |
dwalend | e5c02e5b749 | Cleanup espeically of the mutagen option for SHRINE2020-1045 | | |
Marc-Danie Nazaire | aedaf277968 | SHRINE2020-1030 - Move unit tests into a separate folder in dsa | | |
Marc-Danie Nazaire | 06e40f37ac7 | Merge pull request #1249 in SHRINE/shrine from feature/SHRINE2020-1013 to release/3.2.1
* commit '257a47f4462a84df52... | | |
Marc-Danie Nazaire | 7563f6ef4a0 | Merge branch 'feature/SHRINE2020-1012' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRI... | | |
Marc-Danie Nazaire | a73f2571994 | SHRINE2020-1012 - Add Content-Security-Policy header to all api responses from the server-side - Also added Strict-Tr... | | |
Marc-Danie Nazaire | d80fb74801a | SHRINE-1012 - Add Content-Security-Policy header to all api responses from the server-side - Mounted CSPReportService... | | |
dwalend | 225e55ac5ff | Pretty good results with Mutagen SHRINE2020-1045 | | |
Marc-Danie Nazaire | fe653966d72 | SHRINE2020-1012 - Add Content-Security-Policy header to all api responses from the server-side - Added unsafe-eval to... | | |
dwalend | 0aabc7910e2 | Cleaned up the nfs-on-hosted parts and put some results in comments for SHRINE2020-1045 | | |
Marc-Danie Nazaire | 46e7d3f9c4b | SHRINE2020-1012 - Add Content-Security-Policy header to all api responses from the server-side - Removed styles src elem | | |
Marc-Danie Nazaire | fc1f310397c | SHRINE2020-1012 - Add Content-Security-Policy header to all api responses from the server-side - Added Content securi... | | |
Marc-Danie Nazaire | 2f6ab38fefe | SHRINE2020-1012 - Add Content-Security-Policy header to all api responses from the server-side | | |
Marc-Danie Nazaire | be2ec4ee1c7 | SHRINE2020-1012 - Add Content-Security-Policy header to all api responses from the server-side | | |
| Next → |
