 Marc-Danie Nazaire | 6534e648c52 | edit debug logging to ContentSecurityPolicyFilter.scala | | |
Marc-Danie Nazaire | c1b259232e5 | added debug logging to ContentSecurityPolicyFilter.scala | | |
Marc-Danie Nazaire | 86425c3fd09 | SHRINE2020-1090 - Add options to "the first" to a drop for both event relationships - Added missing test snapshot file | | |
Marc-Danie Nazaire | 1ecbe4b9a2e | SHRINE2020-1090 - Add options to "the first" to a drop for both event relationships - Add front end test | | |
Marc-Danie Nazaire | 967b1109c40 | SHRINE2020-1090 - Add options to "the first" to a drop for both event relationships | | |
Marc-Danie Nazaire | b07f518e726 | Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-1092 | | |
Marc-Danie Nazaire | 13bc47cc8e6 | Merge pull request #1305 in SHRINE/shrine from feature/SHRINE2020-1087 to develop
* commit 'f4c371ed423666dd2afb631f... | | |
 Xav | 8b61b4a365f | Revert "go back to previous logout behavior, so as to experiment logout behavior"
This reverts commit 79899b769e65dd... | | |
Xav | 79899b769e6 | go back to previous logout behavior, so as to experiment logout behavior | | |
Marc-Danie Nazaire | f4c371ed423 | Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-1087 | | |
 David Walend | 58fdba0fccd | Merge pull request #1304 in SHRINE/shrine from feature/SHRINE2020-1102 to develop
* commit '0720ddbd492571bcae31f14e... | | |
Marc-Danie Nazaire | 0f3cc9ff0e4 | SHRINE2020-1087 -Allow the user to define the relationship between the 2nd and 3rd event | | |
 dwalend | 0720ddbd492 | Merging | | |
