Claire
8c3c6dcae9
Fix filters from other users being used in the streaming service ( #20719 )
2022-11-15 02:09:58 +01:00
Jeremy Kescher
4b56353f13
Merge remote-tracking branch 'upstream/main' into develop
2022-11-15 00:34:05 +01:00
Claire
ceafd1f68f
Fix infinite loop when system emoji font is enabled ( #1931 )
...
Fixes #1930
2022-11-15 00:32:59 +01:00
Jeremy Kescher
0005e01aa6
4.0.1+1.0.2
2022-11-14 22:52:11 +01:00
Jeremy Kescher
5135399a5f
Merge remote-tracking branch 'upstream/main' into develop
2022-11-14 22:50:54 +01:00
Jeremy Kescher
14ef153c69
Revert "[Glitch] Fix nodes order being sometimes mangled when rewriting emoji"
...
This reverts commit 06faf2f977
2022-11-14 22:50:45 +01:00
Claire
e589afa0ef
Merge pull request #1929 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-11-14 22:43:56 +01:00
Jeremy Kescher
06faf2f977
[Glitch] Fix nodes order being sometimes mangled when rewriting emoji
...
backport ccbca50a25
2022-11-14 22:40:37 +01:00
Jeremy Kescher
ec15e58efa
4.0.1+1.0.0
2022-11-14 22:34:38 +01:00
Claire
db16d7d9de
Fix nodes order being sometimes mangled when rewriting emoji ( #20677 )
...
* Fix front-end emoji tests
* Fix nodes order being sometimes mangled when rewriting emoji
2022-11-14 22:33:52 +01:00
Claire
8aa56aedfd
[Glitch] Fix nodes order being sometimes mangled when rewriting emoji
...
Port ccbca50a25
2022-11-14 22:32:00 +01:00
Claire
b5698af25f
Merge branch 'main' into glitch-soc/merge-upstream
2022-11-14 22:30:30 +01:00
Eugen Rochko
4415dd6036
Bump version to 4.0.1 ( #20696 )
2022-11-14 22:21:14 +01:00
Jeremy Kescher
122870cb6b
Merge remote-tracking branch 'upstream/main' into develop
...
# Conflicts:
# config/initializers/rack_attack.rb
# lib/mastodon/version.rb
2022-11-14 22:18:48 +01:00
Claire
ccbca50a25
Fix nodes order being sometimes mangled when rewriting emoji ( #20677 )
...
* Fix front-end emoji tests
* Fix nodes order being sometimes mangled when rewriting emoji
2022-11-14 22:14:55 +01:00
Claire
7a8cd0cb0a
Merge pull request #1928 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-11-14 20:29:15 +01:00
Claire
71982e5c83
[Glitch] Fix emoji substitution not applying only to text nodes in Web UI
...
Port 625e086996
2022-11-14 20:28:22 +01:00
Claire
767630be24
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile`:
Upstream removed blank lines.
2022-11-14 20:27:31 +01:00
Eugen Rochko
fb389bd73c
Bump version to 4.0.0 ( #20636 )
2022-11-14 20:27:12 +01:00
Eugen Rochko
21fd25a269
Fix rate limiting for paths with formats ( #20675 )
2022-11-14 20:26:31 +01:00
Claire
71c92d3f56
Fix emoji substitution not applying only to text nodes in backend code ( #20641 )
...
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-14 20:26:21 +01:00
Claire
625e086996
Fix emoji substitution not applying only to text nodes in Web UI ( #20640 )
...
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-14 20:26:03 +01:00
Claire
a34aa2a5f9
Merge pull request #1927 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-11-14 18:45:54 +01:00
Claire
96c1ef6d50
[Glitch] Fix media metadata being only editable once
...
Port 2d54986a03
2022-11-14 18:32:33 +01:00
Claire
9ab4e3fc6d
Merge branch 'main' into glitch-soc/merge-upstream
2022-11-14 18:31:04 +01:00
Claire
2d54986a03
Fix media metadata being only editable once ( #20665 )
2022-11-14 17:52:31 +01:00
Claire
7233569474
Merge pull request #1923 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2022-11-14 10:31:28 +01:00
trwnh
c31e756644
[Glitch] Move V2 Filter methods under /api/v2 prefix
...
Port b59ce0a60f
2022-11-14 09:17:59 +01:00
Eugen Rochko
9db90d2ebe
[Glitch] Fix dropdown menu on profiles not being accessible on narrow screens in web UI
...
Port 6da9df774e
2022-11-14 09:16:41 +01:00
Samuel Kaiser
9fd866f38e
[Glitch] Stick batch table toolbar to the top
...
Port e62b514e95
2022-11-14 09:05:56 +01:00
Claire
cd713cac81
Merge branch 'main' into glitch-soc/merge-upstream
2022-11-14 08:57:25 +01:00
Eugen Rochko
75299a042c
Bump version to 4.0.0rc4 ( #20634 )
2022-11-14 08:50:14 +01:00
Claire
32c70d2f09
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/admin/announcements/edit.html.haml`:
Upstream change too close to theming-related glitch-soc change.
Ported upstream changes.
- `app/views/admin/announcements/new.html.haml`
Upstream change too close to theming-related glitch-soc change.
Ported upstream changes.
2022-11-14 08:35:55 +01:00
trwnh
b59ce0a60f
Move V2 Filter methods under /api/v2 prefix ( #20622 )
...
* Move V2 Filter methods under /api/v2 prefix
* move over the tests too
2022-11-14 08:34:07 +01:00
Claire
457c37e47a
Fix index name in fix-duplicates task ( #20632 )
2022-11-14 08:33:48 +01:00
Eugen Rochko
1e83092e47
Update AUTHORS.md ( #20630 )
2022-11-14 08:33:24 +01:00
Eugen Rochko
552d69ad96
Fix error when invalid domain name is submitted ( #19474 )
...
Fix #19175
2022-11-14 08:07:14 +01:00
Eugen Rochko
523e106cbf
Fix style of username in navigation bar above compose form in web UI ( #20628 )
...
Regression from #20540
2022-11-14 08:06:17 +01:00
Eugen Rochko
b31afc6294
Fix error when passing unknown filter param in REST API ( #20626 )
...
Fix #19156
2022-11-14 08:06:06 +01:00
Eugen Rochko
5c826c408d
Fix image type not being set after conversion for convertible image types ( #20624 )
2022-11-14 07:13:14 +01:00
Eugen Rochko
167d86d21d
Fix role_ids not accepting arrays in admin API ( #20625 )
...
Fix #19157
2022-11-14 06:56:15 +01:00
Eugen Rochko
2e2ba39abf
Fix rules with same priority being sorted non-deterministically ( #20623 )
2022-11-14 06:28:19 +01:00
Eugen Rochko
6da9df774e
Fix dropdown menu on profiles not being accessible on narrow screens in web UI ( #20620 )
2022-11-14 06:05:10 +01:00
Hampton Lintorn-Catlin
147d8bd8fc
Support UTF-8 Characters in Domains During CSV Import ( #20592 )
...
* Support UTF-8 Characters in Domains During Import
* Update Changelong
2022-11-14 05:52:13 +01:00
Matt Corallo
9d039209cc
Add Cache-Control header to openstack-stored files ( #20610 )
...
When storing files in S3, paperclip is configured with a Cache-Control header
indicating the file is immutable, however no such header was added when using
OpenStack storage.
Luckily Paperclip's fog integration makes this trivial, with a simple
`fog_file` `Cache-Control` default doing the trick.
2022-11-14 05:26:49 +01:00
Eugen Rochko
d0b7bd4250
Fix wrong cut-off point for "Read more" in web UI ( #20599 )
2022-11-14 00:43:24 +01:00
Eugen Rochko
24b2c60beb
Fix icons having an image role ( #20600 )
2022-11-14 00:38:56 +01:00
Erik Sundell
87fbd08f74
helm: Add helm chart tests ( #20394 )
...
* helm: Fix consistent list indentation
* helm: Add helm lint and helm template tests
* helm: Add helm template --validate test
* helm: Add helm install test
2022-11-13 22:22:07 +01:00
trwnh
07229089a6
Change in-app links to keep you in-app ( #20540 )
...
* Change in-app links to keep you in-app
* refactor Permalink into Link
* rewrite link hrefs in status content
* please linter
* please linter again
2022-11-13 21:10:20 +01:00
Cees-Jan Kiewiet
ad66bbed62
Add the option to configure external postgresql port ( #20370 )
...
While the normal assumption of port `5432` for a postgresql server is pretty reliable I found that DigitalOcean puts them on a somewhat random port. This adds the ability to specify the port in the helm chart.
2022-11-13 21:06:03 +01:00
