It makes no sense to try using invalid or expired link again#4521
Merged
ykzts merged 1 commit intomastodon:masterfrom Aug 7, 2017
mkljczk:patch-1
Merged
It makes no sense to try using invalid or expired link again#4521ykzts merged 1 commit intomastodon:masterfrom mkljczk:patch-1
ykzts merged 1 commit intomastodon:masterfrom
mkljczk:patch-1
Conversation
Member
|
ref #4509 (comment) |
nullkal
suggested changes
Aug 5, 2017
config/locales/en.yml
Outdated
Contributor
There was a problem hiding this comment.
As per https://github.com/tootsuite/mastodon/blob/8d6c3cd48ae4f96752ff6b698bc7244d97aa9a27/config/initializers/devise.rb#L230, password reset token expires in 6 hours without consume it. I think "Please request a new one." is better.
Member
|
resolve conflicts. |
Signed-off-by: Marcin Mikołajczak <[email protected]>
Contributor
Author
|
@ykzts done |
ykzts
approved these changes
Aug 7, 2017
Gargron
pushed a commit
that referenced
this pull request
Aug 7, 2017
* Revert "Adjust tags and accounts page (#4534)" This reverts commit a3e53bd. * Revert "feat: Cache status height to avoid expensive renders (#4439)" This reverts commit 8eb6d17. * Revert "Refactor Avatar and AvatarOverlay to have 'account' as prop instead of src and staticSrc (#4526)" This reverts commit 5942347. * Revert "Update dependencies for Ruby (#4543)" This reverts commit 22db947. * Revert "[Docker] Add multicore support to "make" and "bundler" (#4544)" This reverts commit 5d408fd. * Revert "It makes no sense to try using invalid or expired link again (#4521)" This reverts commit 47579ec. * Revert "i18n: Update Polish translation (#4545)" This reverts commit 3363a05. * Revert "Set false to animated options for thumbnail processor (#4547)" This reverts commit 87f10d4.
Gargron
pushed a commit
that referenced
this pull request
Aug 10, 2017
Gargron
pushed a commit
that referenced
this pull request
Aug 23, 2017
lindwurm
pushed a commit
to akane-blue/mastodon
that referenced
this pull request
Aug 27, 2017
…4521, mastodon#4600 and mastodon#4664 (mastodon#4665) * Add Japanese translations for mastodon#2758, mastodon#4506, mastodon#4521, mastodon#4600 and mastodon#4664 * Do not translate Inbox URL and Outbox URL * Remove "あなたの" * Remove "あなたの"
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
No description provided.