Commit Graph

10708 Commits

Author SHA1 Message Date
9be032f613
Merge branch 'back-3.3.0' into quote-main 2021-05-19 16:54:23 +09:00
4a42a0c65f Merge branch 'quote-main' of https://github.com/fedibird/mastodon into quote-main 2021-05-19 16:50:15 +09:00
noellabo
d6fff9ba23 Fix quote on public stream 2021-05-19 14:58:51 +09:00
noellabo
64a4e4de0a Fix not hiding quoted unlisted status in non public timeline 2021-05-19 14:58:51 +09:00
noellabo
707f69e851 Fix missing frameRate 2021-05-19 14:58:51 +09:00
noellabo
bf17a8141b Fix missing reblog_of_quote 2021-05-19 14:58:51 +09:00
noellabo
d4474db288 Fix modal footer to react to quoted posts 2021-05-19 14:58:51 +09:00
noellabo
6d58d975df Fix quoted account link in detailed status 2021-05-19 14:58:51 +09:00
noellabo
6a29bb7639 Fix expand video on public page for quote 2021-05-19 14:58:51 +09:00
noellabo
b205de3fd0 fix rtl in quote_indicator 2021-05-19 14:58:51 +09:00
noellabo
afc65e901f Fix Open handler in quote media 2021-05-19 14:58:51 +09:00
noellabo
3c889eda8e Add quote button in PiP 2021-05-19 14:58:51 +09:00
noellabo
17e0ba29e4 Fix to hide mute and blocked quotes 2021-05-19 14:58:51 +09:00
noellabo
77c98a3503 Fix PictureInPicture to work in quotes 2021-05-19 14:58:51 +09:00
noellabo
c5300b0df4 Fix quoted audio 2021-05-19 14:58:51 +09:00
noellabo
55d2f6b791 Fix tooltip 'cannot be quoted' 2021-05-19 14:58:51 +09:00
noellabo
9b06011b0a Fix an avatar icon size of the status quoted on the public page 2021-05-19 14:58:51 +09:00
noellabo
e408db4bb1 Add "Show poll" link to quoted poll 2021-05-19 14:58:51 +09:00
noellabo
09ba90ad8c Apply quote by parsing post body 2021-05-19 14:58:51 +09:00
noellabo
4ae259d990 Compatible with Misskey quote 2021-05-19 14:58:51 +09:00
noellabo
95c39af5c2 Change not to delete the element specified in invisible 2021-05-19 14:58:51 +09:00
noellabo
def6c3eb1f Add index to statuses quote_id 2021-05-19 14:58:51 +09:00
noellabo
1502f9fa42 Fix to reject status quotations other than public and unlisted 2021-05-19 14:58:51 +09:00
noellabo
a2ad6ca6b0 Add confirmation of overwriting of input content when quoting 2021-05-19 14:58:51 +09:00
noellabo
a47b6ffc65 Add feature_quote to instance API 2021-05-19 14:58:51 +09:00
noellabo
98f48c8f13 Fix boost target to be quoted if boosted 2021-05-19 14:58:51 +09:00
noellabo
ee18bd6970 Fix quote nesting at once, add quote_id 2021-05-19 14:58:51 +09:00
wakin
97ebc10c3c remake quote feature 2021-05-19 14:58:51 +09:00
Genbu Hase
94ba7b284a [New] Implement a feature of quote 2021-05-19 14:58:51 +09:00
Zero King
689974b1ed
Remove duplicate CSS property of margin (#16277) 2021-05-18 20:13:44 +02:00
dependabot[bot]
08d6a7764f
Bump nokogiri from 1.11.3 to 1.11.4 (#16252)
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.11.3 to 1.11.4.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.11.3...v1.11.4)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-17 22:36:44 +02:00
dependabot[bot]
3f599c3433
Bump puma from 5.3.0 to 5.3.1 (#16257)
Bumps [puma](https://github.com/puma/puma) from 5.3.0 to 5.3.1.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v5.3.0...v5.3.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-05-17 22:36:29 +02:00
Claire
97539b6a96
Fix host check on healthcheck path not being disabled (#16270)
Fixes #16251

There was a typo in #16243
2021-05-17 22:36:08 +02:00
Mélanie Chauvel
d137d2ab87
Replace “status” and “message” by “post” in WebUI (#16271) 2021-05-17 22:31:35 +02:00
ce4b04df21
Merge pull request #445 from YoheiZuho/v3.4
V3.4
2021-05-17 08:15:50 +09:00
989be61e51
Merge branch 'back-3.3.0' into v3.4 2021-05-17 08:15:42 +09:00
Eugen Rochko
4c7efdba40
Bump version to 3.4.0 (#16239) 2021-05-16 23:55:07 +02:00
Eugen Rochko
d862728ae1
Add more checks to repo:check_locales_files (#16249) 2021-05-16 23:54:46 +02:00
Eugen Rochko
132adcc8da
New Crowdin updates (#16241)
* New translations en.yml (Czech)
[ci skip]

* New translations en.yml (Czech)
[ci skip]

* New translations en.json (Czech)
[ci skip]

* New translations en.yml (Czech)
[ci skip]

* New translations en.json (Czech)
[ci skip]

* New translations en.yml (Czech)
[ci skip]

* New translations en.yml (Czech)
[ci skip]

* New translations en.yml (Vietnamese)
[ci skip]

* New translations en.yml (Czech)
[ci skip]

* New translations en.yml (Czech)
[ci skip]

* New translations en.json (Czech)
[ci skip]

* New translations en.yml (Czech)
[ci skip]

* New translations simple_form.en.yml (Czech)
[ci skip]

* New translations en.json (Japanese)
[ci skip]

* New translations en.yml (Czech)
[ci skip]

* New translations devise.en.yml (Czech)
[ci skip]

* New translations en.json (Catalan)
[ci skip]

* New translations en.json (Catalan)
[ci skip]

* New translations simple_form.en.yml (Czech)
[ci skip]

* New translations devise.en.yml (Czech)
[ci skip]

* New translations en.yml (Japanese)
[ci skip]

* New translations en.yml (Japanese)
[ci skip]

* New translations en.yml (Czech)
[ci skip]

* New translations en.yml (Czech)
[ci skip]

* New translations simple_form.en.yml (Czech)
[ci skip]

* New translations en.json (Chinese Simplified)
[ci skip]

* New translations en.json (Chinese Simplified)
[ci skip]

* New translations en.yml (Chinese Simplified)
[ci skip]

* New translations simple_form.en.yml (Chinese Simplified)
[ci skip]

* New translations activerecord.en.yml (Chinese Simplified)
[ci skip]

* New translations devise.en.yml (Chinese Simplified)
[ci skip]

* New translations doorkeeper.en.yml (Chinese Simplified)
[ci skip]

* New translations en.json (Scottish Gaelic)
[ci skip]

* New translations en.yml (Scottish Gaelic)
[ci skip]

* New translations simple_form.en.yml (Japanese)
[ci skip]

* New translations en.json (Scottish Gaelic)
[ci skip]

* New translations simple_form.en.yml (Japanese)
[ci skip]

* i18n-tasks normalize

* Fix normalization
2021-05-16 23:54:25 +02:00
Yamagishi Kazutoshi
8cdeaf49ac
Fix security policy (#16248) 2021-05-16 23:50:16 +02:00
Eugen Rochko
cf699f7bf9
Add pull request title recommendations to CONTRIBUTING.md (#16247) 2021-05-16 23:09:21 +02:00
Eugen Rochko
e92f312aab
Change Node.js requirement in README (#16246) 2021-05-16 23:09:12 +02:00
dogelover911
52c4e17f7e
Add width and height to attachments in ActivityPub (#16245)
Co-authored-by: dogelover911 <dogelover911@localhost>
2021-05-16 23:09:03 +02:00
Jeong Arm
f09322f9cc
Disable host check on healthcheck path (#16243) 2021-05-16 19:48:59 +02:00
Rintan
15b28354e4 最新版Materialテーマのテスト 2021-05-16 19:38:41 +02:00
3f97d2b39c add chatroom link 2021-05-16 19:22:56 +02:00
1ea3cd470f remove bookmarkbuttom 2021-05-16 18:39:09 +02:00
dc591911ce
Merge pull request #443 from YoheiZuho/quote-main
Quote main
2021-05-17 00:52:43 +09:00
c4763e2deb Revert "fix bookmark"
This reverts commit ed58bd36aa.
2021-05-16 08:35:34 +02:00
bd61f79698 Revert "[New] Implement a feature of quote"
This reverts commit 37025a8170.
2021-05-16 08:29:45 +02:00