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

開発中コードをv2.1.2に追従。 #5

Closed
wants to merge 46 commits into from
Closed

Conversation

GenbuHase
Copy link
Owner

No description provided.

GenbuHase and others added 30 commits December 31, 2017 16:28
* Adding Serbian translation

* i18n-tasks normalize
Serbian latin (sr-Latn) is generated automatically from Serbian (sr) translation. Also changed some wording in original (Serbian) translation.
* delete X-UA-Compatible

* undo

* restore
* Add confirmation step for email changes

This adds a confirmation step for email changes of existing users.
Like the initial account confirmation, a confirmation link is sent
to the new address.

Additionally, a notification is sent to the existing address when
the change is initiated. This message includes instruction to reset
the password immediately or to contact the instance admin if the
change was not initiated by the account owner.

Fixes mastodon#3871

* Add review fixes
There's no reason for an Account record to persist after Delete->Actor is received. SuspendAccountService is necessary to make sure deleted toots get sent over streaming API properly and home feeds get cleaned up. By removing Account record, we can ensure that if in the future the account is restored remotely (or username reused), it can start with a clean slate.
* Fix mastodon#6140 - Update moved-to property when it's removed too

* Remove trailing whitespace
* Sanitize classlist properly

* Actually properly sanitize every class after the first

* Improve Formatter spec to check for multiple classes and non-space whitespace
…6163)

The background of the navigation matters because its scrollbar is
transparent.
* Allow HTTP caching of json view of public statuses

HTML views are not cached as they can contain private statuses as well

* Disable session cookies for ActivityPub json rendering of public toots
…mastodon#6071, mastodon#6099, mastodon#6125 and mastodon#6132 (mastodon#6167)

* yarn manage:translations

* Add Japanese translation for mastodon#5997

* Add Japanese translation for mastodon#6003

* Add Japanese translation for mastodon#6004

* Add Japanese translation for mastodon#6071

* Add Japanese translation for mastodon#6099

* Add Japanese translation for mastodon#6125

* Add Japanese translation for mastodon#6132
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
* Allow to dereference Follow object for ActivityPub

* Accept IRI as object representation for Accept activity
* Don't normalize URLs in toots

URL normalization is ill-defined and may cause certain links to break.

* Change specs since we are not normalizing user-provided URLs
* new strings: hashtag+unlisted, mute, block

* Add confirmation step for email changes

* Add more instance stats APIs
Though the subsections are representing features such as navigation and
settings, they are categorized by the ways how they are implemented
(internal navigation or external links.) They are irrelevant and some
arrangements were confusing because of that. (It is nonsense that instance
information is in settings subsection, for example.)

This fixes the issue by rearranging.
mastodon#6170)

without them, such as is the case with GNU social

Fixes the ability to find GNU social accounts via URL in search and
when using remote follow function
* Improve Traditional Chinese translations

* Sort alphabetically
Signed-off-by: Marcin Mikołajczak <me@m4sk.in>
ykzts and others added 16 commits January 4, 2018 15:36
…on#6183)

Migration is wrapped by transaction, so manual `commit_db_transaction` without transaction restarting causes "there is no transaction in progress" warnings. We should use `disable_ddl_transaction!` instead, if we can omit transaction completely.
A change introduced in mastodon#6125 prevents
`Devise::Models::Confirmable#confirm` from being called for existing
users, which in turn leads to `email` not being set to
`unconfirmed_email`, breaking email updates. This also adds a test
that would've caught this issue.
* fixup! v2

* fixup! v2

* fixup! v2

* fixup! v2

* fixup! v2

* fixup! v2

* fixup! v2

* fixup! v2

* fixup! v2

* fixup! v2

* fixup! v2

* fixup! v2

* fixup! v2

* fixup! v2

* fixup! v2

* fixup! v2

* fixup! v2

* fixup! v2
* Create email_changed.oc.html.erb

* Create email_changed.oc.text.erb

* Update email_changed.oc.html.erb

* Update email_changed.oc.html.erb

* Create reconfirmation_instructions.oc.html.erb

* Create reconfirmation_instructions.oc.text.erb

* Update confirmation_instructions.oc.html.erb

* Update confirmation_instructions.oc.text.erb

* Update confirmation_instructions.oc.html.erb

* Update reconfirmation_instructions.oc.html.erb

* Update reconfirmation_instructions.oc.text.erb

* Update reconfirmation_instructions.oc.html.erb
@GenbuHase
Copy link
Owner Author

ブランチをミス。

@GenbuHase GenbuHase closed this Jan 8, 2018
@GenbuHase GenbuHase deleted the check-v2.1.2 branch January 8, 2018 06:06
GenbuHase pushed a commit that referenced this pull request Jan 9, 2018
[WIP] Mastodon Extended v3の反映
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.