15416cb567
Merge pull request #2274 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
1 year ago
3581e4be49
Merge branch 'main' into glitch-soc/merge-upstream
1 year ago
8f62bea002
Bump version to v4.1.3 ( #25757 )
1 year ago
dab0be5aed
Merge pull request from GHSA-55j9-c3mp-6fcq
1 year ago
d7ed682130
Merge pull request from GHSA-9pxv-6qvf-pjwc
...
* Fix timeout handling of outbound HTTP requests
* Use CLOCK_MONOTONIC instead of Time.now
1 year ago
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
1 year ago
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
1 year ago
5154acdb9f
Add hardened headers to user-uploaded files ( #25756 )
1 year ago
41d0d67835
Merge pull request #2272 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
1 year ago
3676bc46da
[Glitch] Fix regression of icon button colors in web UI
...
Port 12c6337c96
1 year ago
fa02ad3b8c
[Glitch] Change button colors to increase hover/focus contrast and consistency
...
Port 5f31104e1f
1 year ago
c66faebe43
[Glitch] Add button to see results for polls in web UI
...
Port 5b05451744
1 year ago
7747947353
[Glitch] Add canonical link tags in web UI
...
Port 90911f4396
1 year ago
0003a22bc1
[Glitch] Fix local live feeds does not expand
...
Port f3ca8aede9
1 year ago
136ed77764
[Glitch] Add at-symbol prepended to mention span title
...
Port 7731fbbba7
1 year ago
5b328d07e6
[Glitch] Change labels of live feeds tabs in web UI
...
Port 80fee1403f
1 year ago
784f2f35bc
Merge branch 'main' into glitch-soc/merge-upstream
1 year ago
90911f4396
Add canonical link tags in web UI ( #25715 )
1 year ago
5b05451744
Add button to see results for polls in web UI ( #25726 )
1 year ago
cac4f7fdd7
Fix OAuth apps page crashing when listing apps with certain admin API scopes ( #25713 )
1 year ago
1aa9197efd
Fix re-activated accounts being deleted by AccountDeletionWorker ( #25711 )
1 year ago
b34a0ff011
fix read more button overlapping thread line bug ( #25706 )
1 year ago
2c31ac0c39
Fix forgotten unconfirmed_email migration file ( #25702 )
1 year ago
f3ca8aede9
Fix local live feeds does not expand ( #25694 )
1 year ago
7731fbbba7
Add at-symbol prepended to mention span title ( #25684 )
...
Co-authored-by: Sam BC <samuel.balbirnie-cumming@xdesign.com>
1 year ago
80fee1403f
Change labels of live feeds tabs in web UI ( #25683 )
1 year ago
2b877ad937
Fix `/api/v2/search` not working with following query param ( #25681 )
1 year ago
12c6337c96
Fix regression of icon button colors in web UI ( #25679 )
1 year ago
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>
1 year ago
5f31104e1f
Change button colors to increase hover/focus contrast and consistency ( #25677 )
1 year ago
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>
1 year ago
7ec2300853
Merge pull request #2263 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
1 year ago
c33c8bc048
Show local-only posts in “All” by default, and add back option to toggle it
1 year ago
4885232358
Add users index on unconfirmed_email ( #25672 )
1 year ago
e052b71f15
Add superapp index on `oauth_applications` ( #25670 )
1 year ago
fe1735f409
Fix inefficient query when requesting a new confirmation email from a logged-in account ( #25669 )
1 year ago
db90f2b456
[Glitch] Prevent duplicate concurrent calls of `/api/*/instance` in web UI
...
Port ee22b32aef
1 year ago
f3140305f9
[Glitch] Change dropdown icon above compose form from ellipsis to bars in web UI
...
Port f504aded26
1 year ago
95da88be87
[Glitch] Change local and federated timelines to be in a single firehose column
...
Port 6ca66c8cad
1 year ago
bb5fddd588
[Glitch] Use an Immutable Record as the root state
...
Port 2751a6d716
1 year ago
f6ede7b089
[Glitch] Fix onboarding prompt being displayed because of disconnection gaps
...
Port 1408b62211
1 year ago
34dd555a1c
[Glitch] Remove the search button from UI header when logged out
...
Port 7a47a52cd3
1 year ago
0a6bc158bd
Merge branch 'main' into glitch-soc/merge-upstream
1 year ago
edb6aab974
Revert "Rails 7 update" ( #25667 )
1 year ago
ee22b32aef
Prevent duplicate concurrent calls of `/api/*/instance` in web UI ( #25663 )
1 year ago
f504aded26
Change dropdown icon above compose form from ellipsis to bars in web UI ( #25661 )
1 year ago
5cadbaa296
Rails 7 update ( #24241 )
1 year ago
2f17abc686
Fix HTTP 500 in `/api/v1/emails/check_confirmation` ( #25595 )
1 year ago
6ca66c8cad
Change local and federated timelines to be in a single firehose column ( #25641 )
1 year ago
8e2e36ba0c
Update uri to version 0.12.2 (CVE fix) ( #25657 )
1 year ago
Claire
Eugen Rochko
Trevor Wolf
mogaminsk
forsamori
Daniel M Brasil
Plastikmensch
Renaud Chaput
Matt Jankowski