Merge Teleport V4.3 UI branch to master #3583
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
alex-kovoy
requested review from
klizhentas,
webvictim,
russjones and
fspmarshall
alex-kovoy
force-pushed
the
hornet
branch
2 times, most recently
from
ac75df7 to
3e6cebf
Compare
alex-kovoy
changed the title
|
retest this please |
* Add UserTokens to allow password resets * Pass context down through ChangePasswordWithToken * Rename UserToken to ResetPasswordToken * Add auto formatting for proto files * Add common Marshaller interfaces to reset password token
* Added LocalAuthEnabled prop to WebConfigAuthSetting struct in webconfig.go * Added LocalAuthEnabled state as part of webCfg in apiserver.go
* Set Teleport versions for node, auth, proxy init heartbeat * Add and retrieve fields NodeCount, PublicURL, AuthVersion from Clusters * Remove debug logging to avoid log pollution when getting public_addr of proxy * Create helper func GuessProxyHost to get the public_addr of a proxy host * Refactor newResetPasswordToken to use GuessProxyHost and remove publicUrl func
1b11b26 Simplify and clean up Makefile (#62) gravitational/webapps@1b11b26
* Let GuessProxyHost also return proxy's version * Unit test GuessProxyHostAndVersion & GetClusterDetails
4dfef4e Fix build pipeline (#66) gravitational/webapps@4dfef4e
0647568 Fix OSS redirects gravitational/webapps@0647568
e0f4189 Address security audit warnings Updates "minimist" package which is used by 7y old "optimist". gravitational/webapps@e0f4189
* Add fields ServerHostname and ServerAddr * Set these fields on newSession
|
retest this please |
benarent
changed the title
russjones
approved these changes
Apr 15, 2020
benarent
approved these changes
Apr 15, 2020
|
retest this please |
1 similar comment
|
retest this please |
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR merges Teleport V4.3 UI branch to master