David Walend | 29ebfcc7563 | Merge pull request #1300 in SHRINE/shrine from feature/SHRINE2020-1181 to develop
* commit 'e4ae263b98ca8ea389254015... | | |
dwalend | c7646aa58f9 | My own review for SHRINE2020-1102 | | |
dwalend | 2f6aa77e9f0 | Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-1102 | | |
dwalend | e4ae263b98c | Merging | | |
David Walend | 9a14065475f | Merge pull request #1301 in SHRINE/shrine from feature/SHRINE2020-1101 to develop
* commit '9778dd38ccfbbff61c8c9ac7... | | |
Xav | dc8ddfd8480 | attempt to SSO sign out from the top-right badge | | |
Marc-Danie Nazaire | c1dfdf247c5 | SHRINE2020-1087 -Allow the user to define the relationship between the 2nd and 3rd event | | |
dwalend | a88d8618fa8 | Merging | | |
dwalend | 7a16c7726d3 | Marc-Danie review comments for SHRINE2020-1181 | | |
dwalend | 0ee636882ce | Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-1181 | | |
dwalend | 3d1894728fb | Finally untangled and deleted enough to move BroadcastMessage for SHRINE2020-1102 | | |
dwalend | 3195f2c95b7 | Oh that | | |
dwalend | 594810e384d | Finally moving some code instead of just deleting it for SHRINE2020-1102 | | |
dwalend | 2921773939d | Deleted the handlers nonsense and decoupled a lot of concrete-abstract cross-reference knots for SHRINE2020-1102 | | |
Marc-Danie Nazaire | 85b6145b6c0 | SHRINE2020-1182 - Vericode Scan: Fix cross-site scripting flaw in qep/.../Header/HeaderMenu.js | | |
Marc-Danie Nazaire | 5616ef6035a | Merge pull request #1303 in SHRINE/shrine from feature/SHRINE2020-1182 to develop
* commit '1e9e3b65fed3c7150fbf3918... | | |
Marc-Danie Nazaire | 7e602febd68 | Changed revision in base POM to 3.2.2 | | |
Marc-Danie Nazaire | 44c19a10c1b | Revert "Update POMs with release version 3.2.1."
This reverts commit 0570b2453a8ad622fe6f9cc69a3e432bc1d25bbe. | | |
Marc-Danie Nazaire | 1e9e3b65fed | SHRINE2020-1182 - Vericode Scan: Fix cross-site scripting flaw in qep/.../Header/HeaderMenu.js - modified to use an e... | | |
dwalend | b77ba454425 | Deleted ReadQueryDefinitionRequest and its kin for SHRINE2020-1102 | | |
Marc-Danie Nazaire | 97009f45762 | Switched to using basic or bearer auth in login service instead of just basic auth | | |
dwalend | f172efef2b3 | Got rid of the old rename request and response for SHRINE2020-1102 | | |
Xav | f09efe17518 | attempt to go to the Shrine web client after successful SSO login | | |
dwalend | effff1f5964 | Deleted ReadResultOutputTypes for SHRINE2020-1102 | | |
David Walend | 129c5ac79df | Merge pull request #1302 in SHRINE/shrine from feature/SHRINE2020-954 to develop
* commit '13ae8e30600134b8efbdde0df... | | |
dwalend | 00ea079a42d | Deleted more dead code for SHRINE2020-1102 | | |
dwalend | 13ae8e30600 | Removed the nodes web api method for SHRINE2020-954 | | |
dwalend | c937c98ed91 | Deleting more dead code for SHRINE2020-1102 | | |
Marc-Danie Nazaire | ca7adc1d54f | SHRINE2020-1182 - Vericode Scan: Fix cross-site scripting flaw in qep/.../Header/HeaderMenu.js | | |
dwalend | 34a44d67f03 | Deleting the really old HMS topic handling for SHRINE2020-1102 | | |
dwalend | cc2e4cf81e7 | Removed the flag/unflag commands for SHRINE2020-1102 | | |
dwalend | a4ca5120317 | Deleted a file that wasn't used anymore for SHRINE2020-1102 | | |
dwalend | 00e45dd6fe0 | Managed to move some test code for SHRINE2020-1102 | | |
dwalend | da3e129314d | Separated the v1 protocol into its own package for SHRINE2020-1102 | | |
dwalend | 9471be3d6d9 | Merge branch 'feature/SHRINE2020-1181' into feature/SHRINE2020-1102 | | |
dwalend | 43de4e9b74b | Merge branch 'feature/SHRINE2020-954' into feature/SHRINE2020-1102 | | |
 Carl Woolf | a57125b5fcb | display headers for authPing | | |
