Claire
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.
2023-07-12 15:38:35 +02:00
Eugen Rochko
c250b37f0a
[Glitch] Fix explore page being inaccessible when opted-out of trends in web UI
...
Port ceeb2b8c41
2023-07-12 15:34:12 +02:00
Claire
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.
2023-07-12 15:27:32 +02:00
fusagiko / takayamaki
9e311f95aa
[Glitch] simplify counters
...
Port e0d230fb37
2023-07-12 15:18:41 +02:00
alfe
5b9e43187c
[Glitch] Rewrite <ShortNumber /> as FC and TS
...
Port 20e85c0e83
2023-07-12 15:17:18 +02:00
Renaud Chaput
55ea79165a
[Glitch] Convert <DismissableBanner> to Typescript
...
Port 4534498a8e
2023-07-12 15:09:14 +02:00
Renaud Chaput
0bfa4a990f
[Glitch] Fix translate button position
...
Port 9f078e238d
2023-07-12 15:05:24 +02:00
Claire
7e54a30f06
Merge commit '4534498a8e43f59980ee56e9938efab8580c78c8' into glitch-soc/merge-upstream
2023-07-12 15:00:41 +02:00
Claire
67055b0343
Fix import order inconsistencies ( #2289 )
2023-07-12 15:00:10 +02:00
Eugen Rochko
610cf6c371
Fix trend calculation working on too many items at a time ( #25835 )
2023-07-08 20:16:48 +02:00
Eugen Rochko
338a0e70cc
Change label and design of sensitive and unavailable media in web UI ( #25712 )
2023-07-08 20:05:33 +02:00
Matt Jankowski
d6b387a0c4
Remove unused NotificationMailer#digest preview ( #25719 )
2023-07-08 20:04:21 +02:00
Matt Jankowski
cf33028f35
Admin mailer parameterization ( #25759 )
2023-07-08 20:03:38 +02:00
Renaud Chaput
41a505513f
Remove unused missed_update state ( #25832 )
2023-07-08 20:02:14 +02:00
Eugen Rochko
a7ca33ad96
Add toast with option to open post after publishing in web UI ( #25564 )
2023-07-08 20:01:08 +02:00
Eugen Rochko
a8edbcf963
Fix dropdowns being disabled for logged out users in web UI ( #25714 )
2023-07-08 20:00:52 +02:00
Eugen Rochko
ceeb2b8c41
Fix explore page being inaccessible when opted-out of trends in web UI ( #25716 )
2023-07-08 20:00:12 +02:00
Eugen Rochko
93e8a15415
Add forwarding of reported replies to servers being replied to ( #25341 )
2023-07-08 20:00:02 +02:00
Kurtis Rainbolt-Greene
e4cfe4b3db
First pass at multi-database for read replica using Rails native adapter ( #25693 )
...
Co-authored-by: emilweth <7402764+emilweth@users.noreply.github.com>
2023-07-08 19:45:36 +02:00
Renaud Chaput
4534498a8e
Convert <DismissableBanner> to Typescript ( #25582 )
2023-07-08 11:12:20 +02:00
alfe
20e85c0e83
Rewrite <ShortNumber /> as FC and TS ( #25492 )
2023-07-08 11:11:58 +02:00
fusagiko / takayamaki
e0d230fb37
simplify counters ( #25541 )
2023-07-08 11:11:22 +02:00
Matt Jankowski
0f9b803eb3
Regenerate brakeman ignore, pruning warnings ( #25749 )
2023-07-08 11:07:19 +02:00
Renaud Chaput
9f078e238d
Fix translate button position ( #25807 )
2023-07-08 00:12:31 +02:00
Claire
a40529fa79
Merge pull request #2279 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2023-07-07 20:33:32 +02:00
Claire
b9aa228c54
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
0051128387
Bump version to v4.1.4 ( #25805 )
2023-07-07 19:42:03 +02:00
Renaud Chaput
d481e72e85
Tag images with the latest tag only when running against the latest stable branch ( #25803 )
2023-07-07 19:31:55 +02:00
Claire
b6d173b459
Fix crash in admin interface when viewing a remote user with verified links ( #25796 )
2023-07-07 18:10:17 +02:00
Claire
71d44949bf
Fix branding:generate_app_icons failing because of disallowed ICO coder ( #25794 )
2023-07-07 18:10:00 +02:00
nemobis
dfedf0ec64
Fix typo in CHANGELOG.md ( #25764 )
2023-07-07 14:15:54 +02:00
renovate[bot]
8b624553ef
Update dependency sanitize to v6.0.2 [SECURITY] ( #25777 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-07-07 13:35:54 +02:00
Claire
94fbac77e7
Fix processing of media files with unusual names ( #25788 )
2023-07-07 13:35:22 +02:00
Claire
513078de7a
Fix incorrect secondary button size ( #2276 )
2023-07-07 09:50:06 +02:00
Claire
c25ba31e95
Merge pull request #2274 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2023-07-06 15:21:10 +02:00
Claire
ff7aae3037
Merge branch 'main' into glitch-soc/merge-upstream
2023-07-06 15:16:34 +02:00
Claire
5e1752ce3f
Bump version to v4.1.3 ( #25757 )
2023-07-06 15:14:42 +02:00
Claire
610731b03d
Merge pull request from GHSA-55j9-c3mp-6fcq
2023-07-06 15:06:49 +02:00
Claire
c5929798bf
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
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
2023-07-06 15:05:05 +02:00
Claire
6d8e0fae3e
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
fed9cbfd2b
Add hardened headers to user-uploaded files ( #25756 )
2023-07-06 14:31:37 +02:00
Claire
30ad9d976b
Merge pull request #2272 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2023-07-05 16:47:23 +02:00
Eugen Rochko
c0fa85b8dd
[Glitch] Fix regression of icon button colors in web UI
...
Port 69e124e2ed
2023-07-05 13:31:26 +02:00
Trevor Wolf
4719d88117
[Glitch] Change button colors to increase hover/focus contrast and consistency
...
Port 54cb679c19
2023-07-05 13:30:52 +02:00
Eugen Rochko
a117c953d0
[Glitch] Add button to see results for polls in web UI
...
Port b7910bc751
2023-07-05 12:42:24 +02:00
Eugen Rochko
b3f209370b
[Glitch] Add canonical link tags in web UI
...
Port 000b835803
2023-07-05 12:41:52 +02:00
mogaminsk
c6246807f5
[Glitch] Fix local live feeds does not expand
...
Port 6268188543
2023-07-05 12:39:46 +02:00
forsamori
ac74374311
[Glitch] Add at-symbol prepended to mention span title
...
Port d9a5c1acfa
2023-07-05 12:38:54 +02:00
Eugen Rochko
0a5271629c
[Glitch] Change labels of live feeds tabs in web UI
...
Port 54a10523e2
2023-07-05 12:37:37 +02:00
