 dwalend | 901c11c8b98 | Clearer logic for a fix for SHRINE2020-1098 | | |
dwalend | 62bb9d04233 | Fixed some initial bugs for SHRINE2020-1098 | | |
dwalend | 2a5cdb59b44 | Found a bit of dead code to delete later from the DSA | | |
dwalend | ebf09fabb32 | First try at interpreting the new query structure into i2b2 xml for SHRINE2020-1098 | | |
dwalend | 16e79f10786 | No longer building the i2b2 query .jar file for SHRINE2020-1098 | | |
dwalend | 346e0f022af | Great rearrangement for SHRINE2020-1098 | | |
dwalend | 1e3f7295ce6 | More renaming - including that dreaded lower-case expressions.scala - for SHRINE2020-1098 | | |
dwalend | 7532aa6afe8 | Added an I2b2 prefix to the xml-basee QueryDefinition for SHRINE2020-1098 | | |
dwalend | 14a9894a5d9 | Merging | | |
dwalend | eb22b774179 | Merging | | |
 David Walend | 040cdd52f50 | Merge pull request #1278 in SHRINE/shrine from feature/SHRINE2020-1114-replace-i2b2-resultoutputtype-with-queryoutput... | | |
dwalend | dea60790490 | Translating queries from QEP to v2 for SHRINE2020-1099 | | |
dwalend | 35e4a907d6b | Merging | | |
dwalend | 072ce66c1c4 | Merge branch 'feature/SHRINE2020-1114-replace-i2b2-resultoutputtype-with-queryoutputs-in-v2-result' into feature/SHRI... | | |
dwalend | ce1a4feb9eb | Need to merge, must commit first for SHRINE2020-1099 | | |
dwalend | ce5d9b3768d | Turnd back on a test while working on SHRINE2020-1073 | | |
dwalend | 040fc838441 | Merging | | |
dwalend | 4052e6d37f3 | Seqs are fine for SHRHINE2020-1073 | | |
dwalend | 7fcb96f6dbc | merging | | |
dwalend | 9cb679575fe | Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-1114-replace-i2b2-resultoutputtype-with-queryou... | | |
dwalend | 7cd189379b1 | Grand renaming for SHRINE2020-1073 | | |
dwalend | 39e9a4f15bc | Query structure initial design SHRINE2020-1073 | | |
David Walend | 3868980d345 | Merge pull request #1277 in SHRINE/shrine from feature/SHRINE2020-1113 to develop
* commit '403a27f8186794e5bc052f16... | | |
David Walend | d65bd623e16 | Merge pull request #1276 in SHRINE/shrine from feature/SHRINE2020-1112 to develop
* commit '335498a33b32d9855793cbbd... | | |
dwalend | 5957750432d | Checkpoint - cleaned out some old tests, but need to replace them for SHRINE2020-1114 | | |
dwalend | 6e03ecb051b | A little cleanup for SHRINE2020-1114 | | |
dwalend | 89813223587 | Field I needed to update was unused for SHRINE2020-1114 | | |
David Walend | 24be6bc097a | Merge pull request #1275 in SHRINE/shrine from feature/SHRINE2020-1111 to develop
* commit '0622e62bc2be8ee8309e2502... | | |
dwalend | 403a27f8186 | Carry through the obfuscation parameters for SHRINE2020-1113 SHRINE-1717 and a piece of SHRINE-1716 | | |
dwalend | 25333bbae58 | Merge branch 'feature/SHRINE2020-1112' into feature/SHRINE2020-1113 | | |
dwalend | 335498a33b3 | Passing the crc query id all the way through to the hub for SHRINE2020-1112 | | |
dwalend | cb1f90ce1a7 | SHRINE2020-1113 planning | | |
dwalend | 4d424381fe4 | Merging to pick up changes in test code and avoid something nasty later | | |
dwalend | 9992edb1683 | Commit before merge for SHRINE2020-1112 and SHRINE-3109 | | |
dwalend | 6a98a4d5ee0 | Need for that column to be nullable for SHRINE2020-703 | | |
dwalend | a05928be22f | Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-1095 | | |
dwalend | 73e9d30d48b | merging | | |
David Walend | c1727d49756 | Merge pull request #1274 in SHRINE/shrine from feature/SHRINE2020-703 to develop
* commit '179c0892f03088a48a163dfce... | | |
dwalend | 0622e62bc2b | Added shrine version to protocol for SHRINE2020-1111 and SHRINE-3581 | | |
dwalend | 179c0892f03 | Needs a table name for SHRINE2020-703 | | |
dwalend | 3062ce5de0e | Result status column for SHRINE2020-703 | | |
dwalend | 87e481bc99d | Pausing work on SHRINE2020-703 until Bill is back Monday | | |
dwalend | 621ed557e1e | Tree structure examples for SHRINE2020-1073 to share with Bill (will not compile) | | |
David Walend | d84b9340097 | Merge pull request #1272 in SHRINE/shrine from feature/SHRINE-3738 to develop
* commit '1a1e6a8f9855e124c2f8909f7377... | | |
dwalend | 0da2a9a9771 | Merge branch 'feature/SHRINE-3738' into feature/SHRINE2020-1073-design-v2-query-structure | | |
dwalend | 1a1e6a8f985 | Marc-Danie review suggestions for SHRINE-3738 | | |
dwalend | 2374ec26585 | Query structure before review for SHRINE2020-1073 | | |
dwalend | 49c98155a22 | Made momId required for SHIRNE020-1095 | | |
dwalend | 2b5ed1dd12d | merge with develop | | |
dwalend | 706ff5419c5 | Merge woes | | |
David Walend | 14ae673a536 | Merge pull request #1271 in SHRINE/shrine from SHRINE2020-710 to develop
* commit 'ebbe74f678d25b9802c57f1d7357b4f12... | | |
dwalend | ebbe74f678d | Review from Marc-Danie for SHRINE2020-710 | | |
dwalend | 42e551b9bf6 | Review check for SHRINE3738 | | |
dwalend | 4ddb8cd675c | Removed the output xml from v2 Query for SHRINE-3738 | | |
dwalend | c74d09a7ae5 | Added an enum of output types to Query for SHRINE-3738 | | |
David Walend | cff2a290392 | Merge pull request #1270 in SHRINE/shrine from feature/SHRINE2020-991-make-network-and-node-configuration-its-own-too... | | |
dwalend | 2ee3cefcd98 | Renamed the tool to ...lifecycle... for SHRINE2020-991 | | |
dwalend | bc5862118f2 | Merge branch 'develop' into feature/SHRINE2020-991-make-network-and-node-configuration-its-own-tool-external-to-tomcat | | |
dwalend | 74641895cb4 | Adapter time required for UpdateResults for SHRINE2020-710 | | |
dwalend | a3f0777fc65 | Marc-Danie found this prize while revewing SHRINE2020-991. I think it came from the first windows CMD in shrine and h... | | |
dwalend | 102e60e131f | Review comments from Marc-Danie for SHRINE2020-991 | | |
dwalend | f7557f19ecf | Couple of peer review chasers from me for SHRINE2020-991 | | |
David Walend | 95d767cd18c | Merge pull request #1269 in SHRINE/shrine from bugfix/SHRINE2020-1104 to develop
* commit 'adf75f6798218233d22701d06... | | |
dwalend | 7e753c446da | Lots of doc and help for SHRINE2020-991 | | |
David Walend | 1eb3f3e9563 | Merge pull request #1268 in SHRINE/shrine from feature/SHRINE2020-1096 to develop
* commit 'f0665818afd510906aadf1a9... | | |
dwalend | dfe49766072 | Removing some old scaffolding for SHRINE2020-991 | | |
dwalend | 5ca66d89014 | Added the full suite of options for the network tool for SHRINE2020-991 | | |
dwalend | d398390492d | shrine.conf location can be set via a -D property for SHRINE2020-991 | | |
dwalend | 6611946c50c | Renamed the subproject for SHRINE2020-991 | | |
dwalend | 7b7d607aa6f | Logging cleanup for SHRINE2020-991 | | |
dwalend | b0ffe365bac | Added a delete network queues command to help clean up for SHRINE2020-991 | | |
dwalend | 9e87035b956 | Add a node for SHRINE2020-991 | | |
dwalend | 09d22198375 | Some cleanup of create network before moving on to create node for SHRINE2020-991 | | |
dwalend | 9c6042206e2 | Creating AWS SQS queues for SHRINE2020-991 | | |
dwalend | 5a72f11f8a8 | Creating the network in the database from a conf file for SHRINE2020-991 | | |
dwalend | 598e94f810f | Bones of a command line tool to create a new network for SHRINE2020-991 | | |
dwalend | adf75f67982 | Comments to guide whoever fixes SHRINE2020-1104 | | |
 Carl Woolf | d4c1938065e | Merge remote-tracking branch 'origin/develop' into develop | | |
