618eb10d18
Fix embed dropdown menu item for unauthenticated users ( #25964 )
2023-07-13 15:53:03 +02:00
ecf7aa0fb3
Refactor `Status.tagged_with_all` for brakeman SQL injection warning ( #25941 )
2023-07-13 15:52:37 +02:00
c1bd8248c4
[Glitch] Fix follow link style in embeds
...
Port fc6d89573c
2023-07-13 14:52:36 +02:00
e5f09f145a
[Glitch] Upgrade to `typescript-eslint` v6
...
Port a09ed92a77
2023-07-13 14:51:24 +02:00
90a0f97140
Fix incorrect types in DisplayName
2023-07-13 14:51:24 +02:00
3c714ea3d2
Merge commit 'fc6d89573cc6d07b8b82c096d1ee04c5f7909460' into glitch-soc/merge-upstream
2023-07-13 14:22:20 +02:00
0e07aadfda
[Glitch] Convert Home timeline components to Typescript
...
Port f8302ec345
2023-07-13 14:21:08 +02:00
794ee87771
Merge commit '789459cea386e47870d457aa79a221392930095d' into glitch-soc/merge-upstream
2023-07-13 14:02:28 +02:00
385eb83893
[Glitch] Upgrade to Prettier 3
...
Port 9094a65fd4
2023-07-13 14:01:40 +02:00
268e955aef
Merge commit '9094a65fd45f713bc66adf477c674ef7d33803a0' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/styles/fonts/roboto-mono.scss`:
Upstream updated the linter, which changed a few linter rules.
Some of those changed lines are different in glitch-soc because we use
different paths for the assets.
Applied the same style rules on our version of the file.
- `app/javascript/styles/fonts/roboto.scss`:
Upstream updated the linter, which changed a few linter rules.
Some of those changed lines are different in glitch-soc because we use
different paths for the assets.
Applied the same style rules on our version of the file.
2023-07-13 13:49:58 +02:00
c6212d89f8
Merge commit '9e6c02fd815253712c2e8ba1c1ebed092a007653' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/application_controller.rb:
Upstream added an `include` where we had an extra `include` due to
glitch-soc's theming system.
Added upstream's new `include`.
2023-07-13 13:35:15 +02:00
fc6d89573c
Fix follow link style in embeds ( #25965 )
2023-07-13 12:58:56 +02:00
a09ed92a77
Upgrade to `typescript-eslint` v6 ( #25904 )
2023-07-13 11:49:16 +02:00
789459cea3
Update dependency rubocop-rails to v2.20.1 ( #25493 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2023-07-13 11:44:02 +02:00
f8302ec345
Convert Home timeline components to Typescript ( #25583 )
2023-07-13 11:28:55 +02:00
9094a65fd4
Upgrade to Prettier 3 ( #25902 )
2023-07-13 11:26:45 +02:00
9e5862608f
Fix trending publishers table not rendering correctly on narrow screens ( #25945 )
2023-07-13 11:12:51 +02:00
1b1f9dff10
Update rubocop to v1.54.1 ( #25627 )
2023-07-13 11:11:55 +02:00
5cdc196e44
Rails 7.0 update ( #25668 )
2023-07-13 09:36:07 +02:00
bd06bdf164
Fix various CSS issues
2023-07-12 19:13:31 +02:00
8bc36b5084
Change markers API to use a replica ( #25851 )
2023-07-12 18:57:40 +02:00
315002c1be
Change notifications API to use a replica ( #25874 )
2023-07-12 17:06:00 +02:00
1399e9d863
Merge commit '6ee7c03b282663700b2e3f2f83b57b163aac2a35' into glitch-soc/merge-upstream
...
Conflicts:
- `db/migrate/20180831171112_create_bookmarks.rb`:
Upstream ran a lint fix on this file, but this file is different in
glitch-soc because the feature was added much earlier.
Ran the lint fix on our own version of the file.
2023-07-12 16:03:05 +02:00
3890b5c5fd
[Glitch] Fix sounds not being loaded from assets host
...
Port 01b9ee2b81
2023-07-12 16:00:20 +02:00
9af6f6db1a
Merge commit '5ad5dcd563671f9b73e761a42cff991869a37adc' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-image.yml`:
Upstream changed how releases are tagged, we don't have releases.
Ignored the changes
2023-07-12 15:54:58 +02:00
7e3d2d3b4f
[Glitch] fix buttons showing inconsistent styles
...
Port 29c29410d2
2023-07-12 15:50:56 +02:00
05c57b674f
[Glitch] Fix filters not applying to explore tab
...
Port 047d44611b
2023-07-12 15:48:13 +02:00
e91c424b7c
[Glitch] Add `forward_to_domains` parameter to `POST /api/v1/reports`
...
Port 66693177ff
2023-07-12 15:47:43 +02:00
2189682f8f
Merge commit '29c29410d2b5386dddcb12bdb413c7b3d078dbc5' into glitch-soc/merge-upstream
2023-07-12 15:44:33 +02:00
70c0ba7e5b
[Glitch] Change label and design of sensitive and unavailable media in web UI
...
Port 7496c1b655
2023-07-12 15:43:10 +02:00
54b6b035a7
Merge commit 'b945f16ddf0c87654d5dc5d0f46f475913247dab' 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
c2a5484268
[Glitch] Fix explore page being inaccessible when opted-out of trends in web UI
...
Port 9f5eab728b
2023-07-12 15:34:12 +02:00
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.
2023-07-12 15:27:32 +02:00
f9042a3d40
[Glitch] simplify counters
...
Port 4106a801a0
2023-07-12 15:18:41 +02:00
4781c1f7eb
[Glitch] Rewrite `<ShortNumber />` as FC and TS
...
Port b5c5e2bf36
2023-07-12 15:17:18 +02:00
5a6f556541
[Glitch] Convert `<DismissableBanner>` to Typescript
...
Port 9203ab410c
2023-07-12 15:09:14 +02:00
5cd9e85fbb
[Glitch] Fix translate button position
...
Port 7ff696d848
2023-07-12 15:05:24 +02:00
8a27e68050
Merge commit '9203ab410c09efbd9facf202f2570cdd0def8de0' into glitch-soc/merge-upstream
2023-07-12 15:00:41 +02:00
a64181f28b
Fix import order inconsistencies ( #2289 )
2023-07-12 15:00:10 +02:00
1b1ecf8ee2
Refactor `Trends::Query` to avoid brakeman sql injection warnings ( #25881 )
2023-07-12 14:19:20 +02:00
8d20afe0aa
Update Stylelint ( #25819 )
2023-07-12 12:31:23 +02:00
08421e7b90
Fix `Naming/MemoizedInstanceVariableName` cop ( #25928 )
2023-07-12 10:08:51 +02:00
399a738c85
Fix `Naming/AccessorMethodName` cop ( #25924 )
2023-07-12 10:03:19 +02:00
d98717ceef
Fix `Style/SlicingWithRange` cop ( #25923 )
2023-07-12 10:03:06 +02:00
96a8aa32ad
Enable Rubocop Style/FrozenStringLiteralComment ( #23793 )
2023-07-12 09:47:08 +02:00
01b9ee2b81
Fix sounds not being loaded from assets host ( #25931 )
2023-07-12 03:02:32 +02:00
d36859f37e
Use invariant colors on notification toasts ( #25919 )
2023-07-11 23:30:21 +02:00
29c29410d2
fix buttons showing inconsistent styles ( #25903 )
2023-07-11 12:26:09 +02:00
c6ac835588
Change searching with # to include account index ( #25638 )
2023-07-10 20:58:13 +02:00
047d44611b
Fix filters not applying to explore tab ( #25887 )
2023-07-10 19:33:07 +02:00
de3b86a5f8
Fix remote accounts being possibly persisted to database with incomplete protocol values ( #25886 )
2023-07-10 18:42:19 +02:00
66693177ff
Add `forward_to_domains` parameter to `POST /api/v1/reports` ( #25866 )
2023-07-10 18:26:56 +02:00
482071a976
Refactor `NotificationMailer` to use parameterization ( #25718 )
2023-07-10 03:06:22 +02:00
896f4ef2f6
Change feed merge, unmerge and regeneration workers to use a replica ( #25849 )
2023-07-10 03:06:09 +02:00
b945f16ddf
Fix trend calculation working on too many items at a time ( #25835 )
2023-07-08 20:16:48 +02:00
7496c1b655
Change label and design of sensitive and unavailable media in web UI ( #25712 )
2023-07-08 20:05:33 +02:00
6555c33503
Admin mailer parameterization ( #25759 )
2023-07-08 20:03:38 +02:00
e75e734ac2
Remove unused `missed_update` state ( #25832 )
2023-07-08 20:02:14 +02:00
703ff75549
Add toast with option to open post after publishing in web UI ( #25564 )
2023-07-08 20:01:08 +02:00
3df957104a
Fix dropdowns being disabled for logged out users in web UI ( #25714 )
2023-07-08 20:00:52 +02:00
9f5eab728b
Fix explore page being inaccessible when opted-out of trends in web UI ( #25716 )
2023-07-08 20:00:12 +02:00
6894f5c114
Add forwarding of reported replies to servers being replied to ( #25341 )
2023-07-08 20:00:02 +02:00
a27f2686ca
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
9203ab410c
Convert `<DismissableBanner>` to Typescript ( #25582 )
2023-07-08 11:12:20 +02:00
b5c5e2bf36
Rewrite `<ShortNumber />` as FC and TS ( #25492 )
2023-07-08 11:11:58 +02:00
4106a801a0
simplify counters ( #25541 )
2023-07-08 11:11:22 +02:00
7ff696d848
Fix translate button position ( #25807 )
2023-07-08 00:12:31 +02:00
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
9a0cbecd67
Fix crash in admin interface when viewing a remote user with verified links ( #25796 )
2023-07-07 18:10:17 +02:00
0b9ced4b0c
Fix processing of media files with unusual names ( #25788 )
2023-07-07 13:35:22 +02:00
4c1f5cd847
Fix incorrect secondary button size ( #2276 )
2023-07-07 09:50:06 +02:00
3581e4be49
Merge branch 'main' into glitch-soc/merge-upstream
2023-07-06 15:16:34 +02:00
dab0be5aed
Merge pull request from GHSA-55j9-c3mp-6fcq
2023-07-06 15:06:49 +02:00
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
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
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
3676bc46da
[Glitch] Fix regression of icon button colors in web UI
...
Port 12c6337c96
2023-07-05 13:31:26 +02:00
fa02ad3b8c
[Glitch] Change button colors to increase hover/focus contrast and consistency
...
Port 5f31104e1f
2023-07-05 13:30:52 +02:00
c66faebe43
[Glitch] Add button to see results for polls in web UI
...
Port 5b05451744
2023-07-05 12:42:24 +02:00
7747947353
[Glitch] Add canonical link tags in web UI
...
Port 90911f4396
2023-07-05 12:41:52 +02:00
0003a22bc1
[Glitch] Fix local live feeds does not expand
...
Port f3ca8aede9
2023-07-05 12:39:46 +02:00
136ed77764
[Glitch] Add at-symbol prepended to mention span title
...
Port 7731fbbba7
2023-07-05 12:38:54 +02:00
5b328d07e6
[Glitch] Change labels of live feeds tabs in web UI
...
Port 80fee1403f
2023-07-05 12:37:37 +02:00
784f2f35bc
Merge branch 'main' into glitch-soc/merge-upstream
2023-07-05 12:01:26 +02:00
90911f4396
Add canonical link tags in web UI ( #25715 )
2023-07-05 11:25:27 +02:00
5b05451744
Add button to see results for polls in web UI ( #25726 )
2023-07-05 10:32:04 +02:00
cac4f7fdd7
Fix OAuth apps page crashing when listing apps with certain admin API scopes ( #25713 )
2023-07-04 18:58:23 +02:00
1aa9197efd
Fix re-activated accounts being deleted by AccountDeletionWorker ( #25711 )
2023-07-04 18:36:24 +02:00
b34a0ff011
fix read more button overlapping thread line bug ( #25706 )
2023-07-04 14:57:46 +02:00
f3ca8aede9
Fix local live feeds does not expand ( #25694 )
2023-07-04 00:37:57 +02:00
7731fbbba7
Add at-symbol prepended to mention span title ( #25684 )
...
Co-authored-by: Sam BC <samuel.balbirnie-cumming@xdesign.com>
2023-07-03 22:58:10 +02:00
80fee1403f
Change labels of live feeds tabs in web UI ( #25683 )
2023-07-03 22:57:18 +02:00
2b877ad937
Fix `/api/v2/search` not working with following query param ( #25681 )
2023-07-03 18:06:57 +02:00
12c6337c96
Fix regression of icon button colors in web UI ( #25679 )
2023-07-03 16:51:04 +02:00
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>
2023-07-03 15:41:50 +02:00
5f31104e1f
Change button colors to increase hover/focus contrast and consistency ( #25677 )
2023-07-03 11:32:31 +02:00
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>
2023-07-03 07:00:38 +02:00
c33c8bc048
Show local-only posts in “All” by default, and add back option to toggle it
2023-07-02 20:28:02 +02:00
4885232358
Add users index on unconfirmed_email ( #25672 )
2023-07-02 19:41:35 +02:00
fe1735f409
Fix inefficient query when requesting a new confirmation email from a logged-in account ( #25669 )
2023-07-02 16:08:58 +02:00
Claire