075887e1d6
Merge commit 'ea10febd257b5b729a50aeb3218389763f5f4b97' into glitch-soc/merge-upstream
1 year ago
71f8c45c18
[Glitch] Change label and design of sensitive and unavailable media in web UI
...
Port 338a0e70cc
1 year ago
dd0002e1fe
Merge commit '610cf6c3713e414995ea1a57110db400ccb88dd2' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/trends.rb`:
Conflict due to glitch-soc's code splitting trends mailing depending on type.
Ported upstream's changes.
1 year ago
c250b37f0a
[Glitch] Fix explore page being inaccessible when opted-out of trends in web UI
...
Port ceeb2b8c41
1 year ago
82eebd0482
Merge commit '41a505513fb36f7c28c8d8a4270d5ee192169462' 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
9e311f95aa
[Glitch] simplify counters
...
Port e0d230fb37
1 year ago
5b9e43187c
[Glitch] Rewrite `<ShortNumber />` as FC and TS
...
Port 20e85c0e83
1 year ago
55ea79165a
[Glitch] Convert `<DismissableBanner>` to Typescript
...
Port 4534498a8e
1 year ago
0bfa4a990f
[Glitch] Fix translate button position
...
Port 9f078e238d
1 year ago
7e54a30f06
Merge commit '4534498a8e43f59980ee56e9938efab8580c78c8' into glitch-soc/merge-upstream
1 year ago
67055b0343
Fix import order inconsistencies ( #2289 )
1 year ago
ea10febd25
fix buttons showing inconsistent styles ( #25903 )
1 year ago
99be47f8b9
Change searching with # to include account index ( #25638 )
1 year ago
af54bf52c8
Fix filters not applying to explore tab ( #25887 )
1 year ago
999c343946
Fix remote accounts being possibly persisted to database with incomplete protocol values ( #25886 )
1 year ago
4b5851974c
Fix moderation interface for remote instances with a .zip TLD ( #25885 )
1 year ago
c27b82a437
Add `forward_to_domains` parameter to `POST /api/v1/reports` ( #25866 )
1 year ago
f3fca78756
Refactor `NotificationMailer` to use parameterization ( #25718 )
1 year ago
a1f5188c8c
Change feed merge, unmerge and regeneration workers to use a replica ( #25849 )
1 year ago
610cf6c371
Fix trend calculation working on too many items at a time ( #25835 )
1 year ago
338a0e70cc
Change label and design of sensitive and unavailable media in web UI ( #25712 )
1 year ago
d6b387a0c4
Remove unused `NotificationMailer#digest` preview ( #25719 )
1 year ago
cf33028f35
Admin mailer parameterization ( #25759 )
1 year ago
41a505513f
Remove unused `missed_update` state ( #25832 )
1 year ago
a7ca33ad96
Add toast with option to open post after publishing in web UI ( #25564 )
1 year ago
a8edbcf963
Fix dropdowns being disabled for logged out users in web UI ( #25714 )
1 year ago
ceeb2b8c41
Fix explore page being inaccessible when opted-out of trends in web UI ( #25716 )
1 year ago
93e8a15415
Add forwarding of reported replies to servers being replied to ( #25341 )
1 year ago
e4cfe4b3db
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
4534498a8e
Convert `<DismissableBanner>` to Typescript ( #25582 )
1 year ago
20e85c0e83
Rewrite `<ShortNumber />` as FC and TS ( #25492 )
1 year ago
e0d230fb37
simplify counters ( #25541 )
1 year ago
0f9b803eb3
Regenerate brakeman ignore, pruning warnings ( #25749 )
1 year ago
9f078e238d
Fix translate button position ( #25807 )
1 year ago
a40529fa79
Merge pull request #2279 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
1 year ago
b9aa228c54
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
0051128387
Bump version to v4.1.4 ( #25805 )
1 year ago
d481e72e85
Tag images with the latest tag only when running against the latest stable branch ( #25803 )
1 year ago
b6d173b459
Fix crash in admin interface when viewing a remote user with verified links ( #25796 )
1 year ago
71d44949bf
Fix branding:generate_app_icons failing because of disallowed ICO coder ( #25794 )
1 year ago
dfedf0ec64
Fix typo in CHANGELOG.md ( #25764 )
1 year ago
8b624553ef
Update dependency sanitize to v6.0.2 [SECURITY] ( #25777 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 year ago
94fbac77e7
Fix processing of media files with unusual names ( #25788 )
1 year ago
513078de7a
Fix incorrect secondary button size ( #2276 )
1 year ago
c25ba31e95
Merge pull request #2274 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
1 year ago
ff7aae3037
Merge branch 'main' into glitch-soc/merge-upstream
1 year ago
5e1752ce3f
Bump version to v4.1.3 ( #25757 )
1 year ago
610731b03d
Merge pull request from GHSA-55j9-c3mp-6fcq
1 year ago
c5929798bf
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
dc8f1fbd97
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
Claire
Eugen Rochko
fusagiko / takayamaki
alfe
Renaud Chaput
Trevor Wolf
jsgoldstein
Matt Jankowski
Kurtis Rainbolt-Greene
nemobis
renovate[bot]