Carl Woolf | b9427c8d8a8 | update kafka-version | | |
dwalend | f0665818afd | Merge remote-tracking branch 'origin/develop' into feature/SHRINE2018-1096 | | |
David Walend | 657e9255dfd | Merge pull request #1267 in SHRINE/shrine from feature/SHRINE2020-982 to develop
* commit 'e1f202e923667b7c4445b6a52... | | |
dwalend | 5ec8f995690 | Kicking a bugfix into the future for SHRINE2020-1096 | | |
dwalend | f89195d0fca | Copied test code for the v2 protocol starting point for SHRINE2020-1096 | | |
dwalend | 8f7bffd43d3 | Added v2 parts as a copy of v1 parts for SHRINE2020-1096 | | |
dwalend | 0a2167f6d37 | Start the move to v2 for SHRINE2020-1096 | | |
dwalend | e1f202e9236 | Wireup to test changes for SHRINE2020-982 | | |
dwalend | f380746ffe7 | Added the queue name to the policy name for SHRINE2020-982 | | |
dwalend | 04194f8aae2 | Got the AWS message queue service parts tied together for SHRINE2020-982 | | |
dwalend | 3a25d4a29e4 | Added send actions for SHRINE2020-982 | | |
dwalend | abd2785f471 | Refactor before sender policy for SHRINE2020-982 | | |
dwalend | 9501a5bcd15 | Receiver policy for SHRINE2020-982 | | |
dwalend | 7d36527df0a | Found a way to add permissions - but only for whole account IDs. checkpointing before digging into SQS policies for S... | | |
dwalend | e0365c97b00 | Removed some API we don't need for SHRINE2020-982 | | |
dwalend | 3dac7688210 | Tested out getting the queue properties from the hub for SHRINE2020-982 | | |
dwalend | dcf6ac5e6ec | Get the config from the hub's shrine.conf or (even better) Network json, and share it through sharing the Network jso... | | |
dwalend | 3873960f85e | Moved the creation of the MessageQueueService out to the ShrineQueueClient where it can use the configuration shared ... | | |
dwalend | a2c844412d2 | The hub can now serve AWS config for SHRINE2020-982 | | |
 Bamboo User | 6a4a8e374af | Merge release branch release/3.2.1 into master. | | |
