asonix/mastodon
1
1
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity
13456 commits 36 branches 245 tags 214 MiB
Commit graph

13456 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
asonix 3fc6d07c90 Merge pull request 'v4.1.6' (#30) from asonix/changes into ceralor/blimps 
Reviewed-on: #30
 2023-07-31 18:37:35 +00:00
asonix 9bf1700e90 Merge pull request 'v4.1.6' (#28) from v4.1.6-branch into asonix/changes 
Reviewed-on: #28
 2023-07-31 17:24:13 +00:00
asonix b33dec9655 Merge branch 'asonix/changes' into v4.1.6-branch 2023-07-31 12:18:54 -05:00
Claire ac7d40b561 Bump version to v4.1.6 2023-07-31 14:33:06 +02:00
Renaud Chaput 2fc6117d1b Fix missing return values in streaming (#26233) 2023-07-31 14:33:06 +02:00
Emelia Smith 2eb1a5b7b6 Fix: Streaming server memory leak in HTTP EventSource cleanup (#26228) 2023-07-31 14:33:06 +02:00
Claire 6c321bb5e1 Fix incorrect connect timeout in outgoing requests (#26116) 2023-07-31 14:33:06 +02:00
Emelia Smith da230600ac Refactor streaming's filtering logic & improve documentation (#26213) 2023-07-31 14:33:06 +02:00
Claire 1792be342a Fix wrong filters sometimes applying in streaming (#26159) 2023-07-31 14:33:06 +02:00
asonix b21445eaa2 Merge pull request 'v4.1.5' (#27) from asonix/changes into ceralor/blimps 
Reviewed-on: #27
 2023-07-23 23:38:29 +00:00
asonix 256bbed706 Merge pull request 'v4.1.5-branch' (#25) from v4.1.5-branch into asonix/changes 
Reviewed-on: #25
 2023-07-23 23:36:47 +00:00
asonix 09055ebe14 Merge branch 'asonix/changes' into v4.1.5-branch 2023-07-23 18:32:19 -05:00
Claire ebf4f034c2 Bump version to v4.1.5 2023-07-21 16:07:43 +02:00
Claire 889102013f Fix CSP headers being unintendedly wide (#26105) 2023-07-21 16:07:43 +02:00
Claire d94a2c8aca Change request timeout handling to use a longer deadline (#26055) 2023-07-21 16:07:43 +02:00
Claire efd066670d Fix moderation interface for remote instances with a .zip TLD (#25885) 2023-07-21 16:07:43 +02:00
Claire 13ec425b72 Fix remote accounts being possibly persisted to database with incomplete protocol values (#25886) 2023-07-21 16:07:43 +02:00
Michael Stanclift 7a99f0744d Fix trending publishers table not rendering correctly on narrow screens (#25945) 2023-07-21 16:07:43 +02:00
Claire 69c8f26946
Add check preventing Sidekiq workers from running with Makara configured (#25850) 
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
 2023-07-21 14:18:04 +02:00
asonix 24360e7f98 Merge pull request 'v4.1.4' (#24) from asonix/changes into ceralor/blimps 
Reviewed-on: #24
 2023-07-07 19:56:40 +00:00
asonix 8eb71e1947 Merge pull request 'v4.1.4-branch' (#22) from v4.1.4-branch into asonix/changes 
Reviewed-on: #22
 2023-07-07 19:54:43 +00:00
asonix c0f55e5bba Merge pull request 'Updated sounds' (#21) from ceralor/mastodon:ceralor/blimps into ceralor/blimps 
Reviewed-on: #21
 2023-07-07 19:49:25 +00:00
asonix 9acc1869d1 Merge branch 'asonix/changes' into v4.1.4-branch 2023-07-07 14:48:18 -05:00
Claire 3f5af768c8 Bump version to v4.1.4 2023-07-07 19:37:21 +02:00
Claire cb8ab46302 Update dependencies 2023-07-07 19:37:21 +02:00
Claire 53b979d5c7 Fix processing of media files with unusual names (#25788) 2023-07-07 19:37:21 +02:00
Claire f2bbac3f9f Fix crash in admin interface when viewing a remote user with verified links (#25796) 2023-07-07 19:37:21 +02:00
Claire 015ed99612 Fix branding:generate_app_icons failing because of disallowed ICO coder (#25794) 2023-07-07 19:37:21 +02:00
nemobis cf58535193 Fix typo in CHANGELOG.md (#25764) 2023-07-07 19:37:21 +02:00
Kay Ohtie 1614c6cc96 Merge branch 'ceralor/blimps' of git.asonix.dog:ceralor/mastodon into ceralor/blimps 2023-07-06 22:05:26 -05:00
ceralor 286d305a66 Merge pull request 'ceralor/blimps' (#1) from asonix/mastodon:ceralor/blimps into ceralor/blimps 
Reviewed-on: ceralor/mastodon#1
 2023-07-07 03:04:25 +00:00
Kay Ohtie f00a083782 quieter sound versions 2023-07-06 21:08:14 -05:00
asonix e96f9dbc7a Merge pull request 'increase character limit to 2k' (#19) from asonix/changes into ceralor/blimps 
Reviewed-on: #19
 2023-07-06 15:34:09 +00:00
asonix 7555bb9eb8 Merge pull request 'Increase character limit to 2000' (#18) from increase-character-limit-2000 into asonix/changes 
Reviewed-on: #18
 2023-07-06 15:33:31 +00:00
asonix 9bed5be588 Increase character limit to 2000 2023-07-06 09:44:44 -05:00
asonix 625f47013f Merge pull request 'v4.1.3' (#16) from asonix/changes into ceralor/blimps 
Reviewed-on: #16
 2023-07-06 14:33:50 +00:00
asonix 5b0ef3d072 Merge pull request 'v4.1.3-branch' (#15) from v4.1.3-branch into asonix/changes 
Reviewed-on: #15
 2023-07-06 14:28:04 +00:00
asonix f08af7a803 Update lion, dog, squeak locales for 4.1.3 2023-07-06 09:23:39 -05:00
asonix 6f7ecd8ef7 Merge branch 'asonix/changes' into v4.1.3-branch 2023-07-06 09:20:56 -05:00
Claire 0d5781ca76 Bump version to v4.1.3 2023-07-06 15:07:20 +02:00
Claire 32ebeed59b
Merge pull request from GHSA-55j9-c3mp-6fcq 2023-07-06 15:06:50 +02:00
Claire e75ad1de0f
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:24 +02:00
Claire 0aa0b71f2c
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
Claire c4f2609f7a
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
Claire 9b6c0cac7d Add hardened headers to user-uploaded files (#25756) 2023-07-06 14:32:26 +02:00
Claire fac2c9eb7d Update rack, rails, nokogiri and doorkeeper gems 2023-07-06 13:45:40 +02:00
Claire a3d69a2c5d Fix OAuth apps page crashing when listing apps with certain admin API scopes (#25713) 2023-07-06 13:45:40 +02:00
Renaud Chaput 8eb1bb8ba6 Allow carets in URL search params (#25216) 2023-07-06 13:45:40 +02:00
Vyr Cossont 652ff76462 Fix Redis client and type errors introduced in #24285 (#24342) 2023-07-06 13:45:40 +02:00
Vyr Cossont 6f484fbbd2 IndexingScheduler: fetch and import in batches (#24285) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-06 13:45:40 +02:00