63ca7222d6
Merge commit 'e75e734ac2d972ee82d344ebb7632a26d0746cb7' into glitch-soc/merge-upstream
...
Conflicts:
- `app/serializers/initial_state_serializer.rb`:
Upstream renamed an initial state parameter, where we had extra ones.
Renamed as upstream did.
- `app/workers/feed_insert_worker.rb`:
Upstream wrapped database query in a block, we had extra database
queries because of the DM timeline.
Moved everything in the block.
1 year ago
f9042a3d40
[Glitch] simplify counters
...
Port 4106a801a0
1 year ago
4781c1f7eb
[Glitch] Rewrite `<ShortNumber />` as FC and TS
...
Port b5c5e2bf36
1 year ago
5a6f556541
[Glitch] Convert `<DismissableBanner>` to Typescript
...
Port 9203ab410c
1 year ago
5cd9e85fbb
[Glitch] Fix translate button position
...
Port 7ff696d848
1 year ago
8a27e68050
Merge commit '9203ab410c09efbd9facf202f2570cdd0def8de0' into glitch-soc/merge-upstream
1 year ago
a64181f28b
Fix import order inconsistencies ( #2289 )
1 year ago
e75e734ac2
Remove unused `missed_update` state ( #25832 )
1 year ago
703ff75549
Add toast with option to open post after publishing in web UI ( #25564 )
1 year ago
3df957104a
Fix dropdowns being disabled for logged out users in web UI ( #25714 )
1 year ago
9f5eab728b
Fix explore page being inaccessible when opted-out of trends in web UI ( #25716 )
1 year ago
6894f5c114
Add forwarding of reported replies to servers being replied to ( #25341 )
1 year ago
a27f2686ca
First pass at multi-database for read replica using Rails native adapter ( #25693 )
...
Co-authored-by: emilweth <7402764+emilweth@users.noreply.github.com>
1 year ago
9203ab410c
Convert `<DismissableBanner>` to Typescript ( #25582 )
1 year ago
b5c5e2bf36
Rewrite `<ShortNumber />` as FC and TS ( #25492 )
1 year ago
4106a801a0
simplify counters ( #25541 )
1 year ago
3f04f0c37b
Regenerate brakeman ignore, pruning warnings ( #25749 )
1 year ago
7ff696d848
Fix translate button position ( #25807 )
1 year ago
db11493851
Merge pull request #2279 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
1 year ago
9ba89aeeb5
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-image.yml`:
Upstream attempted something with tags.
Kept our version.
1 year ago
784f7fb497
Bump version to v4.1.4 ( #25805 )
1 year ago
6b6774341d
Tag images with the latest tag only when running against the latest stable branch ( #25803 )
1 year ago
9a0cbecd67
Fix crash in admin interface when viewing a remote user with verified links ( #25796 )
1 year ago
d979d9fe49
Fix branding:generate_app_icons failing because of disallowed ICO coder ( #25794 )
1 year ago
86c00c14a5
Fix typo in CHANGELOG.md ( #25764 )
1 year ago
4713b2e0b2
Update dependency sanitize to v6.0.2 [SECURITY] ( #25777 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
0b9ced4b0c
Fix processing of media files with unusual names ( #25788 )
1 year ago
4c1f5cd847
Fix incorrect secondary button size ( #2276 )
1 year ago
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
Claire
fusagiko / takayamaki
alfe
Renaud Chaput
Eugen Rochko
Kurtis Rainbolt-Greene
Matt Jankowski
nemobis
renovate[bot]
Trevor Wolf
mogaminsk
forsamori