999c343946
Fix remote accounts being possibly persisted to database with incomplete protocol values ( #25886 )
2023-07-10 18:42:19 +02:00
4b5851974c
Fix moderation interface for remote instances with a .zip TLD ( #25885 )
2023-07-10 18:42:10 +02:00
c27b82a437
Add `forward_to_domains` parameter to `POST /api/v1/reports` ( #25866 )
2023-07-10 18:26:56 +02:00
f3fca78756
Refactor `NotificationMailer` to use parameterization ( #25718 )
2023-07-10 03:06:22 +02:00
a1f5188c8c
Change feed merge, unmerge and regeneration workers to use a replica ( #25849 )
2023-07-10 03:06:09 +02:00
610cf6c371
Fix trend calculation working on too many items at a time ( #25835 )
2023-07-08 20:16:48 +02:00
338a0e70cc
Change label and design of sensitive and unavailable media in web UI ( #25712 )
2023-07-08 20:05:33 +02:00
d6b387a0c4
Remove unused `NotificationMailer#digest` preview ( #25719 )
2023-07-08 20:04:21 +02:00
cf33028f35
Admin mailer parameterization ( #25759 )
2023-07-08 20:03:38 +02:00
41a505513f
Remove unused `missed_update` state ( #25832 )
2023-07-08 20:02:14 +02:00
a7ca33ad96
Add toast with option to open post after publishing in web UI ( #25564 )
2023-07-08 20:01:08 +02:00
a8edbcf963
Fix dropdowns being disabled for logged out users in web UI ( #25714 )
2023-07-08 20:00:52 +02:00
ceeb2b8c41
Fix explore page being inaccessible when opted-out of trends in web UI ( #25716 )
2023-07-08 20:00:12 +02:00
93e8a15415
Add forwarding of reported replies to servers being replied to ( #25341 )
2023-07-08 20:00:02 +02:00
e4cfe4b3db
First pass at multi-database for read replica using Rails native adapter ( #25693 )
...
Co-authored-by: emilweth <7402764+emilweth@users.noreply.github.com>
2023-07-08 19:45:36 +02:00
4534498a8e
Convert `<DismissableBanner>` to Typescript ( #25582 )
2023-07-08 11:12:20 +02:00
20e85c0e83
Rewrite `<ShortNumber />` as FC and TS ( #25492 )
2023-07-08 11:11:58 +02:00
e0d230fb37
simplify counters ( #25541 )
2023-07-08 11:11:22 +02:00
0f9b803eb3
Regenerate brakeman ignore, pruning warnings ( #25749 )
2023-07-08 11:07:19 +02:00
Ariadne Conill
9bbf23f8e0
Merge pull request 'merge-2023-07-07' ( #63 ) from merge-2023-07-07 into main
...
ci/woodpecker/push/woodpecker Pipeline was successful
Details
Reviewed-on: #63
2023-07-07 22:13:35 +00:00
9f078e238d
Fix translate button position ( #25807 )
2023-07-08 00:12:31 +02:00
Ariadne Conill
3169677598
Merge gitea.treehouse.systems:mirrors/mastodon-glitch into merge-2023-07-07
ci/woodpecker/pr/woodpecker Pipeline was successful
Details
ci/woodpecker/push/woodpecker Pipeline was successful
Details
2023-07-07 21:57:32 +00:00
Ariadne Conill
32885700ff
Merge gitea.treehouse.systems:mirrors/mastodon-glitch into merge-2023-07-07
2023-07-07 21:56:29 +00:00
a40529fa79
Merge pull request #2279 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2023-07-07 20:33:32 +02:00
b9aa228c54
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-image.yml`:
Upstream attempted something with tags.
Kept our version.
2023-07-07 19:59:43 +02:00
0051128387
Bump version to v4.1.4 ( #25805 )
2023-07-07 19:42:03 +02:00
d481e72e85
Tag images with the latest tag only when running against the latest stable branch ( #25803 )
2023-07-07 19:31:55 +02:00
b6d173b459
Fix crash in admin interface when viewing a remote user with verified links ( #25796 )
2023-07-07 18:10:17 +02:00
71d44949bf
Fix branding:generate_app_icons failing because of disallowed ICO coder ( #25794 )
2023-07-07 18:10:00 +02:00
dfedf0ec64
Fix typo in CHANGELOG.md ( #25764 )
2023-07-07 14:15:54 +02:00
8b624553ef
Update dependency sanitize to v6.0.2 [SECURITY] ( #25777 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-07-07 13:35:54 +02:00
94fbac77e7
Fix processing of media files with unusual names ( #25788 )
2023-07-07 13:35:22 +02:00
513078de7a
Fix incorrect secondary button size ( #2276 )
2023-07-07 09:50:06 +02:00
kouhai dev
21a0fffd39
th: buildkit paralellism? more likely than not
ci/woodpecker/push/woodpecker Pipeline was successful
Details
2023-07-06 23:08:07 -07:00
kouhai dev
5964a51813
th: build more fast
ci/woodpecker/push/woodpecker Pipeline was successful
Details
2023-07-06 23:05:23 -07:00
kouhai dev
f8dc5aef72
th: disable bootsnap?
ci/woodpecker/push/woodpecker Pipeline was successful
Details
2023-07-06 22:34:54 -07:00
kouhai dev
d54e2a6753
th: fix js quote issue
2023-07-06 22:33:05 -07:00
Ariadne Conill
e8b0b5d83e
Merge pull request 'Incorporate glitch changes as of 2023-07-06' ( #62 ) from test-merge-2023-07-04 into main
...
ci/woodpecker/push/woodpecker Pipeline was successful
Details
Reviewed-on: #62
2023-07-06 20:27:32 +00:00
kouhai dev
3c398c2d47
th: force ci
ci/woodpecker/push/woodpecker Pipeline was successful
Details
2023-07-06 12:34:15 -07:00
kouhai dev
f26d104e75
th: Merge remote-tracking branch 'glitch/main'
...
ci/woodpecker/push/woodpecker Pipeline was successful
Details
ci/woodpecker/pr/woodpecker Pipeline was successful
Details
fixes: CVE-2023-36459
fixes: CVE-2023-36460
fixes: CVE-2023-36461
fixes: CVE-2023-36462
fixes: GHSA-55j9-c3mp-6fcq
fixes: GHSA-9928-3cp5-93fm
fixes: GHSA-9pxv-6qvf-pjwc
fixes: GHSA-ccm4-vgcc-73hp
2023-07-06 12:12:21 -07:00
c25ba31e95
Merge pull request #2274 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2023-07-06 15:21:10 +02:00
ff7aae3037
Merge branch 'main' into glitch-soc/merge-upstream
2023-07-06 15:16:34 +02:00
5e1752ce3f
Bump version to v4.1.3 ( #25757 )
2023-07-06 15:14:42 +02:00
610731b03d
Merge pull request from GHSA-55j9-c3mp-6fcq
2023-07-06 15:06:49 +02:00
c5929798bf
Merge pull request from GHSA-9pxv-6qvf-pjwc
...
* Fix timeout handling of outbound HTTP requests
* Use CLOCK_MONOTONIC instead of Time.now
2023-07-06 15:06:23 +02:00
dc8f1fbd97
Merge pull request from GHSA-9928-3cp5-93fm
...
* Fix attachments getting processed despite failing content-type validation
* Add a restrictive ImageMagick security policy tailored for Mastodon
* Fix misdetection of MP3 files with large cover art
* Reject unprocessable audio/video files instead of keeping them unchanged
2023-07-06 15:05:05 +02:00
6d8e0fae3e
Merge pull request from GHSA-ccm4-vgcc-73hp
...
* Tighten allowed HTML in oEmbed-based preview cards
* Sanitize preview cards at render time
* Add `sandbox` attribute to preview card iframes
2023-07-06 15:03:33 +02:00
fed9cbfd2b
Add hardened headers to user-uploaded files ( #25756 )
2023-07-06 14:31:37 +02:00
kouhai dev
814c1f7a71
th: reduce ci clone depth
ci/woodpecker/push/woodpecker Pipeline was successful
Details
2023-07-06 02:47:21 -07:00
kouhai dev
4ff0116cf6
th: quieter yarn please
...
yarn cache logs make woodpecker webui lag. this is not ideal.
2023-07-06 02:47:21 -07:00
Claire
Ariadne Conill
kouhai dev