SHRINE
  1. SHRINE

shrine

Public
  1. SHRINE
  2. shrine

All Branches Graph  

        
AuthorCommitMessageCommit dateBuilds
Marc-Danie NazaireMarc-Danie Nazaire
dc683ac13d8SHRINE2020-1089 - If the user deletes the last concept in event 3, reset the panel and relationship to default - Fixe...
Marc-Danie NazaireMarc-Danie Nazaire
5b151466f62SHRINE2020-1089 - If the user deletes the last concept in event 3, reset the panel and relationship to default - Fixe...
XavXav
6af3cca8572SHRINE2020-1208 : add missing import; add console logging
XavXav
698743cdd64SHRINE2020-1208 : Fix typo; logout of SSO when clicking logout on the time out dialog
Marc-Danie NazaireMarc-Danie Nazaire
91848a9b79dPull request #1320: SHRINE2020-1195 - Wording for readable criteria text for three event queries - Fixed missing star...
Marc-Danie NazaireMarc-Danie Nazaire
d8a92fe9912SHRINE2020-1195 - Wording for readable criteria text for three event queries - Fixed missing start date in criteria h...
XavXav
75e627c2526SHRINE2020-1208 : modify session time-out dialog to meet requirements
XavXav
b81c193782dphase1-sso : rm link to "www.google.com" where not needed; replace with "some-logout-url" where needed
David WalendDavid Walend
8dd96fe74fePull request #1317: Bugfix/SHRINE2020 1178 Merge in SHRINE/shrine from bugfix/SHRINE2020-1178 to develop * commit '...
Marc-Danie NazaireMarc-Danie Nazaire
84f76027f4eMerge branch 'develop' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into bugfix/SHRINE2020-1196
XavXav
6d1a63badf8Merge branch 'develop' into sso-phase1 # Conflicts: # commons/auth/src/main/scala/net/shrine/authentication/http4s/U...
Marc-Danie NazaireMarc-Danie Nazaire
ce6233d2e8dsso-phase1: cleanup code for displaying landing page instead of login page when in sso mode
Marc-Danie NazaireMarc-Danie Nazaire
b1461496275sso-phase1: check cookie to see whether to display login info
Marc-Danie NazaireMarc-Danie Nazaire
b0a4a8ea876sso-phase1: test setting cookie
Marc-Danie NazaireMarc-Danie Nazaire
d4653ab122dsso-phase1: add custom response header for sso
Marc-Danie NazaireMarc-Danie Nazaire
a62031ef683sso-phase1: add check for null query string
Marc-Danie NazaireMarc-Danie Nazaire
c2997cabf95Merge remote-tracking branch 'origin/sso-phase1' into sso-phase1
Marc-Danie NazaireMarc-Danie Nazaire
3fb181be064sso-phase1: added back placeholder holder username and password to login request
XavXav
4f0ba02bdd8Merge remote-tracking branch 'origin/sso-phase1' into sso-phase1
XavXav
c112785d4e5add some detailed comments to the sample configuration files
Marc-Danie NazaireMarc-Danie Nazaire
a679d1cbb59sso-phase1: modify query string and removed check for authType on front-end
Marc-Danie NazaireMarc-Danie Nazaire
10e2c72d1b9sso-phase1: added back query string logging
Marc-Danie NazaireMarc-Danie Nazaire
47ab34f069csso-phase1: removed throwing of exception in UserAuthentication.scalah
Marc-Danie NazaireMarc-Danie Nazaire
d9bece30f7bsso-phase1: reverting all changes for hack URL queryString to set sso mode
Marc-Danie NazaireMarc-Danie Nazaire
09f31d88301sso-phase1: undo hack URL queryString to set sso mode
Marc-Danie NazaireMarc-Danie Nazaire
8b3ae570a8fsso-phase1: hack URL queryString to set sso mode
Marc-Danie NazaireMarc-Danie Nazaire
47cd45ccd96sso-phase1: prep work for not displaying login page for shib auth
Marc-Danie NazaireMarc-Danie Nazaire
6cd8df1423asso-phase1: renamed authenticationType for single sign-on from "sso" to "shib"
Marc-Danie NazaireMarc-Danie Nazaire
8cc8a8afa96Merge remote-tracking branch 'origin/sso-phase1' into sso-phase1 # Conflicts: # qep/frontend/src/models/NetworkConfi...
Marc-Danie NazaireMarc-Danie Nazaire
d63c792fd76sso-phase1: a little code cleanup for changes for making ssoLogoutUrl configurable
XavXav
fea94d140caMerge branch 'sso-phase1' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into sso-phase1  Conflicts: ...
XavXav
67a1ba3d7e0Attempt to tie value of ssoLogoutUrl from REST call to UI
Marc-Danie NazaireMarc-Danie Nazaire
6d1d314c49eMerge remote-tracking branch 'origin/sso-phase1' into sso-phase1 # Conflicts: # shrine-setup/src/main/resources/shri...
Marc-Danie NazaireMarc-Danie Nazaire
a3ee66fc8b7sso-phase1: added ssLogoutUser to the NetworkConfig model
Carl WoolfCarl Woolf
e98794aa44fMerge remote-tracking branch 'origin/sso-phase1' into sso-phase1
Carl WoolfCarl Woolf
1bdfbdb74d5console.log the authType
XavXav
91b5e941707Merge branch 'sso-phase1' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into sso-phase1
Carl WoolfCarl Woolf
ed714b39594yet another try to skip login form
XavXav
f39b5a5dca1Merge branch 'sso-phase1' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into sso-phase1  Conflicts: ...
XavXav
c7755835a7bdeleted useless comment
Marc-Danie NazaireMarc-Danie Nazaire
ecbb1fe58b2sso-phase1: moved ssoLogoutUrl to shrine.webclient section of shrine.conf
David WalendDavid Walend
7daed6780c4Pull request #1314: Feature/SHRINE2020 1131 Merge in SHRINE/shrine from feature/SHRINE2020-1131 to develop * commit...
XavXav
19964eda0d4Merge branch 'sso-phase1' of https://open.catalyst.harvard.edu/stash/scm/shrine/shrine into sso-phase1
XavXav
1299191ed2dPush ssoLogoutUrl under webclient in the config files
Marc-Danie NazaireMarc-Danie Nazaire
53dadf9fe5dsso-phase1: log updates
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...
Next →