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
db90f2b456
[Glitch] Prevent duplicate concurrent calls of `/api/*/instance` in web UI
...
Port ee22b32aef
2023-07-02 12:00:03 +02:00
f3140305f9
[Glitch] Change dropdown icon above compose form from ellipsis to bars in web UI
...
Port f504aded26
2023-07-02 11:59:31 +02:00
95da88be87
[Glitch] Change local and federated timelines to be in a single firehose column
...
Port 6ca66c8cad
2023-07-02 11:58:51 +02:00
bb5fddd588
[Glitch] Use an Immutable Record as the root state
...
Port 2751a6d716
2023-07-02 11:55:34 +02:00
f6ede7b089
[Glitch] Fix onboarding prompt being displayed because of disconnection gaps
...
Port 1408b62211
2023-07-02 11:55:08 +02:00
34dd555a1c
[Glitch] Remove the search button from UI header when logged out
...
Port 7a47a52cd3
2023-07-02 11:54:47 +02:00
0a6bc158bd
Merge branch 'main' into glitch-soc/merge-upstream
2023-07-02 11:49:08 +02:00
edb6aab974
Revert "Rails 7 update" ( #25667 )
2023-07-02 11:14:22 +02:00
ee22b32aef
Prevent duplicate concurrent calls of `/api/*/instance` in web UI ( #25663 )
2023-07-02 11:12:16 +02:00
f504aded26
Change dropdown icon above compose form from ellipsis to bars in web UI ( #25661 )
2023-07-02 10:39:55 +02:00
5cadbaa296
Rails 7 update ( #24241 )
2023-07-02 10:38:53 +02:00
2f17abc686
Fix HTTP 500 in `/api/v1/emails/check_confirmation` ( #25595 )
2023-07-02 00:05:44 +02:00
6ca66c8cad
Change local and federated timelines to be in a single firehose column ( #25641 )
2023-07-02 00:05:10 +02:00
6c6857f7ad
Fixing an issue with a missing argument ( #2261 )
...
undefined
2023-07-01 22:55:43 +02:00
843448c7d9
Fix rails `rewhere` deprecation warning in directories api controller ( #25625 )
2023-07-01 21:48:16 +02:00
2751a6d716
Use an Immutable Record as the root state ( #25584 )
2023-06-30 17:03:25 +02:00
1408b62211
Fix onboarding prompt being displayed because of disconnection gaps ( #25617 )
2023-06-30 16:32:12 +02:00
85dc0869a5
Fix ResolveURLService not resolving local URLs for remote content ( #25637 )
2023-06-29 14:48:54 +02:00
5d75bf9846
Change account search to match by text when opted-in ( #25599 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2023-06-29 13:05:21 +02:00
7a47a52cd3
Remove the search button from UI header when logged out ( #25631 )
2023-06-28 14:57:51 +02:00
bbe08e28cd
[Glitch] Improve dismissable banner buttons when they dont fit on 1 line
...
Port ff9ed824db
2023-06-27 13:25:21 +02:00
5e3d6a3433
[Glitch] Fix onboarding prompt flashing while home feed is loading in web UI
...
Port 66c513511c
2023-06-27 13:21:55 +02:00
fa093eef89
[Glitch] Fix search not being easily findable on smaller screens in web UI
...
Port 1924660c5b
2023-06-27 13:21:14 +02:00
ea57f8e3af
Merge branch 'main' into glitch-soc/merge-upstream
2023-06-27 13:15:41 +02:00
92fbaae7b6
Fix suspending an already-limited domain ( #25603 )
2023-06-27 12:32:51 +02:00
1569b36e28
Fix batch attachment deletion leaving empty directories ( #25587 )
2023-06-27 09:36:11 +02:00
2c6f88ad71
Remove media attachment only when file was exist ( #25586 )
2023-06-26 16:38:19 +02:00
bcee25e36c
Change files to be deleted in batches instead of one-by-one ( #23302 )
2023-06-26 14:17:41 +02:00
ff9ed824db
Improve dismissable banner buttons when they dont fit on 1 line ( #25580 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-06-26 12:31:48 +02:00
1164011bad
Fix compose form not being shown when clicking “Make your first post” on mobile ( #25581 )
2023-06-26 12:30:35 +02:00
65b5808421
Change header backgrounds to use fewer different colors in web UI ( #25577 )
2023-06-26 05:27:07 +02:00
66c513511c
Fix onboarding prompt flashing while home feed is loading in web UI ( #25579 )
2023-06-26 05:26:54 +02:00
1924660c5b
Fix search not being easily findable on smaller screens in web UI ( #25576 )
2023-06-26 05:26:41 +02:00
a4e2d81804
[Glitch] Remove unique accounts condition from Home onboarding prompt
...
Port 7acdf21c77
2023-06-25 17:40:01 +02:00
5660204731
[Glitch] Add onboarding prompt when home feed too slow in web UI
...
Port ad92c48d71
2023-06-25 17:40:01 +02:00
7cd1b2d753
[Glitch] Fix j/k keyboard shortcuts on some status lists
...
Port 9a27d4ec36
2023-06-25 17:40:01 +02:00
34310c3924
[Glitch] Fix custom signup URL may not loaded
...
Port e87a2c676c
2023-06-25 14:27:46 +02:00
e7905c8b32
[Glitch] Change emoji picker icon
...
Port a56475866f
2023-06-25 14:27:46 +02:00
f0999de66f
[Glitch] Rewrite `<AutosuggestHashtag />` as FC and TS
...
Port 6c4a6bd115
2023-06-25 14:27:46 +02:00
b7af3115a7
Merge commit '3d50947e62272e3da4365e0b751e4e45c1d9bac6' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/user_settings.rb`:
Upstream added a constraint on a setting textually close
to glitch-soc-only settings.
Applied upstream's change.
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream added support for the `translate` attribute on a few elements,
where glitch-soc had a different set of allowed elements and attributes.
Extended glitch-soc's allowed attributes with `translate` as upstream did.
- `spec/validators/status_length_validator_spec.rb`:
Upstream refactored to use RSpec's `instance_double` instead of `double`,
but glitch-soc had changes to tests due to configurable max toot chars.
Applied upstream's changes while keeping tests against configurable max
toot chars.
2023-06-25 14:27:38 +02:00
3d50947e62
Fix verified badge in account lists potentially including rel="me" links ( #25561 )
2023-06-24 17:24:31 +02:00
1caf3a3933
Change labels and styles on the onboarding screen in web UI ( #25559 )
2023-06-23 16:34:27 +02:00
7acdf21c77
Remove unique accounts condition from Home onboarding prompt ( #25556 )
2023-06-23 14:44:54 +02:00
ad92c48d71
Add onboarding prompt when home feed too slow in web UI ( #25267 )
2023-06-22 23:48:40 +02:00
3406cb0427
Add POST /api/v1/conversations/:id/unread ( #25509 )
2023-06-22 18:46:43 +02:00
9a27d4ec36
Fix j/k keyboard shortcuts on some status lists ( #25554 )
2023-06-22 17:54:43 +02:00
d0144d2be3
Change /api/v1/statuses/:id/history to always return at least one item ( #25510 )
2023-06-22 14:56:14 +02:00
c1c87fe7b9
Add finer permission requirements for managing webhooks ( #25463 )
2023-06-22 14:52:25 +02:00
e87a2c676c
Fix custom signup URL may not loaded ( #25531 )
2023-06-22 12:10:49 +02:00
a56475866f
Change emoji picker icon ( #25479 )
2023-06-21 17:58:00 +02:00
5e5af7a0fe
Fix /api/v1/conversations sometimes returning empty accounts ( #25499 )
2023-06-20 18:32:26 +02:00
ba5c12974a
Fix missing validation on `default_privacy` setting ( #25513 )
2023-06-20 18:32:14 +02:00
923dde8e6c
Fix wrong view being displayed when a webhook fails validation ( #25464 )
2023-06-20 18:15:35 +02:00
4e861795a4
Add translate="no" to outgoing mentions and links ( #25524 )
2023-06-20 18:10:19 +02:00
71d3100038
Prevent UserCleanupScheduler from overwhelming streaming ( #25519 )
2023-06-20 18:04:35 +02:00
ecf17008e8
Fix user settings not getting validated ( #25508 )
2023-06-19 14:06:06 +01:00
6c4a6bd115
Rewrite `<AutosuggestHashtag />` as FC and TS ( #25481 )
2023-06-19 14:11:46 +02:00
d05a68a12e
Reduce `sleep` time in request pool spec ( #25470 )
2023-06-19 13:48:25 +02:00
eb10ac2b3e
Remove unused `picture_hint` helper method ( #25485 )
2023-06-19 09:04:15 +02:00
498e3231b6
Fix incorrect pagination headers in `/api/v2/admin/accounts` ( #25477 )
2023-06-19 08:53:05 +02:00
4e889e478f
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/layouts/application.html.haml`:
Conflicts due to glitch-soc's theming system.
Added `crossorigin: 'anonymous'` like upstream did, to the glitch-soc-specific code.
- `app/views/layouts/embedded.html.haml`:
Conflicts due to glitch-soc's theming system.
Added `crossorigin: 'anonymous'` like upstream did, to the glitch-soc-specific code.
2023-06-18 16:14:29 +02:00
85f74ed0a7
Fix cross-origin loading of locales ( #25498 )
2023-06-18 15:47:04 +02:00
d5a295f8c0
[Glitch] Fix non-interactive upload container being given a `button` role and tabIndex
...
Port 7c70237d7e
2023-06-18 14:10:49 +02:00
7066e3d5ce
Merge commit '2d058a8499fba7ba97bd3c10a40412f0bbacf1e7' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/settings/profiles/show.html.haml`:
Upstream redesigned the settings page, where glitch-soc had changes because of
the ability to set some custom limits.
Went with upstream's design while keeping our custom limits.
- `yarn.lock`:
Upstream updated dependencies textually close to a glitch-soc-only dependency.
Updated the dependnencies as well.
2023-06-18 13:41:33 +02:00
85041b74fb
[Glitch] Fix CAPTCHA page not following design pattern of sign-up flow
...
Port 239ee4f5d1
2023-06-18 12:11:58 +02:00
5a38d538a0
[Glitch] Rewrite `emoji_mart_data_light` as TS
...
Port 6e0c48cbe8
2023-06-18 12:11:19 +02:00
7e24689b7d
[Glitch] Rewrite `<LoadingIndicator/>` as FC and TS ( #25364 )
...
Port 293cf44626
2023-06-18 12:10:37 +02:00
0e43f4d4fc
[Glitch] Add missing report category translation
...
Port b51a10a066
2023-06-18 10:43:07 +02:00
8cbdffe2c7
[Glitch] Rewrite <LoadPending /> as FC and TS
...
Port 569ff79fb8
2023-06-18 10:42:04 +02:00
1ce44ec36e
[Glitch] Change "bot" label to "automated"
...
Port 272e099bce
2023-06-18 10:40:56 +02:00
f101b67a45
Merge commit '239ee4f5d10aaa30b52cc59a58b2dc33fea5615f' into glitch-soc/merge-upstream
2023-06-18 10:36:14 +02:00
7c70237d7e
Fix non-interactive upload container being given a `button` role and tabIndex ( #25462 )
2023-06-16 12:03:06 +02:00
4a994e5b50
Fix `ArgumentError` in `/api/v1/admin/accounts/:id/action` ( #25386 )
2023-06-14 15:21:36 +02:00
937764ce4b
Fix always redirecting to onboarding in web UI ( #25396 )
2023-06-14 09:05:03 +02:00
a424076226
Fix ArgumentError when loading newer Private Mentions ( #25399 )
2023-06-14 08:54:52 +02:00
989a8758e3
Change edit profile page ( #25413 )
2023-06-14 04:38:07 +02:00
239ee4f5d1
Fix CAPTCHA page not following design pattern of sign-up flow ( #25395 )
2023-06-13 22:30:40 +02:00
6e0c48cbe8
Rewrite `emoji_mart_data_light` as TS ( #25138 )
2023-06-13 19:28:31 +02:00
293cf44626
Rewrite `<LoadingIndicator/>` as FC and TS ( #25364 )
2023-06-13 19:26:25 +02:00
b51a10a066
Add missing report category translation ( #25400 )
2023-06-13 15:05:40 +02:00
94ef94c5ea
Add unsubscribe link to e-mails ( #25378 )
2023-06-12 14:22:46 +02:00
a804371e21
[Glitch] Change "direct message" nomenclature to "private mention" in web UI ( #2158 )
...
Port 868d478b1b
2023-06-11 13:33:45 +02:00
569ff79fb8
Rewrite <LoadPending /> as FC and TS ( #25363 )
2023-06-11 04:47:18 +02:00
272e099bce
Change "bot" label to "automated" ( #25356 )
2023-06-11 04:47:07 +02:00
f49b12e06d
Fix some translation strings inconsistencies
2023-06-10 19:21:44 +02:00
1c25f35ddf
Merge commit '23c3e0985346406f312b88c659cd9fad63cb6060' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
Conflict because glitch-soc does not have a theme selector here.
2023-06-10 18:42:29 +02:00
14788cf0ce
Switch to using a `common` runtime chunk rather than `locales`
2023-06-10 17:43:13 +02:00
c51e8de4ad
Merge commit 'bc7e7185ac0f0c10ebf354b738b8dfb4e8e43dcb' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
Upstream fixed a translation bug in the theme selector that is absent from
glitch-soc due to our different theming system.
Discarded upstream changes.
- `streaming/index.js`:
Upstream changed the signature of a function to change its return type.
This is not a real conflict, the conflict being caused by an extra
argument in glitch-soc's code.
Applied upstream's change while keeping our extra argument.
2023-06-10 17:18:36 +02:00
b5872b0686
[Glitch] Change design of dropdowns in web UI
...
Port 7abfddd8a5
2023-06-10 17:10:06 +02:00
ee6682e48d
[Glitch] Rewrite `<LoadMore />` as FC and TS
...
Port f9c819e8db
2023-06-10 16:59:25 +02:00
ee1de4206a
Merge commit '68d362c0fc4d41cc97e981640bef41dea6f9f79d' into glitch-soc/merge-upstream
...
Conflicts:
- `config/initializers/content_security_policy.rb`:
Kept our version, it was not affected by upstream's bug.
2023-06-10 16:48:01 +02:00
29e63ef4d5
[Glitch] Add data-nosnippet so Google doesn't use trending posts in snippets for /
...
Port 21f904b344
2023-06-10 16:38:03 +02:00
00307189bc
[Glitch] Fix not shown announcements in hometimeline.
...
Port 94f9888d57
2023-06-10 16:37:20 +02:00
3dd186bbf1
[Glitch] Fix design issues with recent react-intl upgrade
...
Port 4c2503d36c
2023-06-10 16:36:54 +02:00
46b4268007
[Glitch] Add exclusive lists
...
Port 6debddcf89
2023-06-10 16:36:15 +02:00
60762fb8ba
[Glitch] Add card with who invited you to join when displaying rules on sign-up
...
Port SCSS from c7a8838bd7
2023-06-10 16:30:36 +02:00
2877b12754
[Glitch] Fix spacing of middle dots in the detailed status meta section
...
Port 2d2750c6a9
2023-06-10 16:29:48 +02:00
085a1197da
Merge commit '21f904b344e57f68dd86b91d7228bdae37e75624' into glitch-soc/merge-upstream
...
Conflicts:
- `config/initializers/simple_form.rb`:
Upstream added a new simple_form component, where we had an extra one.
Kept both components.
2023-06-10 16:22:14 +02:00
333c28ce6d
[Glitch] Fix `/share` and cleanup and reorganize frontend locale loading
...
Port 29851c83bd
2023-06-10 16:18:01 +02:00
3b87fe21fa
Merge commit '29851c83bd518f7fe8ba44cf0c550c57047ddfa4' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/mastodon/load_locale.js`:
The file moved to `app/javascript/mastodon/locales/load_locale.ts`.
Ported the changes there and deleted `app/javascript/mastodon/load_locale.js`.
- `app/javascript/mastodon/locales/index.js`:
The file moved to `app/javascript/mastodon/locales/index.ts`.
Did *not* port the changes as I want to try something a bit different.
2023-06-10 15:32:29 +02:00
7ccf99b652
[Glitch] Fix using Date.now() instead of intl.now()
...
Port 4e28b89f51
2023-06-10 15:21:04 +02:00
e6b6a0535e
Merge commit 'a82f0363091618ddd94c76bdd36bf05f74428eee' into glitch-soc/merge-upstream
2023-06-10 15:17:08 +02:00
fd0b9c9881
[Glitch] Add a confirmation screen when suspending a domain
...
Port 8ee98cfd2b
2023-06-10 15:10:24 +02:00
13b84da439
Merge commit '8ee98cfd2b01d96222c1559f35ef8b82732af620' into glitch-soc/merge-upstream
2023-06-10 15:09:19 +02:00
5715cd6b8a
[Glitch] Fix prev/next buttons color in media viewer
...
Port 40e756f291
2023-06-10 14:48:41 +02:00
8b958c0858
[Glitch] Translate CW, poll options and media descriptions
...
Port 971eafc709
2023-06-10 14:48:41 +02:00
447b44a5d6
Merge commit '52b4e33d7fca20663e95e943631087d728bee3f6' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`:
Upstream changed various script definitions in lines surrounding the one for
`i18n:extract`, which had glitch-soc-specific changes.
Updated the scripts as upstream did, while keeping our changes to
`i18n:extract`.
2023-06-10 14:38:04 +02:00
b428d82286
[Glitch] Upgrade react-intl
...
Port 76960f128a
2023-06-10 14:37:08 +02:00
c22b032483
Merge commit '76960f128a764f5105c076813d8ffaa0df985dda' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/dependabot.yml`:
Updated upstream, but we've deleted it.
Keep it deleted.
- `app/javascript/mastodon/locales/index.js`:
Reworked upstream, but the code was mostly in
`app/javascript/locales/index.js` in glitch-soc.
Updated that file accordingly.
- `app/javascript/packs/public.jsx`:
Not a real conflict, but different imports in
glitch-soc and upstream.
- `app/views/layouts/application.html.haml`:
Conflict due to locales loading and theme system
discrepancies.
Updated in our own way.
- `app/views/layouts/embedded.html.haml`:
Conflict due to locales loading and theme system
discrepancies.
Updated in our own way.
- `config/webpack/generateLocalePacks.js`:
Deleted upstream, as upstream now directly loads the
JSON at runtime.
Deleted as well, will switch to runtime loading in
an upcoming commit.
- `config/webpack/shared.js`:
Not a real conflict, but different imports in
glitch-soc and upstream.
- `config/webpack/translationRunner.js`:
Mostly deleted upstream, to be replaced with `formatjs-formatter.js`
instead.
Moved the glitch-soc logic there and deleted the file.
2023-06-10 12:38:33 +02:00
1dd243cc09
Add time zone preference ( #25342 )
2023-06-10 03:29:37 +02:00
8b5680fd9a
Remove unused `redis_info` method Admin::Dashboard ( #25345 )
2023-06-09 14:03:35 +02:00
975914e0a6
Fix translations for changing theme ( #25340 )
2023-06-08 17:12:41 +02:00
66a5173629
Add `legal` as report category ( #23941 )
2023-06-06 23:41:59 +02:00
7abfddd8a5
Change design of dropdowns in web UI ( #25107 )
2023-06-06 21:49:49 +02:00
ef344388c5
Autofix Rubocop Regex Style rules ( #23690 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-06-06 14:50:51 +02:00
f9c819e8db
Rewrite `<LoadMore />` as FC and TS ( #25259 )
2023-06-06 11:28:50 +02:00
51046cb4db
Fix autocomplete suggestions being cut off in compose form ( #25275 )
2023-06-06 11:05:25 +02:00
2252e4d8bb
Add webhook templating ( #23289 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-06-06 10:42:47 +02:00
8f34072fc0
Change follow button in account row to be more obvious in web UI ( #24956 )
2023-06-06 04:14:28 +02:00
14dc8a6a5f
Update `Admin::Metrics::Measure` classes for Rails 7 ( #25236 )
2023-06-05 20:46:04 +02:00
21f904b344
Add data-nosnippet so Google doesn't use trending posts in snippets for / ( #25279 )
2023-06-05 17:32:24 +02:00
c74040abfa
Rails 7 compatibility fix for `Admin::Metrics::Dimension` classes ( #25277 )
2023-06-05 16:52:33 +02:00
94f9888d57
Fix not shown announcements in hometimeline. ( #25251 )
2023-06-05 14:49:51 +02:00
d6feba366b
[Glitch] Bump eslint-plugin-jsdoc from 44.2.5 to 45.0.0
...
Port 9ba1135000
2023-06-05 13:31:45 +02:00
cd107b054d
[Glitch] Fix `null` signUp URL in various places
...
Port 75ebb60ef6
2023-06-05 13:28:22 +02:00
e7cb0dc83b
[Glitch] Handle Surrogate Pairs in truncate()
...
Port 5c744a5d7d
2023-06-05 13:28:02 +02:00
bda5be1406
Merge commit '68296cfb32f6ab7baf5c8400b2bdb261d6aa3694' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
Took upstream's changes.
2023-06-05 13:25:22 +02:00
4c2503d36c
Fix design issues with recent react-intl upgrade ( #25272 )
2023-06-05 09:52:36 +02:00
6debddcf89
Add exclusive lists ( #22048 )
...
Co-authored-by: Liam Cooke <liam@liamcooke.com>
Co-authored-by: John Holdun <john@johnholdun.com>
Co-authored-by: Effy Elden <effy@effy.space>
Co-authored-by: Lina Reyne <git@lina.pizza>
Co-authored-by: Lina <20880695+necropolina@users.noreply.github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-06-05 09:37:02 +02:00
a04157e69f
Add `allow_other_host: true` to backups controller ( #25266 )
2023-06-05 08:22:03 +02:00
c4426198c3
Change "Follow 7 people" to "Find at least 7 people to follow" in web UI ( #24954 )
2023-06-05 01:42:17 +02:00
85e0bd73cf
Fix closeModal invocation ( #2239 )
...
Fixes #2238
Some call sites where missed in 62f386d44e
2023-06-04 22:05:45 +02:00
e24a587f84
Consistently use middle dot (·) instead of bullet (•) to separate items ( #25248 )
2023-06-02 19:58:18 +02:00
c7a8838bd7
Add card with who invited you to join when displaying rules on sign-up ( #23475 )
2023-06-02 18:35:37 +02:00
1c298d97c5
Change wording of “Content cache retention period” setting to highlight destructive implications ( #23261 )
2023-06-02 18:09:08 +02:00
2d2750c6a9
Fix spacing of middle dots in the detailed status meta section ( #25247 )
2023-06-02 15:40:23 +02:00
29851c83bd
Fix `/share` and cleanup and reorganize frontend locale loading ( #25240 )
2023-06-02 15:00:27 +02:00
a82f036309
Fix overflow behavior of account rows ( #25131 )
2023-06-01 14:47:55 +02:00
572086c8ad
Add support for importing lists ( #25203 )
2023-06-01 14:47:31 +02:00
4e28b89f51
Fix using Date.now() instead of intl.now() ( #25234 )
2023-06-01 13:46:19 +02:00
a6f0456756
Remove unused #hash_to_object method in SettingsHelper ( #25213 )
2023-06-01 09:47:05 +02:00
8ee98cfd2b
Add a confirmation screen when suspending a domain ( #25144 )
2023-06-01 09:37:38 +02:00
52b4e33d7f
Fix crash when S3_ALIAS_HOST or S3_CLOUDFRONT_HOST have a path component ( #25018 )
2023-06-01 09:23:28 +02:00
3d550b5712
Fix multiple N+1s in ConversationsController ( #25134 )
2023-06-01 02:41:51 +02:00
40e756f291
Fix prev/next buttons color in media viewer ( #25231 )
2023-06-01 02:25:38 +02:00
971eafc709
Translate CW, poll options and media descriptions ( #24175 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-06-01 00:10:21 +02:00
76960f128a
Upgrade react-intl ( #24906 )
2023-05-31 23:43:39 +02:00
68296cfb32
Remove unused Settings::Extend module ( #25214 )
2023-05-31 23:34:48 +02:00
jsgoldstein