Commit graph

293 commits

Author SHA1 Message Date
KMY
12ed20b6d5 Merge remote-tracking branch 'parent/main' into upstream-20250328 2025-03-28 08:44:30 +09:00
Claire
c93b2c6809
Add new filter action to blur media (#34256) 2025-03-26 07:31:05 +00:00
KMY
6548462ecb Merge commit '9c2d5b534f' into upstream-20250314 2025-03-14 08:35:27 +09:00
Claire
7866745a6b
Bump version to v4.3.6 (#34167) 2025-03-13 14:27:20 +00:00
KMY
5979c0ea1d Merge remote-tracking branch 'parent/main' into upstream-20240310 2025-03-10 19:58:05 +09:00
Claire
d25de5b757
Bump Mastodon API version for new media deletion methods/parameters (#34035) 2025-03-04 14:05:40 +00:00
KMY
795561f5a7 Merge commit 'cfb473c204' into upstream-20250228 2025-02-28 11:07:08 +09:00
Claire
cfb473c204
Bump version to v4.4.0-alpha.3 (#34022) 2025-02-27 15:32:15 +00:00
KMY(雪あすか)
a52398df5c
Bump version to 18.0-dev (#980)
* Bump version to 18.0-dev

* Update docker-compose.yml
2025-02-17 12:23:49 +09:00
KMY(雪あすか)
67064de265
Change: #955 フィルターアクションの「アカウント名だけを出し、本文は警告で隠す」を削除し、外観設定に移動 (#970)
* Remove: #955 フィルターのアクション`half_warn`

* Add: 「フィルター対象投稿の投稿者名やアイコンを表示する」設定

* Fix test
2025-01-23 19:18:40 +09:00
KMY
50ae2d9439 Merge remote-tracking branch 'parent/main' into upstream-20240123 2025-01-23 18:10:34 +09:00
Christian Schmidt
a3baae0b99
API for updating attribution domains (#32730) 2025-01-17 08:18:55 +00:00
KMY
5d79bd078c Merge remote-tracking branch 'parent/main' into upstream-20240117 2025-01-17 16:29:11 +09:00
Claire
0aa9bb8130
Bump version to v4.4.0-alpha.2 (#33615) 2025-01-16 11:02:54 +00:00
Matt Jankowski
7c56517c7c
Move mastodon version config to config_for yml (#33577) 2025-01-14 14:32:29 +00:00
Matt Jankowski
34cd7d6585
Use config_for for Mastodon::Version metadata/prerelease values (#33548) 2025-01-10 15:52:43 +00:00
KMY(雪あすか)
4a3c2d7ed7
Bump version to 17.0-dev (#931) 2024-12-04 12:03:10 +09:00
KMY
055045981f Merge remote-tracking branch 'parent/main' into upstream-20241119 2024-11-19 08:49:55 +09:00
Renaud Chaput
bcf5d30e01
Add OpenTelemetry VCS attributes (#32904) 2024-11-18 08:41:09 +00:00
KMY(雪あすか)
a41f51501c
Fix: バージョン表記の末尾にドットがつく場合がある問題 (#904) 2024-11-07 12:21:19 +09:00
KMY(雪あすか)
c1dcc6bfc6
Fix: #484 docker-compose.ymlを修正 (#868) 2024-10-09 12:15:59 +09:00
KMY(雪あすか)
04ed313a76
Merge pull request #864 from kmycode/upstream-20241006
Upstream 20241006
2024-10-05 10:38:25 +09:00
KMY(雪あすか)
aa65f2d352
Bump version to 16.0-dev (#865) 2024-10-05 10:38:11 +09:00
KMY
66bed31dbe Merge remote-tracking branch 'parent/main' into upstream-20241006 2024-10-05 09:10:58 +09:00
Renaud Chaput
497e8d00b9
Bump main version 4.4.0-alpha.1 (#32180) 2024-10-01 08:36:22 +00:00
KMY
133a263f79 Merge remote-tracking branch 'parent/main' into upstream-20241001 2024-10-01 08:13:23 +09:00
Claire
03210085b7
Bump version to 4.3.0-rc.1 (#32124) 2024-09-30 10:42:59 +00:00
KMY
4ce35dd837 Merge remote-tracking branch 'parent/main' into upstream-20240918 2024-09-18 08:31:34 +09:00
Claire
3e91c101b3
Bump version to 4.3.0-beta.2 (#31948) 2024-09-17 15:42:45 +00:00
Claire
e0648a916a
Rename /api/v2_alpha/notifications* to /api/v2/notifications* (#31840) 2024-09-16 12:10:02 +00:00
KMY(雪あすか)
f93dbec9d3
Bump version to 15.0-dev (#836) 2024-09-06 08:40:17 +09:00
KMY
a5bbc3f93b Merge remote-tracking branch 'parent/main' into upstream-20240824 2024-08-24 09:39:11 +09:00
Claire
97f6baf977
Bump version to v4.3.0-beta.1 (#30989) 2024-08-23 16:07:32 +00:00
KMY
8b09a57a91 Merge remote-tracking branch 'parent/main' into upstream-20240731 2024-07-31 13:00:13 +09:00
Claire
4eab6aef95
Change User-Agent to use Mastodon as the product, and http.rb as platform details (#31192) 2024-07-30 21:40:42 +00:00
KMY(雪あすか)
188bd6f5f9
Bump version to 14.0-dev (#776) 2024-07-07 23:24:20 +09:00
KMY
9a07550fa6 Merge remote-tracking branch 'parent/main' into upstream-20240705 2024-07-05 07:22:34 +09:00
Claire
df9e26158d
Bump version to v4.3.0-alpha.5 (#30920) 2024-07-04 14:59:54 +00:00
KMY
13ad383039 Merge remote-tracking branch 'parent/main' into upstream-20240531 2024-05-31 08:27:09 +09:00
Claire
7f808ff6e9
Bump version to v4.3.0-alpha.4 (#30482) 2024-05-30 13:34:46 +00:00
KMY(雪あすか)
31a0368c9e
Bump version to 13.0-dev (#739) 2024-05-07 12:14:11 +09:00
KMY(雪あすか)
287c560d66
Bump version to 12.0-dev (#651) 2024-03-12 08:37:19 +09:00
KMY
54ee9772fb Merge remote-tracking branch 'parent/main' into upstream-20240216 2024-02-16 20:33:24 +09:00
Claire
5f21a1f5a3
Bump version to v4.3.0-alpha.3 (#29241) 2024-02-16 11:06:47 +00:00
KMY
9ef5c05ea0 Merge remote-tracking branch 'parent/main' into upstream-20241015 2024-02-15 08:37:59 +09:00
Claire
8e8e0f104f
Bump version to v4.3.0-alpha.2 (#29200) 2024-02-14 14:20:02 +00:00
KMY
9a5f80c41d Merge remote-tracking branch 'parent/main' into kbtopic-fix-security 2024-02-02 07:38:19 +09:00
Claire
1726085db5
Merge pull request from GHSA-3fjr-858r-92rw
* Fix insufficient origin validation

* Bump version to 4.3.0-alpha.1
2024-02-01 15:56:46 +01:00
KMY(雪あすか)
b044cbeb63
Add: #391 開発中のブランチにベータ版のバージョン表記ができるよう整備・Bump version to 11.0-dev (#447)
* Add: #391 開発中のブランチにベータ版のバージョン表記ができるよう整備・Bump version to 11.0-dev

* Fix test
2024-01-12 09:35:17 +09:00
KMY(雪あすか)
2ef5fdb6fb
Merge pull request #413 from kmycode/kb-draft-10.0
Release: 10.0
2024-01-11 09:20:47 +09:00