SHRINE
  1. SHRINE

shrine

Public
  1. SHRINE
  2. shrine

All Branches Graph  

        
AuthorCommitMessageCommit dateBuilds
Marc-Danie NazaireMarc-Danie Nazaire
eb9be7e35a0sso-phase1: removed anonymous user fallback
David WalendDavid Walend
8ee1760f264Pull request #1315: Feature/SHRINE2020 1200 Merge in SHRINE/shrine from feature/SHRINE2020-1200 to develop * commit...
Marc-Danie NazaireMarc-Danie Nazaire
54eec5f3d70sso-phase1: prepping for removing anonymous user
Marc-Danie NazaireMarc-Danie Nazaire
42c87111f59sso-phase1: prepping for removing anonymous user
Carl WoolfCarl Woolf
bd96aad5139tweak broken test
Carl WoolfCarl Woolf
860f0c9d5cbadd conf property ssoLogoutUrl. maybe only one matters
Carl WoolfCarl Woolf
70a90059f48remove authType changes but try ssoLogoutUrl
XavXav
1e3085a3a37Merge remote-tracking branch 'origin/sso-phase1' into sso-phase1
XavXav
17f92580615Fix unit test
Carl WoolfCarl Woolf
c75e1a7becdMerge remote-tracking branch 'origin/sso-phase1' into sso-phase1
Carl WoolfCarl Woolf
223e254b92fadd back in some logging
XavXav
8bb58c77ca8Merge remote-tracking branch 'origin/sso-phase1' into sso-phase1
XavXav
e6c1255114aMerge branch 'sso-phase1' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into sso-phase1  Conflicts: ...
Carl WoolfCarl Woolf
76ba437573b#3 Try to skip shrine login form during SSO
XavXav
3ae4548c14bTrying to understand the pathway from config file to UI
Carl WoolfCarl Woolf
8f3c3ef02bf#2 Try to skip shrine login form during SSO
Carl WoolfCarl Woolf
62451131975Revert "Revert "Try to skip shrine login form during SSO"" This reverts commit 80c3e492956996031e5e9cd32d14f76aecd2d...
Carl WoolfCarl Woolf
80c3e492956Revert "Try to skip shrine login form during SSO" This reverts commit 3d3a7b5e9091de597aec5fc79991223d09d8917d.
Carl WoolfCarl Woolf
3d3a7b5e909Try to skip shrine login form during SSO
Marc-Danie NazaireMarc-Danie Nazaire
6711d7596b4SHRINE2020-1196 - Fix SHRINE docker network - decreased wait time for the mysql db
Marc-Danie NazaireMarc-Danie Nazaire
27afa517b3aSHRINE2020-1196 - Fix SHRINE docker network
Marc-Danie NazaireMarc-Danie Nazaire
4eebf9109acSHRINE2020-1196 - Fix SHRINE docker network
Marc-Danie NazaireMarc-Danie Nazaire
af1df03d868Pull request #1316: Bugfix/SHRINE2020 1195 - Wording for readable criteria text for three event queries Merge in SHR...
Marc-Danie NazaireMarc-Danie Nazaire
d84bbaeebd5SHRINE2020-1195 - Wording for readable criteria text for three event queries - Fixed unit test after merge
Marc-Danie NazaireMarc-Danie Nazaire
f9dd6f5e3f0Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into bugfix/SHRINE2020-1195
David WalendDavid Walend
24fcb1c7f83Pull request #1313: Feature/SHRINE2020 1102 Merge in SHRINE/shrine from feature/SHRINE2020-1102 to develop * commit...
dwalenddwalend
4f07c7203f3Review comment from Marc-Danie for SHRINE2020-1102
Carl WoolfCarl Woolf
f800c4133e3separate header-addition into its own filter
Marc-Danie NazaireMarc-Danie Nazaire
92736f1318dSHRINE2020-1195 - Wording for readable criteria text for three event queries - Updated unit tests
dwalenddwalend
da15c906216Moved the breakdownResultOutputTypes default section to the adapter for SHRINE2020-1178
XavXav
7be65f003aaMerge branch 'develop' into sso-phase1
Marc-Danie NazaireMarc-Danie Nazaire
04ffc2a4b93Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into bugfix/SHRINE2020-1196
Marc-Danie NazaireMarc-Danie Nazaire
dc71fb9ac9aSHRINE2020-1195 - Wording for readable criteria text for three event queries - another comment edit
Marc-Danie NazaireMarc-Danie Nazaire
e522ae70235SHRINE2020-1195 - Wording for readable criteria text for three event queries - comment edit
Marc-Danie NazaireMarc-Danie Nazaire
c163c5cc496SHRINE2020-1195 - Wording for readable criteria text for three event queries - Added unit test
XavXav
b644b379d36Reinstate changes made to provide the value of the "remote_user" request header as that of the "remoteUser" request a...
dwalenddwalend
82e9a2e5e4dSome tidying up for SHRINE2020-1200
Marc-Danie NazaireMarc-Danie Nazaire
0db40525221SHRINE2020-1195 - Wording for readable criteria text for three event queries
Marc-Danie NazaireMarc-Danie Nazaire
43403cb1fb9removed modification of getHeader(s: String) method
Marc-Danie NazaireMarc-Danie Nazaire
08ce2915ed6minor formatting change
Marc-Danie NazaireMarc-Danie Nazaire
384383c3307added check for null remoteUser attribute in modified header methods
dwalenddwalend
7e796212f50Added back changeDate for SHRINE2020-1200
Marc-Danie NazaireMarc-Danie Nazaire
833d16a6e05modified getHeaderNames to only add remote_user if it exists
dwalenddwalend
5c53431a9b4Didn't mean to delete dateCreated for SHRINE2020-1200
dwalenddwalend
71b2ad50982Maybe this capitalization matters for SHRINE2020-1200
Marc-Danie NazaireMarc-Danie Nazaire
e418469c2a8add back remote user to getHeaderNames
Marc-Danie NazaireMarc-Danie Nazaire
02ffc580710add back remote user to getHeader(s: String)
Marc-Danie NazaireMarc-Danie Nazaire
ba98e7e69d4add back remote user to getHeaderNames
Marc-Danie NazaireMarc-Danie Nazaire
5635e251931add back remote user to getHeaders(s: String)
Marc-Danie NazaireMarc-Danie Nazaire
767b6ba4348comment out insertion of remote user
dwalenddwalend
2636ee4a67bsemicolon for SHRINE2020-1200
Marc-Danie NazaireMarc-Danie Nazaire
16b3ac5a528Merge branch 'sso-phase1' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into sso-phase1  Conflicts: ...
Marc-Danie NazaireMarc-Danie Nazaire
0554954c3bfcomment out some of the logging
dwalenddwalend
e4321a98090First pass of database cleanup for SHRINE2020-1200
dwalenddwalend
da88cdfb271Changed out for a better exception for SHRINE2020-1131
dwalenddwalend
d5f10747516Another stray import for SHRINE2020-1102
XavXav
3f25fd0dc90Reinstate changes made to provide the value of the "remote_user" request header as that of the "remoteUser" request a...
dwalenddwalend
c85d792e2edMerge remote-tracking branch 'origin/develop' into feature/SHRINE2020-1102
dwalenddwalend
f71158b0c87Couple of wierd imports that slipped in for SHRINE2020-1102
XavXav
e0a938087a6Roll back changes made to provide the value of the "remote_user" request header as that of the "remoteUser" request a...
dwalenddwalend
6b89a8f00cfFound a way to move CrcRequestType after freeing it up for SHRINE2020-1102
Marc-Danie NazaireMarc-Danie Nazaire
284cae84e73Pull request #1312: SHRINE2020-1188 - "(optional)" is missing from the text displayed in Event 3 panel Merge in SHRI...
dwalenddwalend
04273162858Diffusing CrcRequestType and RequestType dependencies for SHRINE2020-1102
Marc-Danie NazaireMarc-Danie Nazaire
f4a70112ac9SHRINE2020-1188 - "(optional)" is missing from the text displayed in Event 3 panel
dwalenddwalend
384a4a469a6Moved stuff used by just the PM cell auth check to auth for SHRINE2020-1102
Marc-Danie NazaireMarc-Danie Nazaire
718c51af488Pull request #1308: Feature/SHRINE2020 1197 - Add a "Add Event" button to trigger the 3rd event panel Merge in SHRIN...
dwalenddwalend
2c26ebcc750Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-1102
Marc-Danie NazaireMarc-Danie Nazaire
ee959c80eb0SHRINE2020-1197 - Add a "Add Event" button to trigger the 3rd event panel - css cleanup
Marc-Danie NazaireMarc-Danie Nazaire
b68c69166bbSHRINE2020-1197 - Add a "Add Event" button to trigger the 3rd event panel - Fixed switch from and to timeline
dwalenddwalend
8d0e5f56868Moved more adapter-only code for SHRINE2020-1102, including the query package
Marc-Danie NazaireMarc-Danie Nazaire
c52f5dc191cSHRINE2020-1197 - Add a "Add Event" button to trigger the 3rd event panel - css change
Carl WoolfCarl Woolf
7d0fdafbf9dtypo
Carl WoolfCarl Woolf
a02b4714b70clean up logs a bit
Carl WoolfCarl Woolf
8aad9cd73c1tell users to call userId via id 'remoteUser'
dwalenddwalend
27ee10210f5Even more refactoring and deleting for SHRINE2020-1102
Carl WoolfCarl Woolf
7c963e1ced2What about method getRemoteUser()!?
Carl WoolfCarl Woolf
e2ac47a5216Another try for (log) header for remote_user
Carl WoolfCarl Woolf
f79abbb64e8Look for (log) header for (ajp_)remote_user
dwalenddwalend
e6bae1a7adaRemoved even more dead code for SHRINE2020-1102
Carl WoolfCarl Woolf
08270d568b8Look for (log) attribute for remote_user
Carl WoolfCarl Woolf
319863949e3samples update
Marc-Danie NazaireMarc-Danie Nazaire
654160bbc23SHRINE2020-1196 - Fix SHRINE docker network - hub config cleanup
Marc-Danie NazaireMarc-Danie Nazaire
a8536996093SHRINE2020-1196 - Fix SHRINE docker network - Comment cleanup
Marc-Danie NazaireMarc-Danie Nazaire
7746f202676SHRINE2020-1196 - Fix SHRINE docker network
Carl WoolfCarl Woolf
b00843b9c87fix merge bug
Carl WoolfCarl Woolf
f57d0d83569sample
Carl WoolfCarl Woolf
5c80819e3a4Merge remote-tracking branch 'origin/sso-phase1' into sso-phase1
Carl WoolfCarl Woolf
9e8921a5213Merge branch 'develop' into sso-phase1 # Conflicts: # pom.xml
XavXav
636a61b5343Add Tomcat's server.xml configuration file
Marc-Danie NazaireMarc-Danie Nazaire
f4f1671fcb2convert to proper java enumeration
Carl WoolfCarl Woolf
64225b3f06cstep one for adding remote_header to requests -- override a few irritable methods
Carl WoolfCarl Woolf
ea8d232393bstep zero for adding remote_header to requests
Marc-Danie NazaireMarc-Danie Nazaire
31fe0a343eaPull request #1309: SHRINE2020-1199 - Start making SHRINE-4.0.0 SNAPSHOTS Merge in SHRINE/shrine from feature/SHRINE...
Carl WoolfCarl Woolf
ad0358b13d0samples
Carl WoolfCarl Woolf
f3176fd670bmake 'samples' match SSOT (sso-configs)
XavXav
f96d01260ebRemoved no-longer-needed (officially as of Apache 2.4.10, tested with 2.4.54) work-around to populate the local addre...
Carl WoolfCarl Woolf
25e4d698989try getting remote_user from attributes
Carl WoolfCarl Woolf
74f26adab0dmay need local-address hack after all
Marc-Danie NazaireMarc-Danie Nazaire
c081ee8183cSHRINE2020-1199 - Start making SHRINE-4.0.0 SNAPSHOTS
Carl WoolfCarl Woolf
fcd385f4fdafix email spelling. comment out local-address hack
Carl WoolfCarl Woolf
5ee3987d41battributes might work better now?
Carl WoolfCarl Woolf
58b785849eftry adding attribute prefix AJP_
Marc-Danie NazaireMarc-Danie Nazaire
8b360993254SHRINE2020-1197 - Add a "Add Event" button to trigger the 3rd event panel - minor format change
Marc-Danie NazaireMarc-Danie Nazaire
3d75d547061SHRINE2020-1197 - Add a "Add Event" button to trigger the 3rd event panel - css tweak for the Add event button
Marc-Danie NazaireMarc-Danie Nazaire
0a56e7be423SHRINE2020-1197 - Add a "Add Event" button to trigger the 3rd event panel - Code cleanup
Marc-Danie NazaireMarc-Danie Nazaire
fd0db6b963aSHRINE2020-1197 - Add a "Add Event" button to trigger the 3rd event panel - Fixed unit test
Carl WoolfCarl Woolf
13f13add4bfadd dump of attributes
Marc-Danie NazaireMarc-Danie Nazaire
06104cf3c13SHRINE2020-1197 - Add a "Add Event" button to trigger the 3rd event panel
dwalenddwalend
537dfa24a33Moved all of the Read pairs for SHRIEN2020-1102
XavXav
2fc8e3e7af6switch to headers mode (with accompanying change to sp.conf: ShibUseHeaders On) which populates the headers appropria...
dwalenddwalend
7e29784d2b0Moving more code for SHRINE2020-1102
dwalenddwalend
5d1ca57b62cFound more dead code to delete for SHRINE2020-1102
dwalenddwalend
7f12c1523b2Think I found a technique to untie the knot in the i2b2 protocol for SHRINE2020-1102
Marc-Danie NazaireMarc-Danie Nazaire
76b2bc1aeefPull request #1307: Feature/SHRINE2020 1090 - Add options to "the first" to a drop for both event relationships - Add...
Marc-Danie NazaireMarc-Danie Nazaire
7287a2c8c88Pull request #1306: SHRINE2020-1092 - Reload queries with the 3rd event when "edit criteria" is selected Merge in SH...
Marc-Danie NazaireMarc-Danie Nazaire
af8aad10a75revert call remoteUser function on request
Marc-Danie NazaireMarc-Danie Nazaire
c56e5f49c9acall remoteUser function on request
Marc-Danie NazaireMarc-Danie Nazaire
bb63ab60653check for certain attributes
Marc-Danie NazaireMarc-Danie Nazaire
07ea2f0c7cereturns attributes in request in qep/authPing api call
Marc-Danie NazaireMarc-Danie Nazaire
4b99cb2babelist attributes names in ContentSecurityPolicyFilter
Marc-Danie NazaireMarc-Danie Nazaire
8276a596ff8returns attributes in request as json in qep/authPing api call
Marc-Danie NazaireMarc-Danie Nazaire
a5be4b33b5dreturns entire request as json in qep/authPing api call
Marc-Danie NazaireMarc-Danie Nazaire
e7fb5c86f0adebug output
Marc-Danie NazaireMarc-Danie Nazaire
5be3a589280changes to modify request in order to set localAddress
Marc-Danie NazaireMarc-Danie Nazaire
ddf9cc71b00changes to modify request in order to set localAddress
Marc-Danie NazaireMarc-Danie Nazaire
7b43d077454edit debug logging to ContentSecurityPolicyFilter.scala
Marc-Danie NazaireMarc-Danie Nazaire
20013dc0014added debug logging to ContentSecurityPolicyFilter.scala
Marc-Danie NazaireMarc-Danie Nazaire
6f6fa277580SHRINE2020-1090 - Add options to "the first" to a drop for both event relationships - Added missing test snapshot file
Marc-Danie NazaireMarc-Danie Nazaire
59ff13df03cSHRINE2020-1090 - Add options to "the first" to a drop for both event relationships - Add front end test
Marc-Danie NazaireMarc-Danie Nazaire
fde9109d06cSHRINE2020-1090 - Add options to "the first" to a drop for both event relationships
Marc-Danie NazaireMarc-Danie Nazaire
8ab55663ab0Merge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-1092
Marc-Danie NazaireMarc-Danie Nazaire
5ac46a45bb5Merge pull request #1305 in SHRINE/shrine from feature/SHRINE2020-1087 to develop * commit '22f934a3a8f8d7573477e9d4...
XavXav
4a3af7f3aceRevert "go back to previous logout behavior, so as to experiment logout behavior" This reverts commit 39f2e0a11987e1...
XavXav
39f2e0a1198go back to previous logout behavior, so as to experiment logout behavior
Marc-Danie NazaireMarc-Danie Nazaire
22f934a3a8fMerge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into feature/SHRINE2020-1087
David WalendDavid Walend
402536cf1f8Merge pull request #1304 in SHRINE/shrine from feature/SHRINE2020-1102 to develop * commit '68ff78ddacffd8377595c9d3...
Marc-Danie NazaireMarc-Danie Nazaire
7bd1d1f3ab4SHRINE2020-1087 -Allow the user to define the relationship between the 2nd and 3rd event
dwalenddwalend
68ff78ddacfMerging
David WalendDavid Walend
bea0c1c882eMerge pull request #1300 in SHRINE/shrine from feature/SHRINE2020-1181 to develop * commit '938226ad8102a5f443498f20...
dwalenddwalend
7ec9e49d7d4My own review for SHRINE2020-1102
dwalenddwalend
800fe4fe46bMerge remote-tracking branch 'origin/develop' into feature/SHRINE2020-1102
dwalenddwalend
938226ad810Merging
David WalendDavid Walend
cc46b6dced1Merge pull request #1301 in SHRINE/shrine from feature/SHRINE2020-1101 to develop * commit '0ca2566d617bc7d8c7596175...
XavXav
2d0c61bd66fattempt to SSO sign out from the top-right badge
Marc-Danie NazaireMarc-Danie Nazaire
99c98e02976SHRINE2020-1087 -Allow the user to define the relationship between the 2nd and 3rd event
dwalenddwalend
7a3db567734Merging
dwalenddwalend
8fbe04711dbMarc-Danie review comments for SHRINE2020-1181
dwalenddwalend
012861400d1Merge remote-tracking branch 'origin/develop' into feature/SHRINE2020-1181
dwalenddwalend
75f35cdbcbfFinally untangled and deleted enough to move BroadcastMessage for SHRINE2020-1102
dwalenddwalend
daabf5f2317Oh that
dwalenddwalend
b86c3508bc6Finally moving some code instead of just deleting it for SHRINE2020-1102
dwalenddwalend
b909d51572bDeleted the handlers nonsense and decoupled a lot of concrete-abstract cross-reference knots for SHRINE2020-1102
Marc-Danie NazaireMarc-Danie Nazaire
79478d546e8SHRINE2020-1182 - Vericode Scan: Fix cross-site scripting flaw in qep/.../Header/HeaderMenu.js
Marc-Danie NazaireMarc-Danie Nazaire
fd0543f2df1Merge pull request #1303 in SHRINE/shrine from feature/SHRINE2020-1182 to develop * commit '92b7e4a0ed37d9cbcf2a1210...
Marc-Danie NazaireMarc-Danie Nazaire
a3d35fa746eChanged revision in base POM to 3.2.2
Marc-Danie NazaireMarc-Danie Nazaire
2dbfa74a00bRevert "Update POMs with release version 3.2.1." This reverts commit 027a1673fcca6c629bc5bfa9f52c56016504ba10.
Marc-Danie NazaireMarc-Danie Nazaire
92b7e4a0ed3SHRINE2020-1182 - Vericode Scan: Fix cross-site scripting flaw in qep/.../Header/HeaderMenu.js - modified to use an e...
dwalenddwalend
448a1f8d53dDeleted ReadQueryDefinitionRequest and its kin for SHRINE2020-1102
Marc-Danie NazaireMarc-Danie Nazaire
1eb5c6caa96Switched to using basic or bearer auth in login service instead of just basic auth
dwalenddwalend
d2222d8b2f8Got rid of the old rename request and response for SHRINE2020-1102
XavXav
6cb8c64f348attempt to go to the Shrine web client after successful SSO login
dwalenddwalend
dfa2df03e22Deleted ReadResultOutputTypes for SHRINE2020-1102
David WalendDavid Walend
75690fb9b4bMerge pull request #1302 in SHRINE/shrine from feature/SHRINE2020-954 to develop * commit '5b692676efa3522e5d26ca12d...
dwalenddwalend
5c2397a12caDeleted more dead code for SHRINE2020-1102
dwalenddwalend
5b692676efaRemoved the nodes web api method for SHRINE2020-954
dwalenddwalend
787606b98e8Deleting more dead code for SHRINE2020-1102
Marc-Danie NazaireMarc-Danie Nazaire
568d76d71adSHRINE2020-1182 - Vericode Scan: Fix cross-site scripting flaw in qep/.../Header/HeaderMenu.js
dwalenddwalend
b76239caaf2Deleting the really old HMS topic handling for SHRINE2020-1102
dwalenddwalend
7fa3e186d49Removed the flag/unflag commands for SHRINE2020-1102
dwalenddwalend
d24cb342841Deleted a file that wasn't used anymore for SHRINE2020-1102
dwalenddwalend
615e8d704d5Managed to move some test code for SHRINE2020-1102
dwalenddwalend
8097beaec0bSeparated the v1 protocol into its own package for SHRINE2020-1102
dwalenddwalend
5ccbcf5becdMerge branch 'feature/SHRINE2020-1181' into feature/SHRINE2020-1102
dwalenddwalend
da675396217Merge branch 'feature/SHRINE2020-954' into feature/SHRINE2020-1102
Carl WoolfCarl Woolf
02f5e722400display headers for authPing
Carl WoolfCarl Woolf
e2db30f17ecMark where/what to change in the config files -- points to wiki for explanation
Carl WoolfCarl Woolf
87389bfaf93first try for phase1 SP
dwalenddwalend
c2963fae86bCode review of SHRINE2020-954
dwalenddwalend
7550234b26fThe hub no longer needs to authorize anything SHRINE2020-954
dwalenddwalend
d4cc51d07bbRemoved support for that if-no-network business in SHRINE2020-954
dwalenddwalend
9e90e0dae33Removed the curl commands that change the network for SHRINE2020-954
dwalenddwalend
0ca2566d617Found while sweeping up SHRINE2020-1101
dwalenddwalend
d3c15ae7a7eBig delete for SHRINE2020-1101
dwalenddwalend
13d228c205aRemoved the xml definition field from queries for SHRINE2020-1101
dwalenddwalend
a155b516cecMade a JSON version of the query required for SHRINE2020-1101
dwalenddwalend
073f1045640Comment cleanup for SHRINE2020-1181
dwalenddwalend
9acbe95f0beQuick bug fix for SHRINE2020-1181
dwalenddwalend
176be5051bdRemoved first-or-any from concept groups for SHRINE2020-1181
Next →