treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
18,484 Commits
12 Branches
15 Tags
760 MiB
Commit Graph

18484 Commits (9af6f6db1a56f5201a43e48462a7055169fc4ef0)

Author SHA1 Message Date
Renaud Chaput 6b6774341d Tag images with the latest tag only when running against the latest stable branch (#25803) 2023-07-07 19:31:55 +02:00
Claire 9a0cbecd67 Fix crash in admin interface when viewing a remote user with verified links (#25796) 2023-07-07 18:10:17 +02:00
Claire d979d9fe49 Fix branding:generate_app_icons failing because of disallowed ICO coder (#25794) 2023-07-07 18:10:00 +02:00
nemobis 86c00c14a5 Fix typo in CHANGELOG.md (#25764) 2023-07-07 14:15:54 +02:00
renovate[bot] 4713b2e0b2 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
Claire 0b9ced4b0c Fix processing of media files with unusual names (#25788) 2023-07-07 13:35:22 +02:00
Claire 4c1f5cd847 Fix incorrect secondary button size (#2276) 2023-07-07 09:50:06 +02:00
Claire 15416cb567 Merge pull request #2274 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2023-07-06 15:21:10 +02:00
Claire 3581e4be49 Merge branch 'main' into glitch-soc/merge-upstream 2023-07-06 15:16:34 +02:00
Claire 8f62bea002 Bump version to v4.1.3 (#25757) 2023-07-06 15:14:42 +02:00
Claire dab0be5aed Merge pull request from GHSA-55j9-c3mp-6fcq 2023-07-06 15:06:49 +02:00
Claire d7ed682130 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
Claire 3445bdfa45 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 96dcfa9745 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 5154acdb9f Add hardened headers to user-uploaded files (#25756) 2023-07-06 14:31:37 +02:00
Claire 41d0d67835 Merge pull request #2272 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2023-07-05 16:47:23 +02:00
Eugen Rochko 3676bc46da [Glitch] Fix regression of icon button colors in web UI 
Port 12c6337c96 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-05 13:31:26 +02:00
Trevor Wolf fa02ad3b8c [Glitch] Change button colors to increase hover/focus contrast and consistency 
Port 5f31104e1f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-05 13:30:52 +02:00
Eugen Rochko c66faebe43 [Glitch] Add button to see results for polls in web UI 
Port 5b05451744 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-05 12:42:24 +02:00
Eugen Rochko 7747947353 [Glitch] Add canonical link tags in web UI 
Port 90911f4396 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-05 12:41:52 +02:00
mogaminsk 0003a22bc1 [Glitch] Fix local live feeds does not expand 
Port f3ca8aede9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-05 12:39:46 +02:00
forsamori 136ed77764 [Glitch] Add at-symbol prepended to mention span title 
Port 7731fbbba7 to glitch-soc

Co-authored-by: Sam BC <samuel.balbirnie-cumming@xdesign.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-05 12:38:54 +02:00
Eugen Rochko 5b328d07e6 [Glitch] Change labels of live feeds tabs in web UI 
Port 80fee1403f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-05 12:37:37 +02:00
Claire 784f2f35bc Merge branch 'main' into glitch-soc/merge-upstream 2023-07-05 12:01:26 +02:00
Eugen Rochko 90911f4396 Add canonical link tags in web UI (#25715) 2023-07-05 11:25:27 +02:00
Eugen Rochko 5b05451744 Add button to see results for polls in web UI (#25726) 2023-07-05 10:32:04 +02:00
Claire cac4f7fdd7 Fix OAuth apps page crashing when listing apps with certain admin API scopes (#25713) 2023-07-04 18:58:23 +02:00
Claire 1aa9197efd Fix re-activated accounts being deleted by AccountDeletionWorker (#25711) 2023-07-04 18:36:24 +02:00
Trevor Wolf b34a0ff011 fix read more button overlapping thread line bug (#25706) 2023-07-04 14:57:46 +02:00
Claire 2c31ac0c39 Fix forgotten unconfirmed_email migration file (#25702) 2023-07-04 11:25:29 +02:00
mogaminsk f3ca8aede9 Fix local live feeds does not expand (#25694) 2023-07-04 00:37:57 +02:00
forsamori 7731fbbba7 Add at-symbol prepended to mention span title (#25684) 
Co-authored-by: Sam BC <samuel.balbirnie-cumming@xdesign.com>
 2023-07-03 22:58:10 +02:00
Eugen Rochko 80fee1403f Change labels of live feeds tabs in web UI (#25683) 2023-07-03 22:57:18 +02:00
Daniel M Brasil 2b877ad937 Fix `/api/v2/search` not working with following query param (#25681) 2023-07-03 18:06:57 +02:00
Eugen Rochko 12c6337c96 Fix regression of icon button colors in web UI (#25679) 2023-07-03 16:51:04 +02:00
Plastikmensch bd0986e5d7 Add regex filter back to firehose (#2266) 
* Add regex filter back to firehose

The regex filter will apply to all tabs and not be automatically applied when pinned.

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>

* Keep regex when pinned

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>

---------

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
 2023-07-03 15:41:50 +02:00
Trevor Wolf 5f31104e1f Change button colors to increase hover/focus contrast and consistency (#25677) 2023-07-03 11:32:31 +02:00
Plastikmensch cd902b7fd4 Fix showing local only toots in "All" (#2265) 
* Fix warnings about missing dependency in hooks

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>

* Add `allowLocalOnly` to timelineId

Without this local-only toots will never be loaded.

feedType is checked to be public to not show local-only toots in the "Remote" tab.

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>

---------

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
 2023-07-03 07:00:38 +02:00
Claire 7ec2300853 Merge pull request #2263 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2023-07-02 22:14:45 +02:00
Claire c33c8bc048 Show local-only posts in “All” by default, and add back option to toggle it 2023-07-02 20:28:02 +02:00
Claire 4885232358 Add users index on unconfirmed_email (#25672) 2023-07-02 19:41:35 +02:00
Claire e052b71f15 Add superapp index on `oauth_applications` (#25670) 2023-07-02 16:56:16 +02:00
Claire fe1735f409 Fix inefficient query when requesting a new confirmation email from a logged-in account (#25669) 2023-07-02 16:08:58 +02:00
mogaminsk db90f2b456 [Glitch] Prevent duplicate concurrent calls of `/api/*/instance` in web UI 
Port ee22b32aef to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-02 12:00:03 +02:00
Eugen Rochko f3140305f9 [Glitch] Change dropdown icon above compose form from ellipsis to bars in web UI 
Port f504aded26 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-02 11:59:31 +02:00
Claire 95da88be87 [Glitch] Change local and federated timelines to be in a single firehose column 
Port 6ca66c8cad to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-02 11:58:51 +02:00
Renaud Chaput bb5fddd588 [Glitch] Use an Immutable Record as the root state 
Port 2751a6d716 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-02 11:55:34 +02:00
Claire f6ede7b089 [Glitch] Fix onboarding prompt being displayed because of disconnection gaps 
Port 1408b62211 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-02 11:55:08 +02:00
Claire 34dd555a1c [Glitch] Remove the search button from UI header when logged out 
Port 7a47a52cd3 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-02 11:54:47 +02:00
Claire 0a6bc158bd Merge branch 'main' into glitch-soc/merge-upstream 2023-07-02 11:49:08 +02:00