treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
18,447 Commits
15 Branches
15 Tags
787 MiB
Commit Graph

18447 Commits (4781c1f7ebd916cacd89289a3a890151b1cd6bd6)

Author SHA1 Message Date
alfe 4781c1f7eb [Glitch] Rewrite `<ShortNumber />` as FC and TS 
Port b5c5e2bf36 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-12 15:17:18 +02:00
Renaud Chaput 5a6f556541 [Glitch] Convert `<DismissableBanner>` to Typescript 
Port 9203ab410c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-12 15:09:14 +02:00
Renaud Chaput 5cd9e85fbb [Glitch] Fix translate button position 
Port 7ff696d848 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-12 15:05:24 +02:00
Claire 8a27e68050 Merge commit '9203ab410c09efbd9facf202f2570cdd0def8de0' into glitch-soc/merge-upstream 2023-07-12 15:00:41 +02:00
Claire a64181f28b Fix import order inconsistencies () 2023-07-12 15:00:10 +02:00
Renaud Chaput 9203ab410c Convert `<DismissableBanner>` to Typescript () 2023-07-08 11:12:20 +02:00
alfe b5c5e2bf36 Rewrite `<ShortNumber />` as FC and TS () 2023-07-08 11:11:58 +02:00
fusagiko / takayamaki 4106a801a0 simplify counters () 2023-07-08 11:11:22 +02:00
Matt Jankowski 3f04f0c37b Regenerate brakeman ignore, pruning warnings () 2023-07-08 11:07:19 +02:00
Renaud Chaput 7ff696d848 Fix translate button position () 2023-07-08 00:12:31 +02:00
Claire db11493851 Merge pull request from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2023-07-07 20:33:32 +02:00
Claire 9ba89aeeb5 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
Claire 784f7fb497 Bump version to v4.1.4 () 2023-07-07 19:42:03 +02:00
Renaud Chaput 6b6774341d Tag images with the latest tag only when running against the latest stable branch () 2023-07-07 19:31:55 +02:00
Claire 9a0cbecd67 Fix crash in admin interface when viewing a remote user with verified links () 2023-07-07 18:10:17 +02:00
Claire d979d9fe49 Fix branding:generate_app_icons failing because of disallowed ICO coder () 2023-07-07 18:10:00 +02:00
nemobis 86c00c14a5 Fix typo in CHANGELOG.md () 2023-07-07 14:15:54 +02:00
renovate[bot] 4713b2e0b2 Update dependency sanitize to v6.0.2 [SECURITY] () 
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 () 2023-07-07 13:35:22 +02:00
Claire 4c1f5cd847 Fix incorrect secondary button size () 2023-07-07 09:50:06 +02:00
Claire 15416cb567 Merge pull request 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 () 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 () 2023-07-06 14:31:37 +02:00
Claire 41d0d67835 Merge pull request 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 () 2023-07-05 11:25:27 +02:00
Eugen Rochko 5b05451744 Add button to see results for polls in web UI () 2023-07-05 10:32:04 +02:00
Claire cac4f7fdd7 Fix OAuth apps page crashing when listing apps with certain admin API scopes () 2023-07-04 18:58:23 +02:00
Claire 1aa9197efd Fix re-activated accounts being deleted by AccountDeletionWorker () 2023-07-04 18:36:24 +02:00
Trevor Wolf b34a0ff011 fix read more button overlapping thread line bug () 2023-07-04 14:57:46 +02:00
Claire 2c31ac0c39 Fix forgotten unconfirmed_email migration file () 2023-07-04 11:25:29 +02:00
mogaminsk f3ca8aede9 Fix local live feeds does not expand () 2023-07-04 00:37:57 +02:00
forsamori 7731fbbba7 Add at-symbol prepended to mention span title () 
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 () 2023-07-03 22:57:18 +02:00
Daniel M Brasil 2b877ad937 Fix `/api/v2/search` not working with following query param () 2023-07-03 18:06:57 +02:00
Eugen Rochko 12c6337c96 Fix regression of icon button colors in web UI () 2023-07-03 16:51:04 +02:00
Plastikmensch bd0986e5d7 Add regex filter back to firehose () 
* 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 () 2023-07-03 11:32:31 +02:00