Carl Woolf | 0a6bee30c60 | Mark where/what to change in the config files -- points to wiki for explanation | | |
Carl Woolf | c0229148803 | first try for phase1 SP | | |
dwalend | 35262d504df | Code review of SHRINE2020-954 | | |
dwalend | 094bd3b0af4 | The hub no longer needs to authorize anything SHRINE2020-954 | | |
dwalend | 7cf89ab178e | Removed support for that if-no-network business in SHRINE2020-954 | | |
dwalend | ac22839fcca | Removed the curl commands that change the network for SHRINE2020-954 | | |
dwalend | 9778dd38ccf | Found while sweeping up SHRINE2020-1101 | | |
dwalend | f6465e8c282 | Big delete for SHRINE2020-1101 | | |
dwalend | d610a765173 | Removed the xml definition field from queries for SHRINE2020-1101 | | |
dwalend | d64162b8bd8 | Made a JSON version of the query required for SHRINE2020-1101 | | |
dwalend | 63962625496 | Comment cleanup for SHRINE2020-1181 | | |
dwalend | 76e08f67ae6 | Quick bug fix for SHRINE2020-1181 | | |
dwalend | bce08eae6a7 | Removed first-or-any from concept groups for SHRINE2020-1181 | | |
dwalend | d2d287799ea | Added first-or-any fields to timelike links for SHRINE2020-1181 | | |
dwalend | c7aa8b7adb6 | Oracle and MS SQL like drop column instead of just drop - for SHRINE2020-1101 | | |
dwalend | 351163fbdab | Removed xml columns from the QEP's previousQueries table for SHRINE2020-1101 | | |
Marc-Danie Nazaire | 5e8307e8c2a | SHRINE2020-1192 - Reload queries with the 3rd event when "edit criteria" is selected | | |
Marc-Danie Nazaire | 1a0729fdc84 | Merge pull request #1299 in SHRINE/shrine from feature/SHRINE2020-1088 to develop
* commit '2d75d1dd62380ec0fc65bad6... | | |
David Walend | c3c35c87788 | Merge pull request #1298 in SHRINE/shrine from bugfix/SHRINE2020-1106 to develop
* commit 'e9788b7179f084c1754f9ad72... | | |
Marc-Danie Nazaire | 2d75d1dd623 | SHRINE2020-1185 - Concepts in timelines from the QEP front end have lab constraints - even when they aren't labs | | |
dwalend | e9788b7179f | Updated the logback library to beat an unlikely security problem for SHRINE2020-1106 | | |
Marc-Danie Nazaire | 003af93d61d | SHRINE2020-1088 - Validations for event 3 - labs, date ranges - Fixed constraint not set to null when value is ANY wh... | | |
Marc-Danie Nazaire | 68919fa9f36 | SHRINE2020-1088 - Validations for event 3 - labs, date ranges - Added NORMAL as a constraint type and set default bac... | | |
Marc-Danie Nazaire | 1781ae569c4 | SHRINE2020-1088 - Validations for event 3 - labs, date ranges - Modified to not include events with no concepts when ... | | |
Marc-Danie Nazaire | 43694d7772e | Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-1088 | | |
Marc-Danie Nazaire | 51a83017935 | Merge pull request #1292 in SHRINE/shrine from feature/SHRINE2020-1085 to develop
* commit '86075096525c7bffd04b715a... | | |
David Walend | 1eff89e276e | Merge pull request #1297 in SHRINE/shrine from feature/SHRINE2020-1180 to develop
* commit 'fdc19ef05822d120d28b4af7... | | |
Marc-Danie Nazaire | 97ecf3b3961 | SHRINE2020-1088 - Validations for event 3 - labs, date ranges | | |
dwalend | fdc19ef0582 | Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-1180 | | |
Marc-Danie Nazaire | 86075096525 | SHRINE2020-1085-Augment existing "when" panel with an additional INACTIVE Event 3 and SHRINE2020-1086- Fixed check fo... | | |
David Walend | 30a1f1822a6 | Merge pull request #1296 in SHRINE/shrine from feature/SHRINE2020-961 to develop
* commit '1367b5973d431c8a3123b6663... | | |
dwalend | 1367b5973d4 | Better comment for SHRINE2020-961 | | |
dwalend | 1e07f05fa16 | Testing of SHRINE2020-1180 and SHRINE2020-1091 - caveat some new bug tickets | | |
dwalend | 366b5745560 | Two more hacks to get SHRINE2020-1180 into review | | |
dwalend | 9d7f90955c5 | Changed to Seqs of events and links for SHRINE2020-1180 | | |
David Walend | 3dc072d5bd8 | Merge pull request #1295 in SHRINE/shrine from bugfix/SHRINE2020-1172 to develop
* commit 'cdadd804118ad4edae0cbb6c4... | | |
dwalend | 376866d92d6 | Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-1180 | | |
David Walend | 3d11ed08127 | Merge pull request #1293 in SHRINE/shrine from feature/SHRINE2020-1127 to develop
* commit 'e042cdb31bb05d742a6da5fa... | | |
dwalend | e042cdb31bb | Marc-Danie review comments for SHRINE2020-1127 | | |
dwalend | 2e2a90dfba7 | Planning SHRINE2020-1180 | | |
dwalend | 111698beba5 | Merge branch 'bugfix/SHRINE2020-1172' into feature/SHRINE2020-1180 | | |
dwalend | 2dfb5086136 | Merge branch 'feature/SHRINE2020-961' into feature/SHRINE2020-1180 | | |
Marc-Danie Nazaire | f56683df1fa | SHRINE2020-1085-Augment existing "when" panel with an additional INACTIVE Event 3 and SHRINE2020-1086- Modified to re... | | |
dwalend | cdadd804118 | merging | | |
Marc-Danie Nazaire | 61876540727 | SHRINE2020-1085-Augment existing "when" panel with an additional INACTIVE Event 3 and SHRINE2020-1086-Augment existin... | | |
Marc-Danie Nazaire | 692df60660a | SHRINE2020-1085-Augment existing "when" panel with an additional INACTIVE Event 3 and SHRINE2020-1086-Augment existin... | | |
Marc-Danie Nazaire | ec47c4a467f | SHRINE2020-1085-Augment existing "when" panel with an additional INACTIVE Event 3 and SHRINE2020-1086-Augment existin... | | |
Marc-Danie Nazaire | 21b5e64551d | Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-1085 | | |
Marc-Danie Nazaire | 63a335b404f | SHRINE2020-1085-Augment existing "when" panel with an additional INACTIVE Event 3 and SHRINE2020-1086-Augment existin... | | |
dwalend | deabce596fd | merging | | |
dwalend | c12f2669bb1 | Removed the bouncy castle library for SHRINE2020-961 | | |
dwalend | ea09aa1d3eb | merging | | |
David Walend | b8821de3f3e | Merge pull request #1294 in SHRINE/shrine from feature/SHRINE2020-1094 to develop
* commit '4ea7b8f7e804f1d5a9d8fb64... | | |
Marc-Danie Nazaire | 04b7369cf3f | SHRINE2020-1085-Augment existing "when" panel with an additional INACTIVE Event 3 and SHRINE2020-1086-Augment existin... | | |
dwalend | 4ea7b8f7e80 | Marc-Danie's review comments for SHRINE2020-1094 | | |
dwalend | 3e782abeefe | Removed all the keystores for SHRINE2020-961 | | |
dwalend | 2656adbd503 | Removing keystore references from .conf files for SHRINE2020-961 | | |
dwalend | 0e6b46f0f71 | Deleted all the signature support code for SHRINE2020-961 | | |
dwalend | 7b257b6e156 | Deleted CertData for SHRINE2020-961 | | |
dwalend | 1a296ca4230 | Deleted CertId for SHRINE2020-961 | | |
dwalend | 9a8f309b16b | Started deleting signature bits for SHRINE2020-961 | | |
dwalend | de492bebf20 | Plans for deleting even more for SHRINE2020-961 | | |
dwalend | 69ae099a97e | Queries without signatures for SHRINE2020-961 | | |
dwalend | b75634f6e73 | Fixed another test on the build server for SHRINE2020-1172 | | |
dwalend | b648fb016e8 | Fixed a test on the build server for SHRINE2020-1172 | | |
dwalend | 8e672ec3d0f | Removing this unused bit of shrine.conf from commons/protocol fixes the QEP CSV test for SHRINE2020-1172 | | |
dwalend | df7b4a02d17 | Got junit 5 tests running and fixed through commons/protocol for SHRINE2020-1172 | | |
dwalend | b7fa3c43050 | Merge branch 'feature/SHRINE2020-1127' into bugfix/SHRINE2020-1172 | | |
dwalend | 77595686432 | Todo sweep for SHRINE2020-1094 | | |
dwalend | 762a6a7cc43 | Todo sweep for SHRINE2020-1094 | | |
dwalend | 049747b9f1a | Three-event unit test v2 -> i2b2 for SHRINE2020-1094 | | |
dwalend | 276cffb8afe | Added markers for broken junit tests to fix in SHRINE2020-1172 | | |
dwalend | 8d4baaa351e | Made the SHRINE2020-1094 code and unit test changes to support lists of constraint relationships in xml | | |
dwalend | 4a257a67c44 | Planning to add support for longer timelines for SHRINE2020-1094 | | |
dwalend | 7ce96e80a47 | Stray println for SHRINE2020-1127 | | |
dwalend | 1ec6cfea0d0 | Got the remove access policy working on AWS SQS for SHRINE2020-1127 | | |
dwalend | 16864973832 | todo sweep for SHRINE2020-1127 | | |
dwalend | e9a06171210 | Command line tweaks for SHRINE2020-1127 | | |
dwalend | dca8b6e7998 | Fixed createNode for SHRINE2020-1127 | | |
David Walend | 0af45ae07db | Merge pull request #1288 in SHRINE/shrine from feature/SHRINE2020-1115 to develop
* commit '30c88eb2c586a93aa1898d79... | | |
dwalend | ac2210e1b5f | Tests for node lifecycle for SHRINE2020-1127 | | |
Marc-Danie Nazaire | 13b30a0404f | SHRINE2020-1085-Augment existing "when" panel with an additional INACTIVE Event 3 and SHRINE2020-1086-Augment existin... | | |
Marc-Danie Nazaire | bdd68a7625d | SHRINE2020-1085-Augment existing "when" panel with an additional INACTIVE Event 3 and SHRINE2020-1086-Augment existin... | | |
Marc-Danie Nazaire | 4824fa8e342 | SHRINE2020-1085-Augment existing "when" panel with an additional INACTIVE Event 3 and SHRINE2020-1086-Augment existin... | | |
Marc-Danie Nazaire | c5df85ea9b6 | SHRINE2020-1085-Augment existing "when" panel with an additional INACTIVE Event 3 and SHRINE2020-1086-Augment existin... | | |
Marc-Danie Nazaire | 5d62d3b38fb | SHRINE2020-1085-Augment existing "when" panel with an additional INACTIVE Event 3 and SHRINE2020-1086-Augment existin... | | |
David Walend | 6a6fbd3ca71 | Merge pull request #1287 in SHRINE/shrine from feature/SHRINE2020-519-networkID to develop
* commit '191b9afa75c600e... | | |
dwalend | 712b51dddd2 | Lots of show command tests for SHRINE2020-1127 | | |
dwalend | 6ca75213b07 | Test of modify network for SHRINE2020-1127 | | |
dwalend | 03a0faa6ed4 | Check created nodes for SHRINE2020-1127 | | |
dwalend | 5986cbd5844 | Building up more unit tests for SHRINE2020-1127 | | |
dwalend | fd644c8fccc | Test of create network for SHRINE2020-1127 | | |
Marc-Danie Nazaire | 8c123c9731d | Merge pull request #1291 in SHRINE/shrine from feature/SHRINE2020-1119 to develop
* commit 'c06ae63d59e8296fb9bc3156... | | |
dwalend | d00f9433318 | Got tests working for SHRINE2020-1127 | | |
dwalend | 191b9afa75c | Marc-Danie's review comments for SHRINE2020-519 | | |
dwalend | b278ca3eb03 | Figured out how to get quoted arguments for SHRINE2020-1127 | | |
dwalend | e970abfa1f2 | Got unit tests running inside intellij, plus a lot of todos from the first round of testing for SHRINE2020-1127 | | |
Marc-Danie Nazaire | c06ae63d59e | SHRINE2020-1119-Update Kafka version to latest 3.2.0 | | |
dwalend | 0529d36a767 | A little pom.xml cleanup for SHRINE2020-1127 | | |
dwalend | 0e63add1ec7 | Fixes for tests in SHRINE2020-1127 | | |
dwalend | 869ec06f21b | Set up the remove principal call for SHRINE2020-1127 | | |
Marc-Danie Nazaire | 88504f9f9c4 | Fixed gitignore for the docker env file | | |
Marc-Danie Nazaire | 3e9a4e48487 | Merge pull request #1290 in SHRINE/shrine from bugfix/SHRINE2020-1164 to develop
* commit 'ac02a585c5499e7a8c72fb22d... | | |
dwalend | a161a5542d1 | Filled in a lot of Andrew Dion's command line requests for SHRINE2020-1127 | | |
Marc-Danie Nazaire | 7503e5d25f3 | Merge pull request #1289 in SHRINE/shrine from bugfix/SHRINE2020-1170 to develop
* commit '318edfb5d226a99cf1158e1b0... | | |
Marc-Danie Nazaire | ac02a585c54 | SHRINE2020-1164 - DSA heatmap tree does not expand to show terms | | |
Marc-Danie Nazaire | 318edfb5d22 | SHRINE2020-1170 - Add momId to docker shrine hub config | | |
David Walend | 6d0ee2c768f | Merge pull request #1286 in SHRINE/shrine from feature/SHRINE2020-1097 to develop
* commit 'c199710f3bf2bdcc8910b7d4... | | |
dwalend | 30c88eb2c58 | Fixed the test for SHRINE2020-1115 | | |
dwalend | 2e1b9fc53cb | Lets see if that test is important for SHRINE2020-1115 | | |
dwalend | b4e04c0d48f | Committing before peaking at what's in develop - for SHRINE2020-1115 | | |
dwalend | 1b4abe1631e | Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-519-networkID | | |
dwalend | c199710f3bf | Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-1097 | | |
David Walend | cdb5f12bbc3 | Merge pull request #1285 in SHRINE/shrine from feature/SHRINE2020-1100 to develop
* commit '05d30685e13a5ef9fc23186a... | | |
dwalend | 05d30685e13 | Marc-Danie suggested a better column name for SHRINE2020-1100 | | |
dwalend | fa02805e732 | First guess for a bugfix for SHRINE2020-519 | | |
dwalend | 8508858f0ce | A lot of renaming and some more cleanup for SHRINE2020-519 | | |
dwalend | 4e13ef27f18 | Found a big tract of dead xml-centric code to delete for SHRINE2020-519 | | |
dwalend | 2fd594e51b5 | Renamed a lot of server-sided stuff in the QEP for SHRINE2020-519 | | |
dwalend | 9f60214b0ef | BasicQuery translation tests in the QEP for SHRINE2020-1097 | | |
dwalend | 8a3f7266386 | Updated some BasicQuery tests in the QEP to use v2 instead of i2b2 xml for SHRINE2020-1097 | | |
dwalend | 1d5499e2706 | Added v2 to i2b2 xml tests for SHRINE2020-1097 | | |
dwalend | de6b663f935 | First v2 to i2b2 xml test for SHRINE2020-1097 | | |
dwalend | 95559a2b8f2 | Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-1097 | | |
David Walend | 049e9b59fca | Merge pull request #1273 in SHRINE/shrine from feature/SHRINE2020-1095 to develop
* commit 'e21b9320686fef197c156aba... | | |
dwalend | 41e029e029b | Added test of RunQueryForResult for SHRINE2020-1097 | | |
dwalend | 6891680eefb | Added test for RunQueryAtHub for SHRINE2020-1097 | | |
dwalend | 5f147b9a0c6 | Turned on some tests for SHRINE2020-1097 | | |
dwalend | 73aaa6a94bc | Added round-trip structure tests for query definitions for SHRINE2020-1097 | | |
dwalend | e21b9320686 | Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-1095 | | |
David Walend | 1b2cd81c71c | Merge pull request #1282 in SHRINE/shrine from feature/SHRINE2020-1098-post-rearrange to develop
* commit '1a7b806bd... | | |
dwalend | 3ddea224694 | Turned back on some tests of query for SHRINE2020-1097 | | |
dwalend | e29c99d74b5 | merging | | |
dwalend | 6e094dd239e | Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-1100 | | |
dwalend | c0c8fd988ae | Can't drain the stream before reading the query from it. SHRINE2020-1100 | | |
dwalend | 29a755ab148 | My own review and todo sweep for SHRINE2020-1100 | | |
dwalend | 043d644a50e | Stray println gone for SHRINE2020-1100 | | |
dwalend | c14f1114aca | I think that's all tests restored for SHRINE2020-1100 | | |
| Next → |