Bamboo User | 027a1673fcc | Update POMs with release version 3.2.1. | | |
dwalend | 3ab6b35030a | Some surpise changes around signatures, and a quick patchfix for SHRINE2020-982 | | |
David Walend | 92c64cfa830 | Merge pull request #1266 in SHRINE/shrine from merge3.2.1-attempt2 to develop
* commit '93016ebb3ecba6ab3171a3e51393... | | |
 Marc-Danie Nazaire | 3243ea44d4c | Merge pull request #1265 in SHRINE/shrine from feature/SHRINE2020-1077-merge-javscript-remaining-bits-from-3.2.1-to-d... | | |
dwalend | 93016ebb3ec | Cherry-picked changes from release/3.2.1 | | |
Marc-Danie Nazaire | babd3d0242e | SHRINE2020-1077 - Merge javascript remaining bits from 3.2.1 to develop | | |
dwalend | 1cfa418dc1f | More better comments for SHRINE2020-999 | | |
dwalend | aa07daf9cc1 | Added a shrine version to checkmarx ignore commens for SHRINE2020-999 | | |
dwalend | ecb63c5be75 | Marked false positives from CheckMarx with comments for SHRINE2020-999 | | |
Marc-Danie Nazaire | c35e99ab6f2 | Merge remote-tracking branch 'origin/develop' into develop | | |
Marc-Danie Nazaire | e147a7e3366 | Added missing shrine-docker-custom-lifecycle plugin back to docker pom.xml file | | |
David Walend | e18911b3c01 | Merge pull request #1260 in SHRINE/shrine from feature/SHRINE2020-1047-one-line-docker-command-to-build-shrine to dev... | | |
dwalend | 6e043fb2914 | Review comments from Marc-Danie for SHRINE2020-1047 | | |
Marc-Danie Nazaire | 30e4c0593db | SHRINE2020-1061- Fix error caused by duplicate Content-Security-Policy service | | |
Marc-Danie Nazaire | 2954152abef | Merge pull request #1263 in SHRINE/shrine from bugfix/SHRINE2020-1061 to release/3.2.1
* commit 'b7ea7e38a8645cb4f18... | | |
Marc-Danie Nazaire | b7ea7e38a86 | SHRINE2020-1061- Fix definition of CSPReportService | | |
Marc-Danie Nazaire | b5e9ad4c2b7 | SHRINE2020 - 1061Fix error caused by duplicate Content-Security-Policy service | | |
Marc-Danie Nazaire | a1eeac43ed3 | Merge pull request #1262 in SHRINE/shrine from bugfix/SHRINE2020-1051 to develop
* commit '53c8364971ecfe77434f49e73... | | |
Marc-Danie Nazaire | 53c8364971e | SHRINE2020-1051-Build the dsa/frontend code just once, not twice | | |
Marc-Danie Nazaire | df7b889ea91 | SHRINE2020-1052 - Search Concepts > space is considered as invalid input and validation error is displayed in case of... | | |
Marc-Danie Nazaire | 5211d41e82e | Merge pull request #1261 in SHRINE/shrine from bugfix/SHRINE2020-1052 to release/3.2.1
* commit 'edfe318292a1d6780fc... | | |
Marc-Danie Nazaire | edfe318292a | SHRINE2020-1052 - Search Concepts > space is considered as invalid input and validation error is displayed in case of... | | |
Marc-Danie Nazaire | 4ba4d1f63c2 | SHRINE2020-1052 - Search Concepts > space is considered as invalid input and validation error is displayed in case of... | | |
Marc-Danie Nazaire | 7637cbdd2c5 | SHRINE2020-1052 - Search Concepts > space is considered as invalid input and validation error is displayed in case of... | | |
Marc-Danie Nazaire | 17047b13e8b | SHRINE2020-1052 - Search Concepts > space is considered as invalid input and validation error is displayed in case of... | | |
David Walend | 89355af83a9 | Merge pull request #1258 in SHRINE/shrine from feature/SHRINE2020-1048-take-advantage-of-external-volumes-source-code... | | |
dwalend | 7fb1c7e758c | Readme.md for SHRINE2020-1047 | | |
dwalend | 2b7f554079a | Command line cleanup for SHRINE2020-1047 | | |
dwalend | 8ab720f2f01 | Script for automatic builds for SHRINE2020-1047 | | |
dwalend | 5a0a8ce22c3 | Refactoring to have common parts between developer and automated builds for SHRINE2020-1047 | | |
David Walend | a43f7422cb3 | Merge pull request #1251 in SHRINE/shrine from feature/SHRINE2020-1045-examine-and-maybe-tune-performance-of-building... | | |
dwalend | 682a175d172 | Got the setup script working for SHRINE2020-1047 | | |
dwalend | af3f5597306 | Got it in one - script to build shrine in docker for SHRINE2020-1047 | | |
dwalend | a8d7a2fe786 | Merge branch 'feature/SHRINE2020-1048-take-advantage-of-external-volumes-source-code-maven-repo' into feature/SHRINE2... | | |
Marc-Danie Nazaire | adac7a946fd | Merge pull request #1259 in SHRINE/shrine from feature/SHRINE2020-1033 to develop
* commit 'e218ea1614da637376a682bd... | | |
Marc-Danie Nazaire | e218ea1614d | SHRINE2020-1033 -Add Content-Security-Policy header to all api responses from the server-side | | |
Marc-Danie Nazaire | f0b0f44da6e | Merge pull request #1250 in SHRINE/shrine from feature/SHRINE2020-1012 to release/3.2.1
* commit '935087dd11c73c406e... | | |
dwalend | 10f5f2fe0b2 | Looks like -v mounts are fine for .m2 and .npm caches for SHRINE2020-1048 | | |
Marc-Danie Nazaire | 935087dd11c | SHRINE2020-1012 - Add Content-Security-Policy header to all api responses from the server-side - Also added Strict-Tr... | | |
Marc-Danie Nazaire | 2f5a951868d | Merge pull request #1257 in SHRINE/shrine from feature/SHRINE2020-1034 to develop
* commit 'e2fb1a0eda55607609169d2e... | | |
Marc-Danie Nazaire | e2fb1a0eda5 | SHRINE2020-1034 - Do not store username and password in dsa | | |
Marc-Danie Nazaire | 6b038575c8e | Merge pull request #1256 in SHRINE/shrine from feature/SHRINE2020-1032 to develop
* commit 'f5fc8d3017b72bac5c6abc05... | | |
Marc-Danie Nazaire | f5fc8d3017b | SHRINE2020-1032 - Add Strict-Transport-Security header to all api responses from the server-side | | |
Marc-Danie Nazaire | 80c3d74eda8 | SHRINE2020-1032 - Add Strict-Transport-Security header to all api responses from the server-side | | |
Marc-Danie Nazaire | e0ed6f53429 | Merge pull request #1255 in SHRINE/shrine from feature/SHRINE2020-1029 to develop
* commit '04cb8b895da61f693e9ea11f... | | |
Marc-Danie Nazaire | 04cb8b895da | SHRINE2020-1029 - Sanitize user input data in dsa | | |
Marc-Danie Nazaire | 3d93021ec82 | Merge pull request #1254 in SHRINE/shrine from feature/SHRINE2020-1028 to develop
* commit 'bf0524071cfc21d700163501... | | |
Marc-Danie Nazaire | bf0524071cf | SHRINE2020-1028 - Sanitize user input data in shrine-webclient | | |
Marc-Danie Nazaire | 069b7b76125 | Merge pull request #1253 in SHRINE/shrine from feature/SHRINE2020-1031 to develop
* commit 'babfcdd8be8350716fe4e1c0... | | |
Marc-Danie Nazaire | babfcdd8be8 | SHRINE2020-1031 - Set "rel" attribute in link to Data Steward help pdf - removed shrine-docker-custom-lifecycle-plugi... | | |
Marc-Danie Nazaire | d037a73da44 | SHRINE2020-1031 - Set "rel" attribute in link to Data Steward help pdf | | |
Marc-Danie Nazaire | 1d0e783cab6 | SHRINE2020-1012 - Add Content-Security-Policy header to all api responses from the server-side - Also added Strict-Tr... | | |
Marc-Danie Nazaire | c2790924aae | Merge pull request #1252 in SHRINE/shrine from feature/SHRINE2020-1030 to develop
* commit '8ca02e5ef916d46eb931798d... | | |
Marc-Danie Nazaire | 8ca02e5ef91 | SHRINE2020-1030 - Move unit tests into a separate folder in dsa - added kafka to docker readme when starting docker f... | | |
Marc-Danie Nazaire | 36f4b9aa152 | SHRINE2020-1030 - Move unit tests into a separate folder in dsa - added docker custom lifecycle build extension | | |
Marc-Danie Nazaire | cca35898706 | SHRINE2020-1030 - Move unit tests into a separate folder in dsa - uncommented build extension | | |
Marc-Danie Nazaire | 037b3038e0b | SHRINE2020-1030 - Move unit tests into a separate folder in dsa - minor edit to rebuild | | |
dwalend | b19463415f5 | No need to keep alpine around for SHRINE2020-1045 | | |
dwalend | e071ca155bf | Pesky facts in a comment | | |
dwalend | b26e491d7e8 | Cleanup espeically of the mutagen option for SHRINE2020-1045 | | |
Marc-Danie Nazaire | 99b14d73cb6 | SHRINE2020-1030 - Move unit tests into a separate folder in dsa | | |
Marc-Danie Nazaire | 063cf9352b0 | Merge pull request #1249 in SHRINE/shrine from feature/SHRINE2020-1013 to release/3.2.1
* commit 'c5d65956374fbec1e3... | | |
Marc-Danie Nazaire | b67c7619d6e | Merge branch 'feature/SHRINE2020-1012' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRI... | | |
Marc-Danie Nazaire | 7c7ff738812 | SHRINE2020-1012 - Add Content-Security-Policy header to all api responses from the server-side - Also added Strict-Tr... | | |
Marc-Danie Nazaire | edacb7bbab4 | SHRINE-1012 - Add Content-Security-Policy header to all api responses from the server-side - Mounted CSPReportService... | | |
dwalend | b0466a22f5d | Pretty good results with Mutagen SHRINE2020-1045 | | |
Marc-Danie Nazaire | dfb5884878d | SHRINE2020-1012 - Add Content-Security-Policy header to all api responses from the server-side - Added unsafe-eval to... | | |
dwalend | 4b071efc5ae | Cleaned up the nfs-on-hosted parts and put some results in comments for SHRINE2020-1045 | | |
Marc-Danie Nazaire | aa210901e36 | SHRINE2020-1012 - Add Content-Security-Policy header to all api responses from the server-side - Removed styles src elem | | |
Marc-Danie Nazaire | d8355cb8b15 | SHRINE2020-1012 - Add Content-Security-Policy header to all api responses from the server-side - Added Content securi... | | |
Marc-Danie Nazaire | ba376c96259 | SHRINE2020-1012 - Add Content-Security-Policy header to all api responses from the server-side | | |
Marc-Danie Nazaire | 2cc5af1a607 | SHRINE2020-1012 - Add Content-Security-Policy header to all api responses from the server-side | | |
Marc-Danie Nazaire | c5d65956374 | SHRINE2020-1013 - Do not store username and password in dsa - renamed toBase64 function | | |
Marc-Danie Nazaire | 08d8071a6fb | SHRINE2020-1013 - Do not store username and password in dsa - css changes | | |
Marc-Danie Nazaire | ea1ff2fc473 | SHRINE2020-1013 - Do not store username and password in dsa - Improved output on api call failure | | |
dwalend | df6e42bea6b | Bit of magic to get the host system to mount nfs | | |
dwalend | dd188063d69 | exploring nfs for SHRINE2020-1045 | | |
Marc-Danie Nazaire | 5f0f34ba1e2 | SHRINE2020-1013 - Do not store username and password in dsa - Modified to logout on authentication error | | |
Marc-Danie Nazaire | d4c67ee808d | SHRINE2020-1013 - Do not store username and password in dsa | | |
dwalend | 9eb218cf23a | Stashing CentOS work to switch to an alpine nfs starting point for SHRINE2020-1045 | | |
Marc-Danie Nazaire | 92bd388c28f | Merge pull request #1248 in SHRINE/shrine from feature/SHRINE2020-1039 to develop
* commit '5f2ff45246a06061e7c153fa... | | |
David Walend | 1f13514487b | Merge pull request #1243 in SHRINE/shrine from feature/SHRINE2020-1044-get-the-shrine-javascript-building-on-both-the... | | |
Marc-Danie Nazaire | 5f2ff45246a | SHRINE2020-1039 - Pickup docker kafka versions from pom file - Fixed working kakfa dir | | |
Marc-Danie Nazaire | 85cd22dc058 | SHRINE2020-1039 - Pickup docker kafka versions from pom file - Added SCALA_VERSION variable to pom | | |
Marc-Danie Nazaire | 7767d578b32 | SHRINE2020-1039 - Pickup docker kafka versions from pom file - Added SCALA_VERSION variable | | |
Marc-Danie Nazaire | 9e5537e5007 | SHRINE2020-1039 - Pickup docker kafka versions from pom file - Added SCALA_VERSION variable | | |
David Walend | e79a178a183 | Merge pull request #1241 in SHRINE/shrine from feature/SHRINE2020-1042 to develop
* commit '8abb63205cb66af8325ec92f... | | |
Marc-Danie Nazaire | cca1fc7b501 | SHRINE2020-1039 - Pickup docker kafka versions from pom file - removed docker scripts from pom file | | |
Marc-Danie Nazaire | e012b3f665e | SHRINE2020-1039 - Pickup docker kafka versions from pom file | | |
Marc-Danie Nazaire | 897b687536d | SHRINE2020-1039 - Pickup docker kafka versions from pom file | | |
| Next → |
