|
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 |
|
|
c84f40331e
|
Revert "fix"
This reverts commit c345a1eedd .
|
2021-05-16 08:28:55 +02:00 |
|
|
259ef00c1a
|
Revert "fix rtl in quote_indicator"
This reverts commit fb9442dcc6 .
|
2021-05-16 08:28:43 +02:00 |
|
|
2721e13452
|
Revert "Add quote and bookmark button in PiP"
This reverts commit 70318ba219 .
|
2021-05-16 08:28:29 +02:00 |
|
|
611c31103c
|
Revert "Fix account link in quote"
This reverts commit bfe472cf3b .
|
2021-05-16 08:28:17 +02:00 |
|
|
dcee25381b
|
Revert "Add a quote URL to the search target string"
This reverts commit c1a505e654 .
|
2021-05-16 08:28:06 +02:00 |
|
|
04c1ff5680
|
Revert "Fix quote on public stream"
This reverts commit 23738ca635 .
|
2021-05-16 08:27:48 +02:00 |
|
Eugen Rochko
|
6528f8162e
|
New Crowdin updates (#16207)
* New translations en.yml (Czech)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations simple_form.en.yml (Japanese)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations simple_form.en.yml (Japanese)
[ci skip]
* New translations doorkeeper.en.yml (Japanese)
[ci skip]
* New translations en.json (Japanese)
[ci skip]
* New translations en.yml (Polish)
[ci skip]
* New translations en.yml (Japanese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations simple_form.en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations simple_form.en.yml (Vietnamese)
[ci skip]
* New translations doorkeeper.en.yml (Vietnamese)
[ci skip]
* New translations doorkeeper.en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Russian)
[ci skip]
* New translations simple_form.en.yml (Russian)
[ci skip]
* New translations activerecord.en.yml (Russian)
[ci skip]
* New translations devise.en.yml (Russian)
[ci skip]
* New translations doorkeeper.en.yml (Russian)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations simple_form.en.yml (Vietnamese)
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.json (Russian)
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations simple_form.en.yml (Vietnamese)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations en.json (Russian)
[ci skip]
* New translations en.yml (Vietnamese)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations devise.en.yml (Hungarian)
[ci skip]
* New translations doorkeeper.en.yml (Hungarian)
[ci skip]
* New translations simple_form.en.yml (Hungarian)
[ci skip]
* New translations simple_form.en.yml (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations simple_form.en.yml (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.json (Thai)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations simple_form.en.yml (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.json (Corsican)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations en.yml (Hungarian)
[ci skip]
* New translations simple_form.en.yml (Hungarian)
[ci skip]
* New translations doorkeeper.en.yml (Hungarian)
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.json (Esperanto)
[ci skip]
* New translations en.json (Russian)
[ci skip]
* New translations en.json (Scottish Gaelic)
[ci skip]
* New translations en.json (Scottish Gaelic)
[ci skip]
* New translations en.yml (Scottish Gaelic)
[ci skip]
* New translations simple_form.en.yml (Scottish Gaelic)
[ci skip]
* New translations activerecord.en.yml (Scottish Gaelic)
[ci skip]
* New translations devise.en.yml (Scottish Gaelic)
[ci skip]
* New translations doorkeeper.en.yml (Scottish Gaelic)
[ci skip]
* New translations simple_form.en.yml (Vietnamese)
[ci skip]
* New translations en.json (Galician)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (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 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 doorkeeper.en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.json (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Chinese Simplified)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.yml (Portuguese, Brazilian)
[ci skip]
* New translations en.json (Scottish Gaelic)
[ci skip]
* New translations en.json (Vietnamese)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations en.json (Hungarian)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations simple_form.en.yml (Korean)
[ci skip]
* New translations devise.en.yml (Korean)
[ci skip]
* New translations activerecord.en.yml (Hungarian)
[ci skip]
* New translations devise.en.yml (Hungarian)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations simple_form.en.yml (Korean)
[ci skip]
* New translations devise.en.yml (Hungarian)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations en.json (Korean)
[ci skip]
* New translations en.yml (Korean)
[ci skip]
* New translations en.json (Scottish Gaelic)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations en.json (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 (Czech)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations doorkeeper.en.yml (Czech)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations en.yml (Czech)
[ci skip]
* New translations en.json (Cornish)
[ci skip]
* New translations en.yml (Cornish)
[ci skip]
* New translations simple_form.en.yml (Czech)
[ci skip]
* New translations simple_form.en.yml (Czech)
[ci skip]
* New translations simple_form.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 (Czech)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations en.json (Czech)
[ci skip]
* New translations en.json (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.json (Czech)
[ci skip]
* New translations simple_form.en.yml (Czech)
[ci skip]
* New translations simple_form.en.yml (Czech)
[ci skip]
* New translations activerecord.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.yml (Czech)
[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 doorkeeper.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 (Czech)
[ci skip]
* i18n-tasks normalize
* yarn manage:translations
|
2021-05-16 08:27:11 +02:00 |
|
noellabo
|
23738ca635
|
Fix quote on public stream
|
2021-05-16 08:23:22 +02:00 |
|
noellabo
|
c1a505e654
|
Add a quote URL to the search target string
|
2021-05-16 08:20:49 +02:00 |
|
noellabo
|
bfe472cf3b
|
Fix account link in quote
|
2021-05-16 08:18:57 +02:00 |
|
noellabo
|
70318ba219
|
Add quote and bookmark button in PiP
|
2021-05-16 08:15:23 +02:00 |
|
noellabo
|
fb9442dcc6
|
fix rtl in quote_indicator
|
2021-05-16 08:06:56 +02:00 |
|
noellabo
|
c345a1eedd
|
fix
|
2021-05-16 08:04:21 +02:00 |
|
|
ed58bd36aa
|
fix bookmark
|
2021-05-16 08:00:22 +02:00 |
|
|
c1cbdd5354
|
Merge branch 'back-3.3.0' of https://github.com/yoheizuho/mastodon into back-3.3.0
|
2021-05-16 14:12:39 +09:00 |
|
Genbu Hase
|
37025a8170
|
[New] Implement a feature of quote
|
2021-05-16 14:09:17 +09:00 |
|
noellabo
|
f690ffccbc
|
Fix logout
|
2021-05-14 10:58:44 +02:00 |
|
|
5adea62191
|
fix
|
2021-05-14 07:59:09 +02:00 |
|
|
0ee25c7681
|
remove risa and fix
|
2021-05-14 07:06:51 +02:00 |
|
|
1769c45700
|
fix
|
2021-05-14 04:22:36 +02:00 |
|
|
595c1443bf
|
fix
|
2021-05-14 10:14:40 +09:00 |
|
noellabo
|
124153f8e0
|
Add place tab bar at bottom and add short label
modified: app/controllers/settings/preferences_controller.rb
modified: app/javascript/mastodon/features/compose/index.js
modified: app/javascript/mastodon/features/ui/components/columns_area.js
modified: app/javascript/mastodon/features/ui/components/tabs_bar.js
modified: app/javascript/mastodon/initial_state.js
modified: app/javascript/mastodon/locales/en.json
modified: app/javascript/mastodon/locales/ja.json
modified: app/javascript/styles/mastodon/basics.scss
modified: app/javascript/styles/mastodon/components.scss
modified: app/lib/user_settings_decorator.rb
modified: app/models/user.rb
modified: app/serializers/initial_state_serializer.rb
modified: app/views/layouts/application.html.haml
modified: app/views/layouts/error.html.haml
modified: app/views/settings/preferences/other/show.html.haml
modified: config/locales/simple_form.en.yml
modified: config/locales/simple_form.ja.yml
modified: config/settings.yml
|
2021-05-14 10:07:26 +09:00 |
|
Claire
|
76064e6608
|
Update fix-duplicates maintenance script to support latest migrations (#16231)
* Update maintenance script to support latest database migrations
* Update Account#merge_with!
|
2021-05-12 23:19:44 +02:00 |
|
chandrn7
|
2840f995d5
|
updated node version in Vagrantfile (#16230)
|
2021-05-12 23:19:31 +02:00 |
|
|
36700da72e
|
Merge pull request #442 from YoheiZuho/3.4.0rc2
3.4.0rc2
|
2021-05-12 14:26:15 +09:00 |
|
noellabo
|
60b22fe1da
|
Fix quote on public stream
|
2021-05-12 07:24:18 +09:00 |
|
noellabo
|
d54f3caf2a
|
Fix not hiding quoted unlisted status in non public timeline
|
2021-05-12 07:24:18 +09:00 |
|
noellabo
|
1c0da04753
|
Fix missing frameRate
|
2021-05-12 07:24:18 +09:00 |
|
noellabo
|
6f1d0a918b
|
Fix missing reblog_of_quote
|
2021-05-12 07:24:18 +09:00 |
|
noellabo
|
e99b8ef4bc
|
Fix modal footer to react to quoted posts
|
2021-05-12 07:24:18 +09:00 |
|
noellabo
|
8f234af62c
|
Fix quoted account link in detailed status
|
2021-05-12 07:24:18 +09:00 |
|
noellabo
|
6de350fdbc
|
Fix expand video on public page for quote
|
2021-05-12 07:24:18 +09:00 |
|
noellabo
|
42fe8c7279
|
fix rtl in quote_indicator
|
2021-05-12 07:24:18 +09:00 |
|
noellabo
|
7f6d6577df
|
Fix Open handler in quote media
|
2021-05-12 07:24:18 +09:00 |
|