Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Show expiration time in server's local time #645

Merged
merged 1 commit into from
Jan 4, 2025

Conversation

x1uc
Copy link
Contributor

@x1uc x1uc commented Jan 4, 2025

Resolves #641

Related PR: #644

The above PR has largely addressed the corresponding issue, but there is one missing part. This PR completes the missing part.

Copy link

github-actions bot commented Jan 4, 2025

CLA Assistant Lite bot All contributors have signed the CLA ✍️ ✅

@x1uc
Copy link
Contributor Author

x1uc commented Jan 4, 2025

I have read the CLA Document and I hereby sign the CLA

Copy link
Owner

@mtlynch mtlynch left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks!

Just a small process note, the better way to continue changes someone else began on a git project is to preserve their commits. This PR dropped 55e8813 from the change history. It's not a big deal in this case because it's such a small change, but developers and maintainers will generally be happier if you preserve the commit history to show that others contributed to a PR.

Here's what that would have looked like here:

# Add my copy of picoshare (mtlynch/picoshare) as a git remote called "upstream"
git remote add upstream git@github.com:mtlynch/picoshare.git

# Get my work in progress branch
git checkout upstream/show-local-exp-time

# If you check git log at this point, 55e881 (my partial fix) should be the most recent change

# Create a new branch for your work
git checkout -b fix-e2e

# Make your additional changes to handlers/views.go
vim handlers/views.go

# Commit your changes
git add handlers/views.go
git commit --message "Repeat @mtlynch's e2e fix in one more spot"

# Push your changes
git push origin fix-e2e

# Make the PR

@mtlynch mtlynch merged commit 8be4eea into mtlynch:master Jan 4, 2025
9 checks passed
@github-actions github-actions bot locked and limited conversation to collaborators Jan 4, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Due to time zone issues, the e2e test cannot be passed
2 participants