Eugen Rochko
70c0ba7e5b
[Glitch] Change label and design of sensitive and unavailable media in web UI
...
Port 7496c1b655
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-07-12 15:43:10 +02:00
Claire
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
Eugen Rochko
c2a5484268
[Glitch] Fix explore page being inaccessible when opted-out of trends in web UI
...
Port 9f5eab728b
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-07-12 15:34:12 +02:00
Claire
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
fusagiko / takayamaki
f9042a3d40
[Glitch] simplify counters
...
Port 4106a801a0
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-07-12 15:18:41 +02:00
alfe
4781c1f7eb
[Glitch] Rewrite `<ShortNumber />` as FC and TS
...
Port b5c5e2bf36
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-07-12 15:17:18 +02:00
Renaud Chaput
5a6f556541
[Glitch] Convert `<DismissableBanner>` to Typescript
...
Port 9203ab410c
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-07-12 15:09:14 +02:00
Renaud Chaput
5cd9e85fbb
[Glitch] Fix translate button position
...
Port 7ff696d848
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-07-12 15:05:24 +02:00
Claire
8a27e68050
Merge commit '9203ab410c09efbd9facf202f2570cdd0def8de0' into glitch-soc/merge-upstream
2023-07-12 15:00:41 +02:00
Claire
a64181f28b
Fix import order inconsistencies ( #2289 )
2023-07-12 15:00:10 +02:00
Matt Jankowski
1b1ecf8ee2
Refactor `Trends::Query` to avoid brakeman sql injection warnings ( #25881 )
2023-07-12 14:19:20 +02:00
Renaud Chaput
8d20afe0aa
Update Stylelint ( #25819 )
2023-07-12 12:31:23 +02:00
Matt Jankowski
08421e7b90
Fix `Naming/MemoizedInstanceVariableName` cop ( #25928 )
2023-07-12 10:08:51 +02:00
Matt Jankowski
399a738c85
Fix `Naming/AccessorMethodName` cop ( #25924 )
2023-07-12 10:03:19 +02:00
Matt Jankowski
d98717ceef
Fix `Style/SlicingWithRange` cop ( #25923 )
2023-07-12 10:03:06 +02:00
Nick Schonning
96a8aa32ad
Enable Rubocop Style/FrozenStringLiteralComment ( #23793 )
2023-07-12 09:47:08 +02:00
Stanislas Signoud
01b9ee2b81
Fix sounds not being loaded from assets host ( #25931 )
2023-07-12 03:02:32 +02:00
Stanislas Signoud
d36859f37e
Use invariant colors on notification toasts ( #25919 )
2023-07-11 23:30:21 +02:00
Trevor Wolf
29c29410d2
fix buttons showing inconsistent styles ( #25903 )
2023-07-11 12:26:09 +02:00
jsgoldstein
c6ac835588
Change searching with # to include account index ( #25638 )
2023-07-10 20:58:13 +02:00
Claire
047d44611b
Fix filters not applying to explore tab ( #25887 )
2023-07-10 19:33:07 +02:00
Claire
de3b86a5f8
Fix remote accounts being possibly persisted to database with incomplete protocol values ( #25886 )
2023-07-10 18:42:19 +02:00
Claire
66693177ff
Add `forward_to_domains` parameter to `POST /api/v1/reports` ( #25866 )
2023-07-10 18:26:56 +02:00
Matt Jankowski
482071a976
Refactor `NotificationMailer` to use parameterization ( #25718 )
2023-07-10 03:06:22 +02:00
Eugen Rochko
896f4ef2f6
Change feed merge, unmerge and regeneration workers to use a replica ( #25849 )
2023-07-10 03:06:09 +02:00
Eugen Rochko
b945f16ddf
Fix trend calculation working on too many items at a time ( #25835 )
2023-07-08 20:16:48 +02:00
Eugen Rochko
7496c1b655
Change label and design of sensitive and unavailable media in web UI ( #25712 )
2023-07-08 20:05:33 +02:00
Matt Jankowski
6555c33503
Admin mailer parameterization ( #25759 )
2023-07-08 20:03:38 +02:00
Renaud Chaput
e75e734ac2
Remove unused `missed_update` state ( #25832 )
2023-07-08 20:02:14 +02:00
Eugen Rochko
703ff75549
Add toast with option to open post after publishing in web UI ( #25564 )
2023-07-08 20:01:08 +02:00
Eugen Rochko
3df957104a
Fix dropdowns being disabled for logged out users in web UI ( #25714 )
2023-07-08 20:00:52 +02:00
Eugen Rochko
9f5eab728b
Fix explore page being inaccessible when opted-out of trends in web UI ( #25716 )
2023-07-08 20:00:12 +02:00
Eugen Rochko
6894f5c114
Add forwarding of reported replies to servers being replied to ( #25341 )
2023-07-08 20:00:02 +02:00
Kurtis Rainbolt-Greene
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
Renaud Chaput
9203ab410c
Convert `<DismissableBanner>` to Typescript ( #25582 )
2023-07-08 11:12:20 +02:00
alfe
b5c5e2bf36
Rewrite `<ShortNumber />` as FC and TS ( #25492 )
2023-07-08 11:11:58 +02:00
fusagiko / takayamaki
4106a801a0
simplify counters ( #25541 )
2023-07-08 11:11:22 +02:00
Renaud Chaput
7ff696d848
Fix translate button position ( #25807 )
2023-07-08 00:12:31 +02:00
Claire
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
Claire
9a0cbecd67
Fix crash in admin interface when viewing a remote user with verified links ( #25796 )
2023-07-07 18:10:17 +02:00
Claire
0b9ced4b0c
Fix processing of media files with unusual names ( #25788 )
2023-07-07 13:35:22 +02:00
Claire
4c1f5cd847
Fix incorrect secondary button size ( #2276 )
2023-07-07 09:50:06 +02:00
Claire
3581e4be49
Merge branch 'main' into glitch-soc/merge-upstream
2023-07-06 15:16:34 +02:00
Claire
dab0be5aed
Merge pull request from GHSA-55j9-c3mp-6fcq
2023-07-06 15:06:49 +02:00
Claire
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
Claire
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
Claire
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
Eugen Rochko
3676bc46da
[Glitch] Fix regression of icon button colors in web UI
...
Port 12c6337c96
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-07-05 13:31:26 +02:00
Trevor Wolf
fa02ad3b8c
[Glitch] Change button colors to increase hover/focus contrast and consistency
...
Port 5f31104e1f
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-07-05 13:30:52 +02:00
Eugen Rochko
c66faebe43
[Glitch] Add button to see results for polls in web UI
...
Port 5b05451744
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-07-05 12:42:24 +02:00
Eugen Rochko
7747947353
[Glitch] Add canonical link tags in web UI
...
Port 90911f4396
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-07-05 12:41:52 +02:00
mogaminsk
0003a22bc1
[Glitch] Fix local live feeds does not expand
...
Port f3ca8aede9
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-07-05 12:39:46 +02:00
forsamori
136ed77764
[Glitch] Add at-symbol prepended to mention span title
...
Port 7731fbbba7
to glitch-soc
Co-authored-by: Sam BC <samuel.balbirnie-cumming@xdesign.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-07-05 12:38:54 +02:00
Eugen Rochko
5b328d07e6
[Glitch] Change labels of live feeds tabs in web UI
...
Port 80fee1403f
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-07-05 12:37:37 +02:00
Claire
784f2f35bc
Merge branch 'main' into glitch-soc/merge-upstream
2023-07-05 12:01:26 +02:00
Eugen Rochko
90911f4396
Add canonical link tags in web UI ( #25715 )
2023-07-05 11:25:27 +02:00
Eugen Rochko
5b05451744
Add button to see results for polls in web UI ( #25726 )
2023-07-05 10:32:04 +02:00
Claire
cac4f7fdd7
Fix OAuth apps page crashing when listing apps with certain admin API scopes ( #25713 )
2023-07-04 18:58:23 +02:00
Claire
1aa9197efd
Fix re-activated accounts being deleted by AccountDeletionWorker ( #25711 )
2023-07-04 18:36:24 +02:00
Trevor Wolf
b34a0ff011
fix read more button overlapping thread line bug ( #25706 )
2023-07-04 14:57:46 +02:00
mogaminsk
f3ca8aede9
Fix local live feeds does not expand ( #25694 )
2023-07-04 00:37:57 +02:00
forsamori
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
Eugen Rochko
80fee1403f
Change labels of live feeds tabs in web UI ( #25683 )
2023-07-03 22:57:18 +02:00
Daniel M Brasil
2b877ad937
Fix `/api/v2/search` not working with following query param ( #25681 )
2023-07-03 18:06:57 +02:00
Eugen Rochko
12c6337c96
Fix regression of icon button colors in web UI ( #25679 )
2023-07-03 16:51:04 +02:00
Plastikmensch
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
Trevor Wolf
5f31104e1f
Change button colors to increase hover/focus contrast and consistency ( #25677 )
2023-07-03 11:32:31 +02:00
Plastikmensch
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
Claire
c33c8bc048
Show local-only posts in “All” by default, and add back option to toggle it
2023-07-02 20:28:02 +02:00
Claire
4885232358
Add users index on unconfirmed_email ( #25672 )
2023-07-02 19:41:35 +02:00
Claire
fe1735f409
Fix inefficient query when requesting a new confirmation email from a logged-in account ( #25669 )
2023-07-02 16:08:58 +02:00
mogaminsk
db90f2b456
[Glitch] Prevent duplicate concurrent calls of `/api/*/instance` in web UI
...
Port ee22b32aef
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-07-02 12:00:03 +02:00
Eugen Rochko
f3140305f9
[Glitch] Change dropdown icon above compose form from ellipsis to bars in web UI
...
Port f504aded26
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-07-02 11:59:31 +02:00
Claire
95da88be87
[Glitch] Change local and federated timelines to be in a single firehose column
...
Port 6ca66c8cad
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-07-02 11:58:51 +02:00
Renaud Chaput
bb5fddd588
[Glitch] Use an Immutable Record as the root state
...
Port 2751a6d716
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-07-02 11:55:34 +02:00
Claire
f6ede7b089
[Glitch] Fix onboarding prompt being displayed because of disconnection gaps
...
Port 1408b62211
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-07-02 11:55:08 +02:00
Claire
34dd555a1c
[Glitch] Remove the search button from UI header when logged out
...
Port 7a47a52cd3
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-07-02 11:54:47 +02:00
Claire
0a6bc158bd
Merge branch 'main' into glitch-soc/merge-upstream
2023-07-02 11:49:08 +02:00
Eugen Rochko
edb6aab974
Revert "Rails 7 update" ( #25667 )
2023-07-02 11:14:22 +02:00
mogaminsk
ee22b32aef
Prevent duplicate concurrent calls of `/api/*/instance` in web UI ( #25663 )
2023-07-02 11:12:16 +02:00
Eugen Rochko
f504aded26
Change dropdown icon above compose form from ellipsis to bars in web UI ( #25661 )
2023-07-02 10:39:55 +02:00
Matt Jankowski
5cadbaa296
Rails 7 update ( #24241 )
2023-07-02 10:38:53 +02:00
Daniel M Brasil
2f17abc686
Fix HTTP 500 in `/api/v1/emails/check_confirmation` ( #25595 )
2023-07-02 00:05:44 +02:00
Claire
6ca66c8cad
Change local and federated timelines to be in a single firehose column ( #25641 )
2023-07-02 00:05:10 +02:00
Vivianne
6c6857f7ad
Fixing an issue with a missing argument ( #2261 )
...
undefined
2023-07-01 22:55:43 +02:00
Matt Jankowski
843448c7d9
Fix rails `rewhere` deprecation warning in directories api controller ( #25625 )
2023-07-01 21:48:16 +02:00
Renaud Chaput
2751a6d716
Use an Immutable Record as the root state ( #25584 )
2023-06-30 17:03:25 +02:00
Claire
1408b62211
Fix onboarding prompt being displayed because of disconnection gaps ( #25617 )
2023-06-30 16:32:12 +02:00
Claire
85dc0869a5
Fix ResolveURLService not resolving local URLs for remote content ( #25637 )
2023-06-29 14:48:54 +02:00
jsgoldstein
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
Claire
7a47a52cd3
Remove the search button from UI header when logged out ( #25631 )
2023-06-28 14:57:51 +02:00
Renaud Chaput
bbe08e28cd
[Glitch] Improve dismissable banner buttons when they dont fit on 1 line
...
Port ff9ed824db
to glitch-soc
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-06-27 13:25:21 +02:00
Eugen Rochko
5e3d6a3433
[Glitch] Fix onboarding prompt flashing while home feed is loading in web UI
...
Port 66c513511c
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-06-27 13:21:55 +02:00
Eugen Rochko
fa093eef89
[Glitch] Fix search not being easily findable on smaller screens in web UI
...
Port 1924660c5b
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-06-27 13:21:14 +02:00
Claire
ea57f8e3af
Merge branch 'main' into glitch-soc/merge-upstream
2023-06-27 13:15:41 +02:00
Claire
92fbaae7b6
Fix suspending an already-limited domain ( #25603 )
2023-06-27 12:32:51 +02:00
Claire
1569b36e28
Fix batch attachment deletion leaving empty directories ( #25587 )
2023-06-27 09:36:11 +02:00
S.H
2c6f88ad71
Remove media attachment only when file was exist ( #25586 )
2023-06-26 16:38:19 +02:00
Eugen Rochko
bcee25e36c
Change files to be deleted in batches instead of one-by-one ( #23302 )
2023-06-26 14:17:41 +02:00
Renaud Chaput
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
Claire
1164011bad
Fix compose form not being shown when clicking “Make your first post” on mobile ( #25581 )
2023-06-26 12:30:35 +02:00
Eugen Rochko
65b5808421
Change header backgrounds to use fewer different colors in web UI ( #25577 )
2023-06-26 05:27:07 +02:00
Eugen Rochko
66c513511c
Fix onboarding prompt flashing while home feed is loading in web UI ( #25579 )
2023-06-26 05:26:54 +02:00
Eugen Rochko
1924660c5b
Fix search not being easily findable on smaller screens in web UI ( #25576 )
2023-06-26 05:26:41 +02:00
Claire
a4e2d81804
[Glitch] Remove unique accounts condition from Home onboarding prompt
...
Port 7acdf21c77
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-06-25 17:40:01 +02:00
Eugen Rochko
5660204731
[Glitch] Add onboarding prompt when home feed too slow in web UI
...
Port ad92c48d71
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-06-25 17:40:01 +02:00
Claire
7cd1b2d753
[Glitch] Fix j/k keyboard shortcuts on some status lists
...
Port 9a27d4ec36
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-06-25 17:40:01 +02:00
mogaminsk
34310c3924
[Glitch] Fix custom signup URL may not loaded
...
Port e87a2c676c
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-06-25 14:27:46 +02:00
Ian
e7905c8b32
[Glitch] Change emoji picker icon
...
Port a56475866f
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-06-25 14:27:46 +02:00
たいち ひ
f0999de66f
[Glitch] Rewrite `<AutosuggestHashtag />` as FC and TS
...
Port 6c4a6bd115
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-06-25 14:27:46 +02:00
Claire
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
Claire
3d50947e62
Fix verified badge in account lists potentially including rel="me" links ( #25561 )
2023-06-24 17:24:31 +02:00
Eugen Rochko
1caf3a3933
Change labels and styles on the onboarding screen in web UI ( #25559 )
2023-06-23 16:34:27 +02:00
Claire
7acdf21c77
Remove unique accounts condition from Home onboarding prompt ( #25556 )
2023-06-23 14:44:54 +02:00
Eugen Rochko
ad92c48d71
Add onboarding prompt when home feed too slow in web UI ( #25267 )
2023-06-22 23:48:40 +02:00
Claire
3406cb0427
Add POST /api/v1/conversations/:id/unread ( #25509 )
2023-06-22 18:46:43 +02:00
Claire
9a27d4ec36
Fix j/k keyboard shortcuts on some status lists ( #25554 )
2023-06-22 17:54:43 +02:00
Claire
d0144d2be3
Change /api/v1/statuses/:id/history to always return at least one item ( #25510 )
2023-06-22 14:56:14 +02:00
Claire
c1c87fe7b9
Add finer permission requirements for managing webhooks ( #25463 )
2023-06-22 14:52:25 +02:00
mogaminsk
e87a2c676c
Fix custom signup URL may not loaded ( #25531 )
2023-06-22 12:10:49 +02:00
Ian
a56475866f
Change emoji picker icon ( #25479 )
2023-06-21 17:58:00 +02:00
Claire
5e5af7a0fe
Fix /api/v1/conversations sometimes returning empty accounts ( #25499 )
2023-06-20 18:32:26 +02:00
Claire
ba5c12974a
Fix missing validation on `default_privacy` setting ( #25513 )
2023-06-20 18:32:14 +02:00
Claire
923dde8e6c
Fix wrong view being displayed when a webhook fails validation ( #25464 )
2023-06-20 18:15:35 +02:00
Claire
4e861795a4
Add translate="no" to outgoing mentions and links ( #25524 )
2023-06-20 18:10:19 +02:00
Emelia Smith
71d3100038
Prevent UserCleanupScheduler from overwhelming streaming ( #25519 )
2023-06-20 18:04:35 +02:00
Claire
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
Matt Jankowski
d05a68a12e
Reduce `sleep` time in request pool spec ( #25470 )
2023-06-19 13:48:25 +02:00
Matt Jankowski
eb10ac2b3e
Remove unused `picture_hint` helper method ( #25485 )
2023-06-19 09:04:15 +02:00
Daniel M Brasil
498e3231b6
Fix incorrect pagination headers in `/api/v2/admin/accounts` ( #25477 )
2023-06-19 08:53:05 +02:00
Claire
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
Claire
85f74ed0a7
Fix cross-origin loading of locales ( #25498 )
2023-06-18 15:47:04 +02:00
Claire
d5a295f8c0
[Glitch] Fix non-interactive upload container being given a `button` role and tabIndex
...
Port 7c70237d7e
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-06-18 14:10:49 +02:00
Claire
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
Eugen Rochko
85041b74fb
[Glitch] Fix CAPTCHA page not following design pattern of sign-up flow
...
Port 239ee4f5d1
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-06-18 12:11:58 +02:00
たいち ひ
5a38d538a0
[Glitch] Rewrite `emoji_mart_data_light` as TS
...
Port 6e0c48cbe8
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-06-18 12:11:19 +02:00
alfe
7e24689b7d
[Glitch] Rewrite `<LoadingIndicator/>` as FC and TS ( #25364 )
...
Port 293cf44626
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-06-18 12:10:37 +02:00
Renaud Chaput
0e43f4d4fc
[Glitch] Add missing report category translation
...
Port b51a10a066
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-06-18 10:43:07 +02:00
alfe
8cbdffe2c7
[Glitch] Rewrite <LoadPending /> as FC and TS
...
Port 569ff79fb8
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-06-18 10:42:04 +02:00
Eugen Rochko
1ce44ec36e
[Glitch] Change "bot" label to "automated"
...
Port 272e099bce
to glitch-soc
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-06-18 10:40:56 +02:00
Claire
f101b67a45
Merge commit '239ee4f5d10aaa30b52cc59a58b2dc33fea5615f' into glitch-soc/merge-upstream
2023-06-18 10:36:14 +02:00
Claire
7c70237d7e
Fix non-interactive upload container being given a `button` role and tabIndex ( #25462 )
2023-06-16 12:03:06 +02:00
Daniel M Brasil
4a994e5b50
Fix `ArgumentError` in `/api/v1/admin/accounts/:id/action` ( #25386 )
2023-06-14 15:21:36 +02:00
Eugen Rochko
937764ce4b
Fix always redirecting to onboarding in web UI ( #25396 )
2023-06-14 09:05:03 +02:00
Claire
a424076226
Fix ArgumentError when loading newer Private Mentions ( #25399 )
2023-06-14 08:54:52 +02:00
Eugen Rochko
989a8758e3
Change edit profile page ( #25413 )
2023-06-14 04:38:07 +02:00
Eugen Rochko
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
alfe
293cf44626
Rewrite `<LoadingIndicator/>` as FC and TS ( #25364 )
2023-06-13 19:26:25 +02:00