dwalend | 71b2ad50982 | Maybe this capitalization matters for SHRINE2020-1200 | | |
Marc-Danie Nazaire | e418469c2a8 | add back remote user to getHeaderNames | | |
Marc-Danie Nazaire | 02ffc580710 | add back remote user to getHeader(s: String) | | |
Marc-Danie Nazaire | ba98e7e69d4 | add back remote user to getHeaderNames | | |
Marc-Danie Nazaire | 5635e251931 | add back remote user to getHeaders(s: String) | | |
Marc-Danie Nazaire | 767b6ba4348 | comment out insertion of remote user | | |
dwalend | 2636ee4a67b | semicolon for SHRINE2020-1200 | | |
Marc-Danie Nazaire | 16b3ac5a528 | Merge branch 'sso-phase1' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into sso-phase1
Conflicts:
... | | |
Marc-Danie Nazaire | 0554954c3bf | comment out some of the logging | | |
dwalend | e4321a98090 | First pass of database cleanup for SHRINE2020-1200 | | |
dwalend | da88cdfb271 | Changed out for a better exception for SHRINE2020-1131 | | |
dwalend | d5f10747516 | Another stray import for SHRINE2020-1102 | | |
Xavier Haurie | 3f25fd0dc90 | Reinstate changes made to provide the value of the "remote_user" request header as that of the "remoteUser" request a... | | |
dwalend | c85d792e2ed | Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-1102 | | |
dwalend | f71158b0c87 | Couple of wierd imports that slipped in for SHRINE2020-1102 | | |
Xavier Haurie | e0a938087a6 | Roll back changes made to provide the value of the "remote_user" request header as that of the "remoteUser" request a... | | |
dwalend | 6b89a8f00cf | Found a way to move CrcRequestType after freeing it up for SHRINE2020-1102 | | |
Marc-Danie Nazaire | 284cae84e73 | Pull request #1312: SHRINE2020-1188 - "(optional)" is missing from the text displayed in Event 3 panel
Merge in SHRI... | | |
dwalend | 04273162858 | Diffusing CrcRequestType and RequestType dependencies for SHRINE2020-1102 | | |
Marc-Danie Nazaire | f4a70112ac9 | SHRINE2020-1188 - "(optional)" is missing from the text displayed in Event 3 panel | | |
dwalend | 384a4a469a6 | Moved stuff used by just the PM cell auth check to auth for SHRINE2020-1102 | | |
Marc-Danie Nazaire | 718c51af488 | Pull request #1308: Feature/SHRINE2020 1197 - Add a "Add Event" button to trigger the 3rd event panel
Merge in SHRIN... | | |
dwalend | 2c26ebcc750 | Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-1102 | | |
Marc-Danie Nazaire | ee959c80eb0 | SHRINE2020-1197 - Add a "Add Event" button to trigger the 3rd event panel - css cleanup | | |
Marc-Danie Nazaire | b68c69166bb | SHRINE2020-1197 - Add a "Add Event" button to trigger the 3rd event panel - Fixed switch from and to timeline | | |
dwalend | 8d0e5f56868 | Moved more adapter-only code for SHRINE2020-1102, including the query package | | |
Marc-Danie Nazaire | c52f5dc191c | SHRINE2020-1197 - Add a "Add Event" button to trigger the 3rd event panel - css change | | |
Carl Woolf | 7d0fdafbf9d | typo | | |
Carl Woolf | a02b4714b70 | clean up logs a bit | | |
Carl Woolf | 8aad9cd73c1 | tell users to call userId via id 'remoteUser' | | |
dwalend | 27ee10210f5 | Even more refactoring and deleting for SHRINE2020-1102 | | |
Carl Woolf | 7c963e1ced2 | What about method getRemoteUser()!? | | |
Carl Woolf | e2ac47a5216 | Another try for (log) header for remote_user | | |
Carl Woolf | f79abbb64e8 | Look for (log) header for (ajp_)remote_user | | |
dwalend | e6bae1a7ada | Removed even more dead code for SHRINE2020-1102 | | |
Carl Woolf | 08270d568b8 | Look for (log) attribute for remote_user | | |
Carl Woolf | 319863949e3 | samples update | | |
Marc-Danie Nazaire | 654160bbc23 | SHRINE2020-1196 - Fix SHRINE docker network - hub config cleanup | | |
Marc-Danie Nazaire | a8536996093 | SHRINE2020-1196 - Fix SHRINE docker network - Comment cleanup | | |
Marc-Danie Nazaire | 7746f202676 | SHRINE2020-1196 - Fix SHRINE docker network | | |
Carl Woolf | b00843b9c87 | fix merge bug | | |
Carl Woolf | f57d0d83569 | sample | | |
Carl Woolf | 5c80819e3a4 | Merge remote-tracking branch 'origin/sso-phase1' into sso-phase1 | | |
Carl Woolf | 9e8921a5213 | Merge branch 'develop' into sso-phase1
# Conflicts:
# pom.xml | | |
Xavier Haurie | 636a61b5343 | Add Tomcat's server.xml configuration file | | |
Marc-Danie Nazaire | f4f1671fcb2 | convert to proper java enumeration | | |
Carl Woolf | 64225b3f06c | step one for adding remote_header to requests -- override a few irritable methods | | |
Carl Woolf | ea8d232393b | step zero for adding remote_header to requests | | |
Marc-Danie Nazaire | 31fe0a343ea | Pull request #1309: SHRINE2020-1199 - Start making SHRINE-4.0.0 SNAPSHOTS
Merge in SHRINE/shrine from feature/SHRINE... | | |
Carl Woolf | ad0358b13d0 | samples | | |
Carl Woolf | f3176fd670b | make 'samples' match SSOT (sso-configs) | | |
Xavier Haurie | f96d01260eb | Removed no-longer-needed (officially as of Apache 2.4.10, tested with 2.4.54) work-around to populate the local addre... | | |
Carl Woolf | 25e4d698989 | try getting remote_user from attributes | | |
Carl Woolf | 74f26adab0d | may need local-address hack after all | | |
Marc-Danie Nazaire | c081ee8183c | SHRINE2020-1199 - Start making SHRINE-4.0.0 SNAPSHOTS | | |
Carl Woolf | fcd385f4fda | fix email spelling. comment out local-address hack | | |
Carl Woolf | 5ee3987d41b | attributes might work better now? | | |
Carl Woolf | 58b785849ef | try adding attribute prefix AJP_ | | |
Marc-Danie Nazaire | 8b360993254 | SHRINE2020-1197 - Add a "Add Event" button to trigger the 3rd event panel - minor format change | | |
Marc-Danie Nazaire | 3d75d547061 | SHRINE2020-1197 - Add a "Add Event" button to trigger the 3rd event panel - css tweak for the Add event button | | |
Marc-Danie Nazaire | 0a56e7be423 | SHRINE2020-1197 - Add a "Add Event" button to trigger the 3rd event panel - Code cleanup | | |
Marc-Danie Nazaire | fd0db6b963a | SHRINE2020-1197 - Add a "Add Event" button to trigger the 3rd event panel - Fixed unit test | | |
Carl Woolf | 13f13add4bf | add dump of attributes | | |
Marc-Danie Nazaire | 06104cf3c13 | SHRINE2020-1197 - Add a "Add Event" button to trigger the 3rd event panel | | |
dwalend | 537dfa24a33 | Moved all of the Read pairs for SHRIEN2020-1102 | | |
Xavier Haurie | 2fc8e3e7af6 | switch to headers mode (with accompanying change to sp.conf: ShibUseHeaders On) which populates the headers appropria... | | |
dwalend | 7e29784d2b0 | Moving more code for SHRINE2020-1102 | | |
dwalend | 5d1ca57b62c | Found more dead code to delete for SHRINE2020-1102 | | |
dwalend | 7f12c1523b2 | Think I found a technique to untie the knot in the i2b2 protocol for SHRINE2020-1102 | | |
Marc-Danie Nazaire | 76b2bc1aeef | Pull request #1307: Feature/SHRINE2020 1090 - Add options to "the first" to a drop for both event relationships - Add... | | |
Marc-Danie Nazaire | 7287a2c8c88 | Pull request #1306: SHRINE2020-1092 - Reload queries with the 3rd event when "edit criteria" is selected
Merge in SH... | | |
Marc-Danie Nazaire | af8aad10a75 | revert call remoteUser function on request | | |
Marc-Danie Nazaire | c56e5f49c9a | call remoteUser function on request | | |
Marc-Danie Nazaire | bb63ab60653 | check for certain attributes | | |
Marc-Danie Nazaire | 07ea2f0c7ce | returns attributes in request in qep/authPing api call | | |
Marc-Danie Nazaire | 4b99cb2babe | list attributes names in ContentSecurityPolicyFilter | | |
Marc-Danie Nazaire | 8276a596ff8 | returns attributes in request as json in qep/authPing api call | | |
Marc-Danie Nazaire | a5be4b33b5d | returns entire request as json in qep/authPing api call | | |
Marc-Danie Nazaire | e7fb5c86f0a | debug output | | |
Marc-Danie Nazaire | 5be3a589280 | changes to modify request in order to set localAddress | | |
Marc-Danie Nazaire | ddf9cc71b00 | changes to modify request in order to set localAddress | | |
Marc-Danie Nazaire | 7b43d077454 | edit debug logging to ContentSecurityPolicyFilter.scala | | |
Marc-Danie Nazaire | 20013dc0014 | added debug logging to ContentSecurityPolicyFilter.scala | | |
Marc-Danie Nazaire | 6f6fa277580 | SHRINE2020-1090 - Add options to "the first" to a drop for both event relationships - Added missing test snapshot file | | |
Marc-Danie Nazaire | 59ff13df03c | SHRINE2020-1090 - Add options to "the first" to a drop for both event relationships - Add front end test | | |
Marc-Danie Nazaire | fde9109d06c | SHRINE2020-1090 - Add options to "the first" to a drop for both event relationships | | |
Marc-Danie Nazaire | 8ab55663ab0 | Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-1092 | | |
Marc-Danie Nazaire | 5ac46a45bb5 | Merge pull request #1305 in SHRINE/shrine from feature/SHRINE2020-1087 to develop
* commit '22f934a3a8f8d7573477e9d4... | | |
Xavier Haurie | 4a3af7f3ace | Revert "go back to previous logout behavior, so as to experiment logout behavior"
This reverts commit 39f2e0a11987e1... | | |
Xavier Haurie | 39f2e0a1198 | go back to previous logout behavior, so as to experiment logout behavior | | |
Marc-Danie Nazaire | 22f934a3a8f | Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-1087 | | |
David Walend | 402536cf1f8 | Merge pull request #1304 in SHRINE/shrine from feature/SHRINE2020-1102 to develop
* commit '68ff78ddacffd8377595c9d3... | | |
Marc-Danie Nazaire | 7bd1d1f3ab4 | SHRINE2020-1087 -Allow the user to define the relationship between the 2nd and 3rd event | | |
dwalend | 68ff78ddacf | Merging | | |
David Walend | bea0c1c882e | Merge pull request #1300 in SHRINE/shrine from feature/SHRINE2020-1181 to develop
* commit '938226ad8102a5f443498f20... | | |
dwalend | 7ec9e49d7d4 | My own review for SHRINE2020-1102 | | |
dwalend | 800fe4fe46b | Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-1102 | | |
dwalend | 938226ad810 | Merging | | |
David Walend | cc46b6dced1 | Merge pull request #1301 in SHRINE/shrine from feature/SHRINE2020-1101 to develop
* commit '0ca2566d617bc7d8c7596175... | | |
Xavier Haurie | 2d0c61bd66f | attempt to SSO sign out from the top-right badge | | |
Marc-Danie Nazaire | 99c98e02976 | SHRINE2020-1087 -Allow the user to define the relationship between the 2nd and 3rd event | | |
dwalend | 7a3db567734 | Merging | | |
dwalend | 8fbe04711db | Marc-Danie review comments for SHRINE2020-1181 | | |
dwalend | 012861400d1 | Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-1181 | | |
dwalend | 75f35cdbcbf | Finally untangled and deleted enough to move BroadcastMessage for SHRINE2020-1102 | | |
dwalend | daabf5f2317 | Oh that | | |
dwalend | b86c3508bc6 | Finally moving some code instead of just deleting it for SHRINE2020-1102 | | |
dwalend | b909d51572b | Deleted the handlers nonsense and decoupled a lot of concrete-abstract cross-reference knots for SHRINE2020-1102 | | |
Marc-Danie Nazaire | 79478d546e8 | SHRINE2020-1182 - Vericode Scan: Fix cross-site scripting flaw in qep/.../Header/HeaderMenu.js | | |
Marc-Danie Nazaire | fd0543f2df1 | Merge pull request #1303 in SHRINE/shrine from feature/SHRINE2020-1182 to develop
* commit '92b7e4a0ed37d9cbcf2a1210... | | |
Marc-Danie Nazaire | a3d35fa746e | Changed revision in base POM to 3.2.2 | | |
Marc-Danie Nazaire | 2dbfa74a00b | Revert "Update POMs with release version 3.2.1."
This reverts commit 027a1673fcca6c629bc5bfa9f52c56016504ba10. | | |
Marc-Danie Nazaire | 92b7e4a0ed3 | SHRINE2020-1182 - Vericode Scan: Fix cross-site scripting flaw in qep/.../Header/HeaderMenu.js - modified to use an e... | | |
dwalend | 448a1f8d53d | Deleted ReadQueryDefinitionRequest and its kin for SHRINE2020-1102 | | |
Marc-Danie Nazaire | 1eb5c6caa96 | Switched to using basic or bearer auth in login service instead of just basic auth | | |
dwalend | d2222d8b2f8 | Got rid of the old rename request and response for SHRINE2020-1102 | | |
Xavier Haurie | 6cb8c64f348 | attempt to go to the Shrine web client after successful SSO login | | |
dwalend | dfa2df03e22 | Deleted ReadResultOutputTypes for SHRINE2020-1102 | | |
David Walend | 75690fb9b4b | Merge pull request #1302 in SHRINE/shrine from feature/SHRINE2020-954 to develop
* commit '5b692676efa3522e5d26ca12d... | | |
dwalend | 5c2397a12ca | Deleted more dead code for SHRINE2020-1102 | | |
dwalend | 5b692676efa | Removed the nodes web api method for SHRINE2020-954 | | |
dwalend | 787606b98e8 | Deleting more dead code for SHRINE2020-1102 | | |
Marc-Danie Nazaire | 568d76d71ad | SHRINE2020-1182 - Vericode Scan: Fix cross-site scripting flaw in qep/.../Header/HeaderMenu.js | | |
dwalend | b76239caaf2 | Deleting the really old HMS topic handling for SHRINE2020-1102 | | |
dwalend | 7fa3e186d49 | Removed the flag/unflag commands for SHRINE2020-1102 | | |
dwalend | d24cb342841 | Deleted a file that wasn't used anymore for SHRINE2020-1102 | | |
dwalend | 615e8d704d5 | Managed to move some test code for SHRINE2020-1102 | | |
dwalend | 8097beaec0b | Separated the v1 protocol into its own package for SHRINE2020-1102 | | |
dwalend | 5ccbcf5becd | Merge branch 'feature/SHRINE2020-1181' into feature/SHRINE2020-1102 | | |
dwalend | da675396217 | Merge branch 'feature/SHRINE2020-954' into feature/SHRINE2020-1102 | | |
Carl Woolf | 02f5e722400 | display headers for authPing | | |
Carl Woolf | e2db30f17ec | Mark where/what to change in the config files -- points to wiki for explanation | | |
Carl Woolf | 87389bfaf93 | first try for phase1 SP | | |
dwalend | c2963fae86b | Code review of SHRINE2020-954 | | |
dwalend | 7550234b26f | The hub no longer needs to authorize anything SHRINE2020-954 | | |
dwalend | d4cc51d07bb | Removed support for that if-no-network business in SHRINE2020-954 | | |
dwalend | 9e90e0dae33 | Removed the curl commands that change the network for SHRINE2020-954 | | |
dwalend | 0ca2566d617 | Found while sweeping up SHRINE2020-1101 | | |
dwalend | d3c15ae7a7e | Big delete for SHRINE2020-1101 | | |
dwalend | 13d228c205a | Removed the xml definition field from queries for SHRINE2020-1101 | | |
dwalend | a155b516cec | Made a JSON version of the query required for SHRINE2020-1101 | | |
dwalend | 073f1045640 | Comment cleanup for SHRINE2020-1181 | | |
dwalend | 9acbe95f0be | Quick bug fix for SHRINE2020-1181 | | |
dwalend | 176be5051bd | Removed first-or-any from concept groups for SHRINE2020-1181 | | |
dwalend | 290a1c59a29 | Added first-or-any fields to timelike links for SHRINE2020-1181 | | |
dwalend | 570762d6e62 | Oracle and MS SQL like drop column instead of just drop - for SHRINE2020-1101 | | |
dwalend | 3030db96e3c | Removed xml columns from the QEP's previousQueries table for SHRINE2020-1101 | | |
Marc-Danie Nazaire | f4d3f05e473 | SHRINE2020-1192 - Reload queries with the 3rd event when "edit criteria" is selected | | |
Marc-Danie Nazaire | 188e40e6de8 | Merge pull request #1299 in SHRINE/shrine from feature/SHRINE2020-1088 to develop
* commit 'b172dc684830dd854c827819... | | |
David Walend | 467cf11e186 | Merge pull request #1298 in SHRINE/shrine from bugfix/SHRINE2020-1106 to develop
* commit '220de05eba4da1f9a33e66962... | | |
Marc-Danie Nazaire | b172dc68483 | SHRINE2020-1185 - Concepts in timelines from the QEP front end have lab constraints - even when they aren't labs | | |
dwalend | 220de05eba4 | Updated the logback library to beat an unlikely security problem for SHRINE2020-1106 | | |
Marc-Danie Nazaire | 1b817994c3e | SHRINE2020-1088 - Validations for event 3 - labs, date ranges - Fixed constraint not set to null when value is ANY wh... | | |
Marc-Danie Nazaire | 56c793534fd | SHRINE2020-1088 - Validations for event 3 - labs, date ranges - Added NORMAL as a constraint type and set default bac... | | |
Marc-Danie Nazaire | 31d621616d3 | SHRINE2020-1088 - Validations for event 3 - labs, date ranges - Modified to not include events with no concepts when ... | | |
Marc-Danie Nazaire | bf1cd9b6951 | Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-1088 | | |
Marc-Danie Nazaire | f4d15d6d8b6 | Merge pull request #1292 in SHRINE/shrine from feature/SHRINE2020-1085 to develop
* commit '915e4b8bb49bed45ea62ef1a... | | |
David Walend | dffe5aa1119 | Merge pull request #1297 in SHRINE/shrine from feature/SHRINE2020-1180 to develop
* commit 'c36d67b1a23e9957aef2ad50... | | |
Marc-Danie Nazaire | 96291a3b7f4 | SHRINE2020-1088 - Validations for event 3 - labs, date ranges | | |
dwalend | c36d67b1a23 | Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-1180 | | |
Marc-Danie Nazaire | 915e4b8bb49 | SHRINE2020-1085-Augment existing "when" panel with an additional INACTIVE Event 3 and SHRINE2020-1086- Fixed check fo... | | |
David Walend | aa0af85e5a8 | Merge pull request #1296 in SHRINE/shrine from feature/SHRINE2020-961 to develop
* commit '809a1afedb8b48ba9656e83d8... | | |
dwalend | 809a1afedb8 | Better comment for SHRINE2020-961 | | |
dwalend | b3a4e62327b | Testing of SHRINE2020-1180 and SHRINE2020-1091 - caveat some new bug tickets | | |
dwalend | 3bdf1f03dfd | Two more hacks to get SHRINE2020-1180 into review | | |
dwalend | 2e8597dcb44 | Changed to Seqs of events and links for SHRINE2020-1180 | | |
David Walend | 56e9ea175ce | Merge pull request #1295 in SHRINE/shrine from bugfix/SHRINE2020-1172 to develop
* commit 'cd5d8532a2a854974273f980a... | | |
dwalend | 2f6ffa81ba3 | Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-1180 | | |
David Walend | 9f5f0f1a63f | Merge pull request #1293 in SHRINE/shrine from feature/SHRINE2020-1127 to develop
* commit 'c52abf61671eca128ef3272b... | | |
dwalend | c52abf61671 | Marc-Danie review comments for SHRINE2020-1127 | | |
dwalend | 0bdef3a782b | Planning SHRINE2020-1180 | | |
dwalend | 9f1306f0e42 | Merge branch 'bugfix/SHRINE2020-1172' into feature/SHRINE2020-1180 | | |
dwalend | 423b520c2c5 | Merge branch 'feature/SHRINE2020-961' into feature/SHRINE2020-1180 | | |
Marc-Danie Nazaire | 6ce20e317ad | SHRINE2020-1085-Augment existing "when" panel with an additional INACTIVE Event 3 and SHRINE2020-1086- Modified to re... | | |
dwalend | cd5d8532a2a | merging | | |
Marc-Danie Nazaire | 42b106cd3c2 | SHRINE2020-1085-Augment existing "when" panel with an additional INACTIVE Event 3 and SHRINE2020-1086-Augment existin... | | |
Marc-Danie Nazaire | d10f6a7189b | SHRINE2020-1085-Augment existing "when" panel with an additional INACTIVE Event 3 and SHRINE2020-1086-Augment existin... | | |
Marc-Danie Nazaire | 40478891480 | SHRINE2020-1085-Augment existing "when" panel with an additional INACTIVE Event 3 and SHRINE2020-1086-Augment existin... | | |
Marc-Danie Nazaire | 7fe1d1aeff6 | Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-1085 | | |
Marc-Danie Nazaire | 73a1fe0224c | SHRINE2020-1085-Augment existing "when" panel with an additional INACTIVE Event 3 and SHRINE2020-1086-Augment existin... | | |
dwalend | bd2a62c6be2 | merging | | |
dwalend | 368ac27b96d | Removed the bouncy castle library for SHRINE2020-961 | | |
dwalend | cd880ecdcd7 | merging | | |
David Walend | 2f653547531 | Merge pull request #1294 in SHRINE/shrine from feature/SHRINE2020-1094 to develop
* commit '2cca91369dcc2e117f2b33d3... | | |
Marc-Danie Nazaire | efdc351feed | SHRINE2020-1085-Augment existing "when" panel with an additional INACTIVE Event 3 and SHRINE2020-1086-Augment existin... | | |
dwalend | 2cca91369dc | Marc-Danie's review comments for SHRINE2020-1094 | | |
dwalend | 06b5b75a2e1 | Removed all the keystores for SHRINE2020-961 | | |
dwalend | e87213b9dd4 | Removing keystore references from .conf files for SHRINE2020-961 | | |
Next → |