10a0d76bf0
Merge commit '6936e5aa693ccc4aabd26ef18a65fbb8132f6f74' into glitch-soc/merge-upstream-composer
...
Conflicts:
- `app/javascript/mastodon/features/compose/components/compose_form.jsx`:
Upstream completely redesigned this, and glitch-soc had different handling for
the character limit.
Ported upstream's change to the new version.
- `app/javascript/mastodon/features/compose/components/poll_form.jsx`:
Upstream completely redesigned this, and glitch-soc had different limits for
option length and number of options.
Ported glitch-soc's changes to the new version.
Additional change:
- `app/javascript/styles/components.scss`:
Change how the new image is looked up.
2024-02-22 20:58:41 +01:00
f25414014a
Fix link verifications when page size exceeds 1MB ( #29358 )
2024-02-22 20:45:40 +01:00
b0822ae9cd
Fix auto-close email being sent to users with devops permissions instead of settings permissions ( #29355 )
2024-02-22 20:45:40 +01:00
d23f445527
Automatically switch from open to approved registrations in absence of moderators ( #29318 )
2024-02-22 20:45:40 +01:00
fff378177e
Further reduce differences with upstream (mainly private mention styling) ( #2641 )
...
* Use upstream's CSS for private mentions styling
* Further reduce differences with upstream
2024-02-22 18:45:54 +01:00
5152dd869e
Fix link verifications when page size exceeds 1MB ( #29358 )
2024-02-22 17:31:50 +00:00
a9496882fc
Fix auto-close email being sent to users with devops permissions instead of settings permissions ( #29355 )
2024-02-22 14:52:14 +00:00
b71904816a
Change registrations to be disabled by default for new servers ( #29280 )
2024-02-22 13:28:19 +00:00
604c93332f
Fix pillbar button colors ( #2639 )
2024-02-21 19:30:54 +01:00
2751acb6cd
Automatically switch from open to approved registrations in absence of moderators ( #29318 )
2024-02-21 17:45:06 +00:00
154a3119fb
Further reduce CSS differences with upstream ( #2638 )
2024-02-21 17:50:41 +01:00
fd2b6c29c6
New Crowdin Translations (automated) ( #29311 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-02-21 11:24:44 +00:00
bf6e57b420
Further reduce CSS and markup differences with upstream ( #2637 )
...
* Reduce differences in `MovedNote` markup and styling
* Remove unused setting toggle meta text support
* Fix various CSS discrepancies with upstream
* Further reduce differences with upstream
2024-02-20 23:06:17 +01:00
5f50b634cf
Further reduce CSS and markup differences with upstream ( #2635 )
...
* Further reduce CSS differences with upstream
* Reduce differences in markup and CSS with upstream
* Redo collapsible post notifications
* Reduce CSS differences further
* Reduce differences with upstream regarding `.status` and `.status__wrapper`
* Further reduce differences with upstream
* Reduce differences with upstream in DisplayName
2024-02-20 18:49:59 +01:00
937dad1ee6
Extract ES query and filter hashes into private methods in `TagSearchService` ( #29288 )
2024-02-20 10:08:32 +00:00
9a2b9d1484
New Crowdin Translations (automated) ( #29298 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-02-20 09:23:40 +00:00
0ef44ee720
Move `AccountSuggestions::Source` subclasses default limit value to constant ( #29282 )
2024-02-20 09:21:49 +00:00
bde4df6be6
Remove CSS definitions for some unused classes ( #29279 )
2024-02-20 09:18:44 +00:00
785e2f9399
Add scope `providing_styles` to `UserRole` ( #29286 )
2024-02-20 09:18:05 +00:00
b8b2f20b16
Change explore icon from hashtag to compass in web UI ( #29294 )
2024-02-20 09:10:44 +00:00
0a2b95c4f5
Adopt upstream's design for preview cards ( #2634 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Christian Schmidt <github@chsc.dk>
2024-02-19 22:47:01 +01:00
89ea492d70
Further reduce CSS changes with upstream ( #2632 )
2024-02-19 19:54:51 +01:00
c645490d55
Fix `sensitive` flag not being removed when removing CW in new compose form ( #29248 )
2024-02-19 13:31:16 +00:00
ad16362efe
New Crowdin Translations (automated) ( #29255 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-02-19 13:25:45 +00:00
63f4ea055a
Change follow suggestions design in web UI ( #29272 )
2024-02-19 11:09:58 +00:00
245064bb98
Move "everyone" role and "instance actor" account magic number IDs to constants ( #29260 )
2024-02-19 11:09:43 +00:00
bbecf1c56b
Further reduce differences with upstream ( #2631 )
...
* Further reduce CSS diffs with upstream
* Remove superfluous “Sensitive content” label in media galleries and clean up dead code
2024-02-18 22:30:20 +01:00
034be5ad50
Further reduce CSS differences with upstream ( #2630 )
2024-02-18 20:45:36 +01:00
9a11b077f7
Reduce CSS and markup differences with upstream ( #2629 )
2024-02-18 19:12:23 +01:00
e078ede097
Remove status content from mobile actions modal ( #2615 )
2024-02-18 19:10:58 +01:00
8a10feb8dc
[Glitch] Fix Web UI not displaying appropriate explanation when a user hides their follows/followers
...
Port 9b06c0f24a
2024-02-17 20:15:25 +01:00
d86b642dc6
Fix dead and misapplied CSS ( #2627 )
2024-02-17 18:52:59 +01:00
41c85e3b6d
Change list title input design to fit upstream ( #2626 )
...
* Change settings input field design to match upstream's
* Fix light theme discrepancies
* Restore regexp inputs as glitch-soc-specific styles
2024-02-17 18:52:37 +01:00
50d9cd66d3
[Glitch] Use container queries to hide profile share button
...
Port c94bedf4e6
2024-02-16 18:18:17 +01:00
ce3978246b
[Glitch] Add prominent share/copy button on profiles in web UI
...
Port 87696ea26e
2024-02-16 18:17:55 +01:00
c0279385d7
Adopt upstream's design for account profiles ( #2622 )
...
* Mostly adopt upstream's design for account profiles
* Reduce some margins
2024-02-16 17:57:43 +01:00
cfadb87077
Update enum syntax to use the new Rails 7.0 style ( #29217 )
2024-02-16 14:54:23 +00:00
6c1b6194f7
Merge pull request from GHSA-jhrq-qvrm-qr36
...
* Fix insufficient Content-Type checking of fetched ActivityStreams objects
* Allow JSON-LD documents with multiple profiles
2024-02-16 12:17:15 +01:00
9fee5e8526
Merge pull request from GHSA-jhrq-qvrm-qr36
...
* Fix insufficient Content-Type checking of fetched ActivityStreams objects
* Allow JSON-LD documents with multiple profiles
2024-02-16 11:56:12 +01:00
1c93d625c6
New Crowdin Translations (automated) ( #29195 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-02-16 07:51:13 +00:00
e7ca82762d
Fix user creation failure handling in OAuth paths ( #29207 )
2024-02-14 23:12:59 +01:00
d4d0565b0f
Fix user creation failure handling in OAuth paths ( #29207 )
2024-02-14 21:49:45 +00:00
53b73ed6a2
Merge pull request from GHSA-vm39-j3vx-pch3
...
* Prevent different identities from a same SSO provider from accessing a same account
* Lock auth provider changes behind `ALLOW_UNSAFE_AUTH_PROVIDER_REATTACH=true`
* Rename methods to avoid confusion between OAuth and OmniAuth
2024-02-14 15:25:15 +01:00
436419cc2f
Merge pull request from GHSA-7w3c-p9j8-mq3x
...
* Ensure destruction of OAuth Applications notifies streaming
Due to doorkeeper using a dependent: delete_all relationship, the destroy of an OAuth Application bypassed the existing AccessTokenExtension callbacks for announcing destructing of access tokens.
* Ensure password resets revoke access to Streaming API
* Improve performance of deleting OAuth tokens
---------
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-02-14 15:25:15 +01:00
b31af34c97
Merge pull request from GHSA-vm39-j3vx-pch3
...
* Prevent different identities from a same SSO provider from accessing a same account
* Lock auth provider changes behind `ALLOW_UNSAFE_AUTH_PROVIDER_REATTACH=true`
* Rename methods to avoid confusion between OAuth and OmniAuth
2024-02-14 15:16:07 +01:00
68eaa804c9
Merge pull request from GHSA-7w3c-p9j8-mq3x
...
* Ensure destruction of OAuth Applications notifies streaming
Due to doorkeeper using a dependent: delete_all relationship, the destroy of an OAuth Application bypassed the existing AccessTokenExtension callbacks for announcing destructing of access tokens.
* Ensure password resets revoke access to Streaming API
* Improve performance of deleting OAuth tokens
---------
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-02-14 15:15:34 +01:00
b83076647e
Ignore legacy moderator and admin columns on User model ( #29188 )
2024-02-13 20:03:00 +01:00
e8b66a0525
Ignore legacy moderator and admin columns on User model ( #29188 )
2024-02-13 17:14:49 +00:00
476a043fc5
Fix modal container bounds ( #29185 )
2024-02-13 12:58:21 +00:00
e3c4e90646
Fix new list button being blank ( #2616 )
2024-02-13 12:48:01 +01:00
5de1ce23c3
New Crowdin Translations (automated) ( #29182 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-02-13 09:08:55 +00:00
6482948547
New Crowdin Translations (automated) ( #29156 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-02-12 09:59:05 +00:00
c249c10f74
Fix account suggestion size inconsistency with upstream
2024-02-11 21:55:36 +01:00
c07028b2fa
New Crowdin Translations (automated) ( #29152 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-02-09 09:55:30 +00:00
d391e01b59
Revert notification bar color for now
2024-02-08 21:12:57 +01:00
ca8fbda5d0
Add end-to-end test for OCR in media uploads ( #29148 )
2024-02-08 19:13:44 +00:00
3f89cec3c9
Further reduce differences with upstream
2024-02-08 19:52:03 +01:00
f6f62002c7
Remove leftovers from glitch-soc's layout option
2024-02-08 19:21:35 +01:00
189b70cd6a
Merge SCSS in a single `components.scss` file
2024-02-08 18:50:38 +01:00
67ec192d7d
Clean up some unused CSS definitions ( #29146 )
2024-02-08 11:40:22 +00:00
2a362d62a8
New Crowdin Translations (automated) ( #29145 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-02-08 09:43:02 +00:00
eff447a455
Rewrite signature verification using regexps and `StringScanner` ( #29133 )
2024-02-07 17:24:42 +00:00
7efc33b909
Move HTTP Signature parsing code to its own class ( #28932 )
2024-02-07 13:35:37 +00:00
17052714a2
New Crowdin Translations (automated) ( #29121 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-02-07 12:38:37 +00:00
eeabf9af72
Fix compatibility with Redis <6.2 ( #29123 )
2024-02-07 11:52:38 +00:00
65eb943b9d
Fix confirmation e-mails when signing up through an app ( #29064 )
2024-02-06 21:00:33 +01:00
a2611d782c
New Crowdin Translations (automated) ( #2588 )
...
* New Crowdin translations
* Fix bogus translation files
---------
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-02-06 20:45:07 +01:00
541cbdd963
Add env variable support for number of followable hashtags in feed column ( #2500 )
...
* Add env variable support for number of followable hashtags in feed column.
* Add a note about performance concerns for higher values.
See discussion in https://github.com/glitch-soc/mastodon/pull/2500
* Update .devcontainer/docker-compose.yml
---------
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-02-06 20:23:36 +01:00
08e511cecb
Fix doodle modal icons ( #2597 )
2024-02-06 20:22:42 +01:00
90ccf7beb2
New Crowdin Translations (automated) ( #28965 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-02-06 18:47:44 +00:00
7ee93b7431
Change `source` attribute of `Suggestion` entity in `/api/v2/suggestions` back to a string ( #29108 )
2024-02-06 17:10:17 +00:00
2f19ddd1fa
Move status serializer error handling to private method ( #29031 )
2024-02-06 14:54:26 +00:00
93a5b3f9df
Move status serializer chooser to private method ( #29030 )
2024-02-06 13:33:42 +00:00
69e61fff38
Move direct serializer usage out of admin view partial ( #29028 )
2024-02-06 13:18:37 +00:00
0877f6fda4
Remove redundant `return` in `IntentsController` ( #29099 )
2024-02-06 12:56:22 +00:00
4fb7f611de
Return domain block digests from admin domain blocks API ( #29092 )
2024-02-06 12:38:14 +00:00
4cf07ed78c
Add missing action logging to `api/v1/admin/reports#update` ( #29044 )
2024-02-06 11:34:11 +00:00
9ce914cc89
Fix report reason selector in moderation interface not unselecting rules when changing category ( #29026 )
2024-02-06 09:35:36 +00:00
66dda7c762
Fix already-invalid reports failing to resolve ( #29027 )
2024-02-06 09:35:27 +00:00
86500e3312
Extract scenic view model common methods to concern ( #28111 )
2024-02-06 09:08:07 +00:00
1666b19559
Fix confirmation e-mails when signing up through an app ( #29064 )
2024-02-02 15:51:26 +00:00
3c315a68af
Fix 'focus the compose textarea' shortcut is not working ( #29059 )
2024-02-02 06:33:53 +00:00
ff58ec0103
Merge pull request from GHSA-3fjr-858r-92rw
...
* Fix insufficient origin validation
* Bump version to 4.3.0-alpha.1
2024-02-01 15:57:08 +01:00
1726085db5
Merge pull request from GHSA-3fjr-858r-92rw
...
* Fix insufficient origin validation
* Bump version to 4.3.0-alpha.1
2024-02-01 15:56:46 +01:00
9cdc60ecc6
Change onboarding prompt to follow suggestions carousel in web UI ( #28878 )
2024-02-01 13:37:04 +00:00
8b87673f5e
Remove obsolete locale file ( #2596 )
2024-01-30 23:21:35 +01:00
3ede233146
Fix crash in private mention conversations in glitch-soc flavor ( #2595 )
2024-01-30 22:42:22 +01:00
fa0ba67753
Change materialized views to be refreshed concurrently to avoid locks ( #29015 )
2024-01-30 18:21:30 +00:00
c4af668e5c
Fix follow recommendations for less used languages ( #29017 )
2024-01-30 17:24:40 +00:00
b3075a9993
Remove unused l18n messages ( #28964 )
2024-01-30 15:34:07 +00:00
1467f1e1e1
Fixed the toggle emoji dropdown bug ( #29012 )
2024-01-30 13:38:49 +00:00
80308d384a
[Glitch] Refactor conversations components in web UI ( #2589 )
...
Port 3205a654ca
2024-01-28 14:53:08 +01:00
bf153b384b
Merge commit '42ab855b2339c5cea3229c856ab539f883736b12' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/auth/confirmations_controller.rb`:
Upstream refactored, changing lines textually close of glitch-soc-only lines
pertaining to the theming system.
Resolved the conflict.
- `app/controllers/auth/passwords_controller.rb`:
Upstream refactored, changing lines textually close of glitch-soc-only lines
pertaining to the theming system.
Resolved the conflict.
- `app/controllers/settings/two_factor_authentication/webauthn_credentials_controller.rb`:
Upstream refactored, changing lines textually close of glitch-soc-only lines
pertaining to the theming system.
Resolved the conflict.
2024-01-27 19:06:41 +01:00
dd7a66949a
Fix CSS loading in redirect controller
2024-01-26 21:04:02 +01:00
54ece5040d
[Glitch] Use active variants for boost icons and increase icon size
...
Port 5a838ceaa9
2024-01-26 20:53:53 +01:00
e5f50478b5
[Glitch] Add confirmation when redirecting logged-out requests to permalink
...
Port SCSS changes from b19ae521b7
2024-01-26 20:51:08 +01:00
5fa2821853
Merge commit '3205a654caf903002c2db872f802a3332201678b' into glitch-soc/merge-upstream
2024-01-26 20:47:20 +01:00
ae9c675930
New Crowdin Translations (automated) ( #2564 )
...
* New Crowdin translations
* Fix bogus translation files
---------
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-01-26 19:45:04 +01:00
805dba7f8d
Change compose form to use server-provided post character limit ( #28928 )
2024-01-26 14:09:45 +00:00
45287049ab
New Crowdin Translations (automated) ( #28923 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-01-26 09:15:55 +00:00
70de52c297
Merge commit '7a1f087659204e9d0cbba2de37e45b1921cefe20' into glitch-soc/merge-upstream
2024-01-25 19:51:19 +01:00
6936e5aa69
Change design of compose form in web UI ( #28119 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-01-25 15:41:31 +00:00
42ab855b23
Add specs for `Instance` model scopes and add `with_domain_follows` scope ( #28767 )
2024-01-25 15:28:27 +00:00
17ea22671d
Fix `Style/GuardClause` cop in app/controllers ( #28420 )
2024-01-25 15:13:41 +00:00
3205a654ca
Refactor conversations components in web UI ( #28833 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-01-25 14:34:26 +00:00
59d2ea0d82
New Crowdin Translations (automated) ( #28899 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-01-25 13:00:44 +00:00
6b6586f5d0
Add `CustomFilterKeyword#to_regex` method ( #28893 )
2024-01-25 13:00:34 +00:00
7c9c6c7f80
Fix remaining `Rails/WhereExists` cop violations, regenerate todo ( #28892 )
2024-01-25 12:37:07 +00:00
c50274a0ac
Fix redirect confirmation for accounts ( #28902 )
2024-01-25 10:44:25 +00:00
9a8293f58d
Fix process of receiving posts with bearcaps is not working ( #26527 )
2024-01-25 10:37:09 +00:00
22e419f95e
[Glitch] Fix search form re-rendering spuriously in web UI
...
Port 01ce9df880
2024-01-24 20:53:15 +01:00
22cfab0ebf
Merge commit '01ce9df88008cee705b7e02a4581802afa07c3df' into glitch-soc/merge-upstream
...
Conflicts:
- `tsconfig.json`:
Upstream made style fixes, while glitch-soc had extra options.
Ported upstream's style fixes.
2024-01-24 20:42:53 +01:00
38f7f8b909
Tidy up association declaration in `Instance` model ( #28880 )
2024-01-24 17:30:28 +00:00
5a838ceaa9
Use active variants for boost icons and increase icon size ( #27924 )
2024-01-24 12:37:43 +00:00
1290fede65
Fix `Rails/WhereExists` cop in app/lib ( #28862 )
2024-01-24 11:51:09 +00:00
b19ae521b7
Add confirmation when redirecting logged-out requests to permalink ( #27792 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-01-24 10:49:19 +00:00
7a1f087659
Add `created_before` and `updated_before` scopes to `MediaAttachment` ( #28869 )
2024-01-24 10:32:54 +00:00
9d413cbaf8
Fix `Rails/WhereExists` cop in app/models ( #28863 )
2024-01-24 09:57:49 +00:00
599bc69503
Simplify `AccountSummary.filtered` query generation ( #28868 )
2024-01-24 09:57:32 +00:00
5b1eb09d54
Add annual reports for accounts ( #28693 )
2024-01-24 09:38:10 +00:00
01ce9df880
Fix search form re-rendering spuriously in web UI ( #28876 )
2024-01-24 07:03:30 +00:00
c0e8e457ab
Eager loading fixes for `api/` controllers ( #28848 )
2024-01-23 11:41:54 +00:00
ceade78182
Fix `Rails/WhereExists` cop in app/services ( #28853 )
2024-01-23 11:41:34 +00:00
78ee1453f9
New Crowdin Translations (automated) ( #28857 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-01-23 10:11:37 +00:00
b0207d7757
Add coverage for `Tag.recently_used` scope ( #28850 )
2024-01-23 09:10:11 +00:00
67f54c4e75
Fix `Rails/WhereExists` cop in app/validators ( #28854 )
2024-01-23 09:06:53 +00:00
72bae7e170
[Glitch] Fix duplicate and missing keys in search popout component in web UI
...
Port 9f8e3cca9a
2024-01-22 19:21:02 +01:00
102eff7c05
Merge commit 'e2d9635074ad33cc8144adc434bcd90faae9c424' into glitch-soc/merge-upstream
2024-01-22 19:19:40 +01:00
1d381c1664
[Glitch] Update dependency react-redux to v9.1.0
...
Port 163db814c2
2024-01-22 19:15:02 +01:00
0700eb58bc
Merge commit '163db814c2b3cf544b78e427e7f7bbd99b94a025' into glitch-soc/merge-upstream
2024-01-22 19:12:05 +01:00
e2d9635074
Add notification email on invalid second authenticator ( #28822 )
2024-01-22 13:55:43 +00:00
18004bf227
Add `Account.matches_uri_prefix` scope and use in activitypub/followers_synchronizations controller ( #28820 )
2024-01-22 13:55:37 +00:00
7ecf7f5403
Move controller->request specs for api/v1/statuses/* ( #28818 )
2024-01-22 11:58:54 +00:00
76e383ea1e
New Crowdin Translations (automated) ( #28827 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-01-22 11:52:26 +00:00
9f8e3cca9a
Fix duplicate and missing keys in search popout component in web UI ( #28834 )
2024-01-21 07:44:46 +00:00
cf2a2ed71c
Fix processing of compacted single-item JSON-LD collections ( #28816 )
2024-01-19 12:43:10 +00:00
3593ee2e36
Add rate-limit of TOTP authentication attempts at controller level ( #28801 )
2024-01-19 12:19:49 +00:00
5fc4ae7c5f
Move privacy policy into markdown file ( #28699 )
2024-01-19 11:22:23 +00:00
9cd17020bc
New Crowdin Translations (automated) ( #28798 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-01-19 09:41:57 +00:00
163db814c2
Update dependency react-redux to v9.1.0 ( #28717 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2024-01-19 09:41:03 +00:00
4ec7d7d989
Fix `Rails/WhereExists` cop in REST::TagSerializer model ( #28790 )
2024-01-19 09:35:58 +00:00
329911b0a3
Migrate controller->request spec for api/v1/follow* ( #28811 )
2024-01-19 09:32:41 +00:00
86cc88c216
Fix banner image not showing in follow emails ( #28814 )
2024-01-19 09:23:59 +00:00
fd64817fbe
Fix `Rails/WhereExists` cop in app/lib/status_cache_hydrator ( #28808 )
2024-01-19 09:19:48 +00:00
de09176ab9
Retry 401 errors on replies fetching ( #28788 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-01-19 09:18:21 +00:00
1480573c83
Add `Account.auditable` scope, fix N+1 in admin/action_logs#index ( #28812 )
2024-01-19 01:39:30 +00:00
528a8fa495
Merge commit 'f866413e724c2e7f8329fbc6e96f56f0b186c62a' into glitch-soc/merge-upstream
2024-01-18 22:16:16 +01:00
07b6777c99
Fix styling issue in account fields ( #2578 )
2024-01-18 20:27:47 +01:00
f866413e72
Extract shared tagged statuses method in `FeaturedTag` ( #28805 )
2024-01-18 16:14:15 +00:00
d0b3bc23d7
Remove unused `matches_domain` scopes on Account, DomainAllow, DomainBlock ( #28803 )
2024-01-18 16:11:04 +00:00
0b853678a4
Add coverage for `api/v1/peers/search` endpoint and extract controller query to Instance scope ( #28796 )
2024-01-18 15:57:10 +00:00
9fb9ef418a
Fix `Rails/WhereExists` cop in User model ( #28792 )
2024-01-18 13:55:44 +00:00
aaa6f2e930
Group common `class_name` options in associations ( #28779 )
2024-01-18 12:29:41 +00:00
da31792ac7
Fix `Rails/WhereExists` cop in FeaturedTag model ( #28791 )
2024-01-18 12:22:12 +00:00
89c9a4502d
Fix `Rails/WhereExists` cop in account/interactions concern ( #28789 )
2024-01-18 09:36:16 +00:00
036e25f19d
[Glitch] Improve display of lock icon in account headers
...
Port 30b193b856
2024-01-17 18:37:04 +01:00
0207c4b055
[Glitch] Change media “ALT” label to a specific class
...
Port e817fe4c35
2024-01-17 18:36:09 +01:00
e8294925e6
[Glitch] Fix various icon alignment issues
...
Port baab58c80b
2024-01-17 18:34:57 +01:00
c59fb65ddc
Merge commit '127503eb2cdd67126974bee304dde0f183300b84' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/accounts_helper.rb`:
Conflict due to glitch-soc's option to hide followers count.
Ported upstream changes.
Additional changes:
- `app/views/application/mailer/_account.html.haml`:
Ported glitch-soc's option to hide followers count.
- `app/views/settings/flavours/show.html.haml`:
Ported the `frontend_asset_url` helper change to glitch-soc.
2024-01-17 18:32:15 +01:00
d56e9fb873
[Glitch] Update devDependencies (non-major)
...
Port 4e277f83dc
2024-01-17 18:12:00 +01:00
8485bedddc
Merge commit '4e277f83dc740b3a842c7fd8ed167c3c76fcabf8' into glitch-soc/merge-upstream
2024-01-17 18:09:15 +01:00
30b193b856
Improve display of lock icon in account headers ( #28780 )
2024-01-17 16:32:30 +00:00
e817fe4c35
Change media “ALT” label to a specific class ( #28777 )
2024-01-17 15:32:56 +00:00
1a3859d8e2
Update follow and follow_request emails ( #28755 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-01-17 14:37:04 +00:00
1ab42ad12b
New Crowdin Translations (automated) ( #28749 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-01-17 14:23:14 +00:00
cb5ac15923
Use a helper to avoid using `media/` asset prefixes ( #28756 )
2024-01-17 12:19:51 +00:00
baab58c80b
Fix various icon alignment issues ( #28775 )
2024-01-17 10:42:47 +00:00
1b0cb3b54d
Announcement reactions query spec improvement and refactor ( #28768 )
2024-01-17 09:18:13 +00:00
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
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
5b67389bba
[Glitch] Add a new `@/` alias for the root frontend directory and use it where possible
...
Port 01b6c83c36
2024-01-16 12:21:13 +01:00
e4d07c7bcc
Merge commit '01b6c83c369061c2175d50dfb3ae1db502862664' into glitch-soc/merge-upstream
2024-01-16 12:04:11 +01:00
01b6c83c36
Add a new `@/` alias for the root frontend directory and use it where possible ( #28753 )
2024-01-16 10:27:26 +00:00
f0abba67db
Ignore RecordNotUnique errors in LinkCrawlWorker ( #28748 )
2024-01-16 08:35:54 +00:00
01df34b9db
Remove bypass and use use glitch-soc's theming system for inert.css
2024-01-15 22:16:26 +01:00
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
6e4d5b4736
Fix some icon-related styling issues
2024-01-15 21:05:54 +01:00
278597c161
Merge commit '98b5f85f10a3af50a54fcd79e09fc9fd88f774fa' into glitch-soc/merge-upstream
2024-01-15 20:53:16 +01:00
a1920425ca
[Glitch] Switch from 48px weight 600 material symbol icons to 24px weight 400 icons
...
Port 6bbcd9348e
2024-01-15 20:53:08 +01:00
2f521bc84a
Merge commit 'a2f02a07758c32f0dcc6388b4f30ca5a84e762f3' into glitch-soc/merge-upstream
2024-01-15 20:27:41 +01:00
8cad0a4d6b
[Glitch] Change icon SVG imports to use a default import
...
Port 608f66f978
2024-01-15 20:20:38 +01:00
464051c2d2
Merge commit '1070804a1a6121170f7bba923789d73b978e6fe7' into glitch-soc/merge-upstream
2024-01-15 20:06:31 +01:00
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
1323dfac80
Merge commit 'a90696011e563e62100cba56e2d52f6babbaff00' into glitch-soc/merge-upstream
2024-01-15 19:19:04 +01:00
7f471e70c0
Update new email templates ( #28416 )
...
Co-authored-by: Matt Jankowski <matt@jankowski.online>
2024-01-15 18:18:59 +00:00
98b5f85f10
Rename and refactor `User#confirm!` to `User#mark_email_as_confirmed!` ( #28735 )
2024-01-15 18:04:58 +00:00
e621c1c44c
Fix registrations not checking MX records for email domain blocks requiring approval ( #28608 )
2024-01-15 17:10:57 +00:00
a2f02a0775
Disable `Rails/SkipsModelValidations` cop ( #28712 )
2024-01-15 13:46:47 +00:00
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
50188ad211
[Glitch] Use helpers to check environment in frontend ( #2571 )
...
Port 277e6968f5
2024-01-15 12:16:05 +01:00
8cb4825c8b
Fix sign-up restrictions based on email addresses not being enforced ( #28732 )
2024-01-15 11:06:48 +00:00
1012ffac9e
New Crowdin Translations (automated) ( #28721 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-01-15 11:06:25 +00:00
e72676e83a
Improve `api/v1/markers#create` performance against simultaneous requests ( #28718 )
2024-01-15 09:47:25 +00:00
f8941c41a5
[Glitch] Converted hashtag.jsx to TypeScript
...
Port 3a7f10c3f1
2024-01-14 19:22:39 +01:00
695dcc6ca8
[Glitch] Converted app/javascript/flavours/glitch/utils/ folder to TypeScript
...
Port 1142f4c79e
2024-01-14 19:22:39 +01:00
52c023a305
Convert `Permalink` to Typescript
2024-01-14 19:22:39 +01:00
16499bc097
Rewrite `Permalink` as functional component
2024-01-14 19:22:39 +01:00
0213ae6b37
Extract glitch-soc-only i18n string
2024-01-14 16:32:08 +01:00
6772bf611e
[Glitch] Fix wrong color on active icons with counters in web UI
...
Port 728eb6a153
2024-01-14 16:32:08 +01:00
cc363629be
[Glitch] Fix focus and hover styles in web UI
...
Port cfd50f30bb
2024-01-14 16:32:08 +01:00
7565a328d0
[Glitch] change column link to add a better keyboard focus indicator
...
Port 6308dca76a
2024-01-14 16:32:08 +01:00
c1e28c8913
[Glitch] change focus ui for keyboard only input
...
Port 59478a1b46
2024-01-14 16:32:08 +01:00
a7bad8f45c
[Glitch] Fix profile setup showing default avatar in web UI
...
Port 01f0a6ca4f
2024-01-14 16:32:08 +01:00
b534532eaf
[Glitch] Change to single opt-in during profile setup in onboarding in web UI
...
Port 0e9801443f
2024-01-14 16:32:08 +01:00
bacb9134cc
[Glitch] Add profile setup to onboarding in web UI
...
Port d67bd44ca1
2024-01-14 16:32:08 +01:00
2653651bfa
[Glitch] Simplify column headers
...
Port 13d310e64d
2024-01-14 14:31:49 +01:00
ca17c2d35a
[Glitch] Use a context to propagate column-related Props, and remove `forceUpdate` usage
...
Port 537442853f
2024-01-14 14:31:49 +01:00
e2c7c370dc
Fix size of glitch-soc status info icons
2024-01-14 00:09:28 +01:00
e2ba5f6e35
Fix glitch-soc high color privacy icons
2024-01-14 00:04:09 +01:00
e227e959f7
Fix glitch-soc textarea icons
2024-01-13 23:53:23 +01:00
6333900006
Fix glitch-soc CW media icons
2024-01-13 23:48:37 +01:00
46128f25b6
Fix glitch-soc status media icons
2024-01-13 23:35:53 +01:00
731f01adb1
[Glitch] Fix reply icon display in picture-in-picture footer
...
Port 1cba91d6d1
2024-01-13 23:19:01 +01:00
dd56900fac
[Glitch] Fixes dropdown target without a `buttonRef` (edit history)
...
Port 7b1d390734
2024-01-13 23:19:01 +01:00
a8c59c2506
[Glitch] Add icons for private and disabled boost in web UI
...
Port 7e3c10dec6
2024-01-13 23:19:01 +01:00
b2a6386b7d
[Glitch] Adjust transform origin for favorite star
...
Port e4e752c26e
2024-01-13 23:19:01 +01:00
6230d50f3f
[Glitch] Fix various icon styles in web UI
...
Port fa7e64df1d
2024-01-13 23:19:01 +01:00
b67d977e20
[Glitch] Add missing ban icons
...
Port a4e6fe36cb
2024-01-13 23:19:01 +01:00
9b32a37b6f
[Glitch] Fix missing icon props
...
Port f08ca3f042
2024-01-13 23:19:01 +01:00
d54414866c
[Glitch] Change icons in web UI
...
Port 134de736dc
2024-01-13 23:19:01 +01:00
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
eae3275fff
[Glitch] Change design of role badges in web UI
...
Port 2cbdff97ce
2024-01-13 13:09:04 +01:00
a40ce78f11
[Glitch] Add role badges to the WebUI
...
Port 1e4ccc655a
2024-01-13 12:50:27 +01:00
a25e03dbc3
Revert "Add role badges to WebUI ( #2096 )"
...
This reverts commit d9a078e6d3
2024-01-13 12:43:25 +01:00
d6609635cb
[Glitch] Add a version comment to the emoji preval-ed file so it is regenerated
...
Port 383be173af
2024-01-13 12:39:09 +01:00
ca31b4de3a
[Glitch] Add new emojis from `jdecked/twemoji` 15.0
...
Port b6e353537b
2024-01-13 12:39:09 +01:00
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
6bbcd9348e
Switch from 48px weight 600 material symbol icons to 24px weight 400 icons ( #28064 )
2024-01-12 20:16:48 +00:00
1070804a1a
Fix `RedownloadMediaWorker` not being called on transient S3 failure ( #28714 )
2024-01-12 17:00:17 +00:00
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
a90c134850
Move followable by logic to suggestion class ( #28710 )
2024-01-12 13:09:33 +00:00
608f66f978
Change icon SVG imports to use a default import ( #28709 )
2024-01-12 10:31:24 +00:00
c6684aa1e3
Use the assets pipeline to load `inert.css` ( #28701 )
2024-01-12 09:32:45 +00:00
a90696011e
Add coverage/bugfix for invalid appeal submission ( #28703 )
2024-01-12 09:21:00 +00:00
7801db7ba4
Spec coverage for custom css endpoint ( #28706 )
2024-01-12 09:19:25 +00:00
b86083f0dc
New Crowdin Translations (automated) ( #28708 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-01-12 09:17:10 +00:00
575ab085be
Disable `Rails/ApplicationController` for `HealthController` ( #28705 )
2024-01-12 09:08:17 +00:00
383be173af
Add a version comment to the emoji preval-ed file so it is regenerated ( #28700 )
2024-01-12 03:39:11 +00:00
15bc13c65b
Merge commit '2954279e9c630a9d146575bf600978dc6c5279bd' into glitch-soc/merge-upstream
2024-01-11 20:15:19 +01:00
b6e353537b
Add new emojis from `jdecked/twemoji` 15.0 ( #28404 )
2024-01-11 16:15:08 +00:00
b68f185573
Reduce `LineLength` for `react_component` helper in views/admin ( #28694 )
2024-01-11 13:14:24 +00:00
23d8bd8ce1
Merge commit '0a7cff53c2577b3e79599e069eeb344f2613ad8d' into glitch-soc/merge-upstream
2024-01-11 13:24:20 +01:00
5dcb8d92c3
Fix lint issue in glitch-soc-only setting form
2024-01-11 13:22:39 +01:00
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
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
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
87097a227c
Clean up `settings/featured_tags/index` view ( #28688 )
2024-01-11 10:45:26 +00:00
55802242ce
Refactor login activity partial (remove inline ruby) ( #28687 )
2024-01-11 10:36:27 +00:00
204bbf49d2
New Crowdin Translations (automated) ( #28692 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-01-11 10:08:49 +00:00
6daa69327b
Fix `LineLength` haml-lint in `t` usage ( #28686 )
2024-01-11 09:32:32 +00:00
47d213e701
Merge commit '5dc634796aba951f6a085e1ed0e1b807e25d7d41' into glitch-soc/merge-upstream
2024-01-10 18:41:04 +01:00
09376a8207
[Glitch] Upgrade Redux packages
...
Port a0e237a96f
2024-01-10 18:34:23 +01:00
51d2d98174
Merge commit 'a0e237a96fca2774d3c9ed43063a45e395bb7f40' into glitch-soc/merge-upstream
2024-01-10 18:26:47 +01:00
7cd88ae2f4
[Glitch] Fix scrolling to detailed status not always working
...
Port d0fd14f851
2024-01-10 18:02:37 +01:00
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
d7e13e2483
Fix potential redirection loop of streaming endpoint ( #28665 )
2024-01-10 15:05:46 +00:00
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
a71e918e95
Fix `LineLength` haml-lint in `media/player` view ( #28667 )
2024-01-10 09:35:01 +00:00
eed4eef39a
Fix `LineLength` haml-lint in `app/views/auth` area ( #28664 )
2024-01-09 16:03:16 +00:00
09ab073f0c
Fix `LineLength` haml-lint in `app/views/settings` area ( #28663 )
2024-01-09 15:28:56 +00:00
10203bd57a
Clean up `Setting` model and remove dead code ( #28661 )
2024-01-09 14:01:53 +00:00
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
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
68f06f1fd4
Fix haml-lint `LineLength` cop for `settings/preferences/notifications/show` ( #28655 )
2024-01-09 09:31:32 +00:00
8e7d5fe2ac
New Crowdin Translations (automated) ( #28658 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-01-09 09:30:33 +00:00
cd4b4d4734
Replace unused `by_recent_sign_in` scope ( #28616 )
2024-01-08 15:31:13 +00:00
e677eb164c
Remove unused `Announcement#time_range?` ( #28648 )
2024-01-08 15:26:30 +00:00
3e43cd095c
Remove unused scope `Announcement.without_muted` ( #28645 )
2024-01-08 15:26:14 +00:00
9322396e58
Use normalizes to prepare `Account#username` value ( #28646 )
2024-01-08 13:48:31 +00:00
cd58e37b25
Remove unused `DomainBlock#affected_accounts_count` method ( #28642 )
2024-01-08 13:38:52 +00:00
3e7a9266ea
Remove unused `EmojiFormatter#count_tag_nesting` method ( #28643 )
2024-01-08 13:36:47 +00:00
4ccba94489
Remove unused `*_silenced_accounts` scopes on Status ( #28644 )
2024-01-08 13:35:53 +00:00
c52a593a30
Remove unused scope `User.emailable` ( #28647 )
2024-01-08 13:33:45 +00:00
e827c4692c
Use Arel `matches` method in CustomEmoji search ( #28615 )
2024-01-08 13:26:12 +00:00
cc67943df2
New Crowdin Translations (automated) ( #28627 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-01-08 12:46:25 +00:00
1bc5a52139
Extract SQL heredoc method for Announcement scopes ( #28613 )
2024-01-08 11:22:16 +00:00
aa6d07dbd9
Use normalizes to prepare CustomEmoji `domain` value ( #28624 )
2024-01-08 11:20:59 +00:00
202951e6d9
Use Arel `in_order_of` method to generate CASE for `DomainBlock.by_severity` ( #28617 )
2024-01-08 11:15:36 +00:00
57f49c8191
Use Arel `nulls_first` method in ordering CustomEmojiFilter scope ( #28614 )
2024-01-08 11:09:50 +00:00
a0e237a96f
Upgrade Redux packages ( #28585 )
2024-01-08 10:57:40 +00:00
5a6d533c53
Enable Rails 7.1 Marshalling format ( #28609 )
2024-01-05 21:57:47 +00:00
12bed81187
Add validation specs to `CustomFilter` model ( #28600 )
2024-01-05 15:13:59 +00:00
43d800ada6
New Crowdin Translations (automated) ( #28604 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-01-05 11:29:19 +00:00
6ad0fb5a77
Fix NULL MX handling and tighten DNS resolving specs ( #28607 )
2024-01-05 11:07:57 +00:00
5f4643b895
Add `PAPERCLIP_ROOT_URL` to Content-Security-Policy when used ( #28561 )
2024-01-05 10:45:36 +00:00
d0fd14f851
Fix scrolling to detailed status not always working ( #28577 )
2024-01-04 14:17:38 +00:00
419c659bc4
Add fallback redirection when getting a webfinger query `WEB_DOMAIN@WEB_DOMAIN` ( #28592 )
2024-01-04 14:14:46 +00:00
bdf4750633
New Crowdin Translations (automated) ( #28590 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-01-04 09:24:13 +00:00
dfdadb92e8
Add ability to require approval when users sign up using specific email domains ( #28468 )
2024-01-04 09:07:05 +00:00
0b5783f3f1
Merge commit 'f92d8c654df654538096efff05e9b1a989d01490' into glitch-soc/merge-upstream
2024-01-03 20:52:19 +01:00
195b89d336
Fix .opus file uploads being misidentified by Paperclip ( #28580 )
2024-01-03 19:02:53 +00:00
e12d8893f4
Fix intermittent failure from unspecified order in `export_domain_blocks` controller spec ( #28562 )
2024-01-03 13:06:15 +00:00
9d9008666b
Merge commit '092bb8a27af9ee87ff9ebabaf354477470ea3a94' into glitch-soc/merge-upstream
2024-01-03 12:38:49 +01:00
092bb8a27a
Fix Mastodon not correctly processing HTTP Signatures with query strings ( #28476 )
2024-01-03 11:29:26 +00:00
7cce2a41f2
New Crowdin Translations (automated) ( #28573 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-01-03 09:19:46 +00:00
48c9192b47
[Glitch] Fix loading local accounts with extraneous domain part in WebUI
...
Port 65ea097f1d
2024-01-02 18:16:57 +01:00
f685c953e5
Merge commit '3944b12b5eec8c6ae4666ec922411b32b3442dd6' into glitch-soc/merge-upstream
2024-01-02 18:12:28 +01:00
65ea097f1d
Fix loading local accounts with extraneous domain part in WebUI ( #28559 )
2024-01-02 15:02:25 +00:00
0cd497ba7d
[Glitch] Fix OCR when using S3/CDN for assets
...
Port fdec8d7ffb
2024-01-02 13:37:04 +01:00
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