Commit graph

12820 commits

Author SHA1 Message Date
github-actions[bot]
1ab42ad12b
New Crowdin Translations (automated) (#28749)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-01-17 14:23:14 +00:00
Renaud Chaput
cb5ac15923
Use a helper to avoid using media/ asset prefixes (#28756) 2024-01-17 12:19:51 +00:00
Claire
baab58c80b
Fix various icon alignment issues (#28775) 2024-01-17 10:42:47 +00:00
Matt Jankowski
1b0cb3b54d
Announcement reactions query spec improvement and refactor (#28768) 2024-01-17 09:18:13 +00:00
renovate[bot]
4e277f83dc
Update devDependencies (non-major) (#28728)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2024-01-16 18:34:22 +00:00
Jeong Arm
411efdc2d3
Fix getting started misc column on dev env (#2575)
* Fix getting started misc column on dev

---------

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-01-16 17:40:03 +01:00
Renaud Chaput
5b67389bba [Glitch] Add a new @/ alias for the root frontend directory and use it where possible
Port 01b6c83c36 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-16 12:21:13 +01:00
Claire
e4d07c7bcc Merge commit '01b6c83c369061c2175d50dfb3ae1db502862664' into glitch-soc/merge-upstream 2024-01-16 12:04:11 +01:00
Renaud Chaput
01b6c83c36
Add a new @/ alias for the root frontend directory and use it where possible (#28753) 2024-01-16 10:27:26 +00:00
Jeong Arm
f0abba67db
Ignore RecordNotUnique errors in LinkCrawlWorker (#28748) 2024-01-16 08:35:54 +00:00
Claire
01df34b9db Remove bypass and use use glitch-soc's theming system for inert.css 2024-01-15 22:16:26 +01:00
Claire
34c9f77b3e Merge commit '7f471e70c0e1cc106747634d20f173a68a9272d7' into glitch-soc/merge-upstream
Conflicts:
- `app/views/layouts/mailer.html.haml`:
  Conflict caused by glitch-soc's theming system.
  Used glitch-soc's path for the mailer pack.
2024-01-15 21:30:00 +01:00
Claire
6e4d5b4736 Fix some icon-related styling issues 2024-01-15 21:05:54 +01:00
Claire
278597c161 Merge commit '98b5f85f10a3af50a54fcd79e09fc9fd88f774fa' into glitch-soc/merge-upstream 2024-01-15 20:53:16 +01:00
Claire
a1920425ca [Glitch] Switch from 48px weight 600 material symbol icons to 24px weight 400 icons
Port 6bbcd9348e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-15 20:53:08 +01:00
Claire
2f521bc84a Merge commit 'a2f02a07758c32f0dcc6388b4f30ca5a84e762f3' into glitch-soc/merge-upstream 2024-01-15 20:27:41 +01:00
Renaud Chaput
8cad0a4d6b [Glitch] Change icon SVG imports to use a default import
Port 608f66f978 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-15 20:20:38 +01:00
Claire
464051c2d2 Merge commit '1070804a1a6121170f7bba923789d73b978e6fe7' into glitch-soc/merge-upstream 2024-01-15 20:06:31 +01:00
Claire
60298af3c4 Merge commit 'c6684aa1e392f2dd86af4362b4259809549abaad' into glitch-soc/merge-upstream
Conflicts:
- `app/views/layouts/application.html.haml`:
  Upstream changed how the `inert.css` file is included.
  The conflict is caused by glitch-soc's theming system.
  Ported the upstream change.

Additional changes:
- `config/webpack/shared.js`: bypass glitch-soc's theming
  system for `inert` pack.
2024-01-15 20:01:36 +01:00
Claire
1323dfac80 Merge commit 'a90696011e563e62100cba56e2d52f6babbaff00' into glitch-soc/merge-upstream 2024-01-15 19:19:04 +01:00
HTeuMeuLeu
7f471e70c0
Update new email templates (#28416)
Co-authored-by: Matt Jankowski <matt@jankowski.online>
2024-01-15 18:18:59 +00:00
Claire
98b5f85f10
Rename and refactor User#confirm! to User#mark_email_as_confirmed! (#28735) 2024-01-15 18:04:58 +00:00
Claire
e621c1c44c
Fix registrations not checking MX records for email domain blocks requiring approval (#28608) 2024-01-15 17:10:57 +00:00
Matt Jankowski
a2f02a0775
Disable Rails/SkipsModelValidations cop (#28712) 2024-01-15 13:46:47 +00:00
Claire
82d28ac956
Merge pull request #2567 from ClearlyClaire/glitch-soc/ports/convert-utils-hashtags-typescript
Convert utils and hashtags to Typescript
2024-01-15 12:41:22 +01:00
Claire
50188ad211
[Glitch] Use helpers to check environment in frontend (#2571)
Port 277e6968f5 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2024-01-15 12:16:05 +01:00
Claire
8cb4825c8b
Fix sign-up restrictions based on email addresses not being enforced (#28732) 2024-01-15 11:06:48 +00:00
github-actions[bot]
1012ffac9e
New Crowdin Translations (automated) (#28721)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-01-15 11:06:25 +00:00
Matt Jankowski
e72676e83a
Improve api/v1/markers#create performance against simultaneous requests (#28718) 2024-01-15 09:47:25 +00:00
Jeremy Kescher
a9b0515086
Emoji picker dropdown condition change from permissions to signedIn 2024-01-14 19:48:46 +01:00
Jeremy Kescher
777be10810
Merge branch 'glitch-soc' into develop 2024-01-14 19:46:03 +01:00
Josh Goldberg ✨
f8941c41a5 [Glitch] Converted hashtag.jsx to TypeScript
Port 3a7f10c3f1 to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-14 19:22:39 +01:00
Josh Goldberg ✨
695dcc6ca8 [Glitch] Converted app/javascript/flavours/glitch/utils/ folder to TypeScript
Port 1142f4c79e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-14 19:22:39 +01:00
Claire
52c023a305 Convert Permalink to Typescript 2024-01-14 19:22:39 +01:00
Claire
16499bc097 Rewrite Permalink as functional component 2024-01-14 19:22:39 +01:00
Jeremy Kescher
ad4e692669
Set heart_plus as reaction button icon 2024-01-14 19:03:01 +01:00
Jeremy Kescher
3c8b9a7784
Set heart_plus as reaction button icon 2024-01-14 18:16:26 +01:00
Jeremy Kescher
2047683539
v4.3.0-alpha.0+glitch+cat+1.0.8 2024-01-14 17:48:42 +01:00
Claire
0213ae6b37 Extract glitch-soc-only i18n string 2024-01-14 16:32:08 +01:00
Eugen Rochko
6772bf611e [Glitch] Fix wrong color on active icons with counters in web UI
Port 728eb6a153 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-14 16:32:08 +01:00
Eugen Rochko
cc363629be [Glitch] Fix focus and hover styles in web UI
Port cfd50f30bb to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-14 16:32:08 +01:00
Trevor Wolf
7565a328d0 [Glitch] change column link to add a better keyboard focus indicator
Port 6308dca76a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-14 16:32:08 +01:00
Trevor Wolf
c1e28c8913 [Glitch] change focus ui for keyboard only input
Port 59478a1b46 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-14 16:32:08 +01:00
Eugen Rochko
a7bad8f45c [Glitch] Fix profile setup showing default avatar in web UI
Port 01f0a6ca4f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-14 16:32:08 +01:00
Eugen Rochko
b534532eaf [Glitch] Change to single opt-in during profile setup in onboarding in web UI
Port 0e9801443f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-14 16:32:08 +01:00
Eugen Rochko
bacb9134cc [Glitch] Add profile setup to onboarding in web UI
Port d67bd44ca1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-14 16:32:08 +01:00
Renaud Chaput
2653651bfa [Glitch] Simplify column headers
Port 13d310e64d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-14 14:31:49 +01:00
Renaud Chaput
ca17c2d35a [Glitch] Use a context to propagate column-related Props, and remove forceUpdate usage
Port 537442853f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-14 14:31:49 +01:00
Essem
089cccfcc0
Apply recent emoji reactions PR changes to Catstodon:
- Normalize emojis with variant selectors
- Make name of like content parser function more general
2024-01-14 03:57:44 +01:00
Claire
e2c7c370dc Fix size of glitch-soc status info icons 2024-01-14 00:09:28 +01:00
Claire
e2ba5f6e35 Fix glitch-soc high color privacy icons 2024-01-14 00:04:09 +01:00
Claire
e227e959f7 Fix glitch-soc textarea icons 2024-01-13 23:53:23 +01:00
Claire
6333900006 Fix glitch-soc CW media icons 2024-01-13 23:48:37 +01:00
Claire
46128f25b6 Fix glitch-soc status media icons 2024-01-13 23:35:53 +01:00
Santiago Kozak
731f01adb1 [Glitch] Fix reply icon display in picture-in-picture footer
Port 1cba91d6d1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-13 23:19:01 +01:00
Renaud Chaput
dd56900fac [Glitch] Fixes dropdown target without a buttonRef (edit history)
Port 7b1d390734 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-13 23:19:01 +01:00
Eugen Rochko
a8c59c2506 [Glitch] Add icons for private and disabled boost in web UI
Port 7e3c10dec6 to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-13 23:19:01 +01:00
zunda
b2a6386b7d [Glitch] Adjust transform origin for favorite star
Port e4e752c26e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-13 23:19:01 +01:00
Eugen Rochko
6230d50f3f [Glitch] Fix various icon styles in web UI
Port fa7e64df1d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-13 23:19:01 +01:00
Renaud Chaput
b67d977e20 [Glitch] Add missing ban icons
Port a4e6fe36cb to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-13 23:19:01 +01:00
Renaud Chaput
9b32a37b6f [Glitch] Fix missing icon props
Port f08ca3f042 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-13 23:19:01 +01:00
Eugen Rochko
d54414866c [Glitch] Change icons in web UI
Port 134de736dc to glitch-soc

Co-authored-by: Renaud Chaput <renchap@gmail.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-13 23:19:01 +01:00
Jeremy Kescher
3df2bc2caf
v4.3.0-alpha.0+glitch+cat+1.0.6 2024-01-13 17:46:55 +01:00
Claire
5f8618443c
Merge pull request #2566 from ClearlyClaire/glitch-soc/ports/badge-design
Port upstream's role badge design
2024-01-13 14:25:55 +01:00
Eugen Rochko
eae3275fff [Glitch] Change design of role badges in web UI
Port 2cbdff97ce to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-13 13:09:04 +01:00
Claire
a40ce78f11 [Glitch] Add role badges to the WebUI
Port 1e4ccc655a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-13 12:50:27 +01:00
Claire
a25e03dbc3 Revert "Add role badges to WebUI (#2096)"
This reverts commit d9a078e6d3.
2024-01-13 12:43:25 +01:00
Renaud Chaput
d6609635cb [Glitch] Add a version comment to the emoji preval-ed file so it is regenerated
Port 383be173af to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-13 12:39:09 +01:00
Essem
ca31b4de3a [Glitch] Add new emojis from jdecked/twemoji 15.0
Port b6e353537b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-13 12:39:09 +01:00
Claire
a3b6a85521 Merge commit 'cd37048439f9b324f48e6af1f426a7894c54b4da' into glitch-soc/merge-upstream
Conflicts:
- `.prettierignore`:
  Conflict due to glitch-soc-only files.
  Kept those at the end of the file.
2024-01-13 12:11:29 +01:00
Jeremy Kescher
c677b8de19
v4.3.0-alpha.0+glitch+cat+1.0.5 2024-01-12 22:03:50 +01:00
Claire
6bbcd9348e
Switch from 48px weight 600 material symbol icons to 24px weight 400 icons (#28064) 2024-01-12 20:16:48 +00:00
Claire
1070804a1a
Fix RedownloadMediaWorker not being called on transient S3 failure (#28714) 2024-01-12 17:00:17 +00:00
MitarashiDango
2c05b8a60d
Fix Undo Announce activity is not sent, when not followed by the reblogged post author (#18482)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-01-12 15:58:28 +00:00
Matt Jankowski
a90c134850
Move followable by logic to suggestion class (#28710) 2024-01-12 13:09:33 +00:00
Renaud Chaput
608f66f978
Change icon SVG imports to use a default import (#28709) 2024-01-12 10:31:24 +00:00
Renaud Chaput
c6684aa1e3
Use the assets pipeline to load inert.css (#28701) 2024-01-12 09:32:45 +00:00
Matt Jankowski
a90696011e
Add coverage/bugfix for invalid appeal submission (#28703) 2024-01-12 09:21:00 +00:00
Matt Jankowski
7801db7ba4
Spec coverage for custom css endpoint (#28706) 2024-01-12 09:19:25 +00:00
github-actions[bot]
b86083f0dc
New Crowdin Translations (automated) (#28708)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-01-12 09:17:10 +00:00
Matt Jankowski
575ab085be
Disable Rails/ApplicationController for HealthController (#28705) 2024-01-12 09:08:17 +00:00
Renaud Chaput
383be173af
Add a version comment to the emoji preval-ed file so it is regenerated (#28700) 2024-01-12 03:39:11 +00:00
Claire
15bc13c65b Merge commit '2954279e9c630a9d146575bf600978dc6c5279bd' into glitch-soc/merge-upstream 2024-01-11 20:15:19 +01:00
Essem
b6e353537b
Add new emojis from jdecked/twemoji 15.0 (#28404) 2024-01-11 16:15:08 +00:00
Matt Jankowski
b68f185573
Reduce LineLength for react_component helper in views/admin (#28694) 2024-01-11 13:14:24 +00:00
Claire
23d8bd8ce1 Merge commit '0a7cff53c2577b3e79599e069eeb344f2613ad8d' into glitch-soc/merge-upstream 2024-01-11 13:24:20 +01:00
Claire
5dcb8d92c3 Fix lint issue in glitch-soc-only setting form 2024-01-11 13:22:39 +01:00
Claire
63acdebc5d Merge commit '36b46ea3b5b4a4fb51cf1cd103b5a3c1103c300e' into glitch-soc/merge-upstream
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
  Conflict because of a code style fix, while some changed lines are
  absent from glitch-soc.
  Ignored the deleted lines.
2024-01-11 13:17:13 +01:00
Claire
630b245bb4 Merge commit '9a73a7dcaf2e383b2ec105d71bfcea2c48cbea10' into glitch-soc/merge-upstream
Conflicts:
- `app/lib/settings/scoped_settings.rb`:
  Removed upstream, while glitch-soc had a change related to its theming system.
  Removed as well, as it's unused.
2024-01-11 12:59:27 +01:00
github-actions[bot]
e5b97eadd5
New Crowdin Translations (automated) (#2502)
* New Crowdin translations

* Update no.yml

* Update simple_form.no.yml

---------

Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-01-11 12:56:56 +01:00
Matt Jankowski
87097a227c
Clean up settings/featured_tags/index view (#28688) 2024-01-11 10:45:26 +00:00
Matt Jankowski
55802242ce
Refactor login activity partial (remove inline ruby) (#28687) 2024-01-11 10:36:27 +00:00
github-actions[bot]
204bbf49d2
New Crowdin Translations (automated) (#28692)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-01-11 10:08:49 +00:00
Matt Jankowski
6daa69327b
Fix LineLength haml-lint in t usage (#28686) 2024-01-11 09:32:32 +00:00
Claire
47d213e701 Merge commit '5dc634796aba951f6a085e1ed0e1b807e25d7d41' into glitch-soc/merge-upstream 2024-01-10 18:41:04 +01:00
Renaud Chaput
09376a8207 [Glitch] Upgrade Redux packages
Port a0e237a96f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-10 18:34:23 +01:00
Claire
51d2d98174 Merge commit 'a0e237a96fca2774d3c9ed43063a45e395bb7f40' into glitch-soc/merge-upstream 2024-01-10 18:26:47 +01:00
Claire
7cd88ae2f4 [Glitch] Fix scrolling to detailed status not always working
Port d0fd14f851 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-10 18:02:37 +01:00
Claire
0b2c7cdb02 Merge commit 'fe2667bb0d3487a32b9da5250402a90482a85fe2' into glitch-soc/merge-upstream
Conflicts:
- `app/lib/content_security_policy.rb`:
  Conflict caused by glitch-soc's support for the extra `EXTRA_DATA_HOSTS`
  environment variable.
  Ported upstream's changes while keeping support for `EXTRA_DATA_HOSTS`.
2024-01-10 17:51:12 +01:00
Claire
d7e13e2483
Fix potential redirection loop of streaming endpoint (#28665) 2024-01-10 15:05:46 +00:00
Matt Jankowski
543d7890fd
Use normalizes to prepare User values (#28650)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-01-10 13:36:06 +00:00
Matt Jankowski
a71e918e95
Fix LineLength haml-lint in media/player view (#28667) 2024-01-10 09:35:01 +00:00
Matt Jankowski
eed4eef39a
Fix LineLength haml-lint in app/views/auth area (#28664) 2024-01-09 16:03:16 +00:00
Matt Jankowski
09ab073f0c
Fix LineLength haml-lint in app/views/settings area (#28663) 2024-01-09 15:28:56 +00:00
Claire
10203bd57a
Clean up Setting model and remove dead code (#28661) 2024-01-09 14:01:53 +00:00
Jean Boussier
1781849884
Inline what remains of the rails-settings-cached gem (#28618)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-01-09 11:50:21 +00:00
gunchleoc
173953c23e
Fix ISO code for Canadian French (#26015)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-01-09 10:56:13 +00:00
Matt Jankowski
68f06f1fd4
Fix haml-lint LineLength cop for settings/preferences/notifications/show (#28655) 2024-01-09 09:31:32 +00:00
github-actions[bot]
8e7d5fe2ac
New Crowdin Translations (automated) (#28658)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-01-09 09:30:33 +00:00
Matt Jankowski
cd4b4d4734
Replace unused by_recent_sign_in scope (#28616) 2024-01-08 15:31:13 +00:00
Matt Jankowski
e677eb164c
Remove unused Announcement#time_range? (#28648) 2024-01-08 15:26:30 +00:00
Matt Jankowski
3e43cd095c
Remove unused scope Announcement.without_muted (#28645) 2024-01-08 15:26:14 +00:00
Matt Jankowski
9322396e58
Use normalizes to prepare Account#username value (#28646) 2024-01-08 13:48:31 +00:00
Matt Jankowski
cd58e37b25
Remove unused DomainBlock#affected_accounts_count method (#28642) 2024-01-08 13:38:52 +00:00
Matt Jankowski
3e7a9266ea
Remove unused EmojiFormatter#count_tag_nesting method (#28643) 2024-01-08 13:36:47 +00:00
Matt Jankowski
4ccba94489
Remove unused *_silenced_accounts scopes on Status (#28644) 2024-01-08 13:35:53 +00:00
Matt Jankowski
c52a593a30
Remove unused scope User.emailable (#28647) 2024-01-08 13:33:45 +00:00
Matt Jankowski
e827c4692c
Use Arel matches method in CustomEmoji search (#28615) 2024-01-08 13:26:12 +00:00
github-actions[bot]
cc67943df2
New Crowdin Translations (automated) (#28627)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-01-08 12:46:25 +00:00
Matt Jankowski
1bc5a52139
Extract SQL heredoc method for Announcement scopes (#28613) 2024-01-08 11:22:16 +00:00
Matt Jankowski
aa6d07dbd9
Use normalizes to prepare CustomEmoji domain value (#28624) 2024-01-08 11:20:59 +00:00
Matt Jankowski
202951e6d9
Use Arel in_order_of method to generate CASE for DomainBlock.by_severity (#28617) 2024-01-08 11:15:36 +00:00
Matt Jankowski
57f49c8191
Use Arel nulls_first method in ordering CustomEmojiFilter scope (#28614) 2024-01-08 11:09:50 +00:00
Renaud Chaput
a0e237a96f
Upgrade Redux packages (#28585) 2024-01-08 10:57:40 +00:00
Jean Boussier
5a6d533c53
Enable Rails 7.1 Marshalling format (#28609) 2024-01-05 21:57:47 +00:00
Matt Jankowski
12bed81187
Add validation specs to CustomFilter model (#28600) 2024-01-05 15:13:59 +00:00
github-actions[bot]
43d800ada6
New Crowdin Translations (automated) (#28604)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-01-05 11:29:19 +00:00
Claire
6ad0fb5a77
Fix NULL MX handling and tighten DNS resolving specs (#28607) 2024-01-05 11:07:57 +00:00
Claire
5f4643b895
Add PAPERCLIP_ROOT_URL to Content-Security-Policy when used (#28561) 2024-01-05 10:45:36 +00:00
Jeremy Kescher
3b9a52aab6
Merge branch 'glitch-soc' into develop 2024-01-04 17:57:02 +01:00
Jeremy Kescher
abb21a1eab
Merge branch 'glitch-soc' into develop 2024-01-04 17:30:03 +01:00
Claire
d0fd14f851
Fix scrolling to detailed status not always working (#28577) 2024-01-04 14:17:38 +00:00
Claire
419c659bc4
Add fallback redirection when getting a webfinger query WEB_DOMAIN@WEB_DOMAIN (#28592) 2024-01-04 14:14:46 +00:00
github-actions[bot]
bdf4750633
New Crowdin Translations (automated) (#28590)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-01-04 09:24:13 +00:00
Claire
dfdadb92e8
Add ability to require approval when users sign up using specific email domains (#28468) 2024-01-04 09:07:05 +00:00
Claire
0b5783f3f1 Merge commit 'f92d8c654df654538096efff05e9b1a989d01490' into glitch-soc/merge-upstream 2024-01-03 20:52:19 +01:00
Michael Stanclift
195b89d336
Fix .opus file uploads being misidentified by Paperclip (#28580) 2024-01-03 19:02:53 +00:00
Jeremy Kescher
42520e72c5
Remove duplicate "Number of visible reactions" setting 2024-01-03 17:55:12 +01:00
Matt Jankowski
e12d8893f4
Fix intermittent failure from unspecified order in export_domain_blocks controller spec (#28562) 2024-01-03 13:06:15 +00:00
Claire
9d9008666b Merge commit '092bb8a27af9ee87ff9ebabaf354477470ea3a94' into glitch-soc/merge-upstream 2024-01-03 12:38:49 +01:00
Claire
092bb8a27a
Fix Mastodon not correctly processing HTTP Signatures with query strings (#28476) 2024-01-03 11:29:26 +00:00
github-actions[bot]
7cce2a41f2
New Crowdin Translations (automated) (#28573)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-01-03 09:19:46 +00:00
Claire
48c9192b47 [Glitch] Fix loading local accounts with extraneous domain part in WebUI
Port 65ea097f1d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-02 18:16:57 +01:00
Claire
f685c953e5 Merge commit '3944b12b5eec8c6ae4666ec922411b32b3442dd6' into glitch-soc/merge-upstream 2024-01-02 18:12:28 +01:00
Claire
b3d871d3a4
Add PAPERCLIP_ROOT_URL to Content-Security-Policy when used
(backports https://github.com/mastodon/mastodon/pull/28561)
2024-01-02 17:38:32 +01:00
Claire
65ea097f1d
Fix loading local accounts with extraneous domain part in WebUI (#28559) 2024-01-02 15:02:25 +00:00
Jeremy Kescher
b18cd3f4bd
fix: check for limited_federation_mode instead of removed whitelist_mode 2024-01-02 13:55:07 +01:00
Michael Stanclift
0cd497ba7d [Glitch] Fix OCR when using S3/CDN for assets
Port fdec8d7ffb to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-02 13:37:04 +01:00
Claire
b3542ac57b Merge commit '1184887b012e863fbf44f65ef5c65e0049123c27' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
  Upstream updated its README, we have a completely different one.
  Kept our README.
2024-01-02 13:35:11 +01:00
Claire
1184887b01
Fix streaming API redirection ignoring the port of streaming_api_base_url (#28558) 2024-01-02 12:27:51 +00:00