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

11357 Commits (582003873c7fdf19fee34e78edc5b96c8c626f4f)

Author SHA1 Message Date
kouhai dev 1a7cf76661 th: fix js quote issue 2023-07-06 22:33:05 -07:00
kouhai dev 234f7cc84e th: Merge remote-tracking branch 'glitch/main' 
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
Claire 3581e4be49 Merge branch 'main' into glitch-soc/merge-upstream 2023-07-06 15:16:34 +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
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
kouhai dev d0edb9444c th: run haml-lint on quote haml 2023-07-05 01:50:54 -07:00
kouhai dev c03ac30374 th: invite limit nonfixited bugs 2023-07-05 01:50:54 -07:00
Eugen Rochko 5b05451744 Add button to see results for polls in web UI (#25726) 2023-07-05 10:32:04 +02:00
kouhai dev fa0f31a8fb th: merge glitch again (lol) 2023-07-05 01:14:10 -07:00
kouhai dev 280cf13f59 th: add invite limits behind TH_USE_INVITE_QUOTA 
TH_USE_INVITE_QUOTA: feature flag
TH_INVITE_MAX_USES: max uses per invite for non-moderators
TH_ACTIVE_INVITE_SLOT_QUOTA: max slots in active invites, including consumed slots
 2023-07-05 00:20:28 -07: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
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 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 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
Eugen Rochko edb6aab974 Revert "Rails 7 update" (#25667) 2023-07-02 11:14:22 +02:00
mogaminsk ee22b32aef Prevent duplicate concurrent calls of `/api/*/instance` in web UI (#25663) 2023-07-02 11:12:16 +02:00
Eugen Rochko f504aded26 Change dropdown icon above compose form from ellipsis to bars in web UI (#25661) 2023-07-02 10:39:55 +02:00
Matt Jankowski 5cadbaa296 Rails 7 update (#24241) 2023-07-02 10:38:53 +02:00
Daniel M Brasil 2f17abc686 Fix HTTP 500 in `/api/v1/emails/check_confirmation` (#25595) 2023-07-02 00:05:44 +02:00
Claire 6ca66c8cad Change local and federated timelines to be in a single firehose column (#25641) 2023-07-02 00:05:10 +02:00
Vivianne 6c6857f7ad Fixing an issue with a missing argument (#2261) 
undefined
 2023-07-01 22:55:43 +02:00
Matt Jankowski 843448c7d9 Fix rails `rewhere` deprecation warning in directories api controller (#25625) 2023-07-01 21:48:16 +02:00