7fae07d5d7
local_setings: change defaults for alt text
2024-04-16 23:48:28 +00:00
df00e5e6cb
merge with catstodon/main
2024-04-16 22:39:49 +00:00
60d54db810
merge with catstodon/main
2024-02-17 05:18:13 +00:00
e995f70ed3
Fix certain jsx files being in an old state in relation to the emoji reactions PR
2024-02-16 15:12:22 +01:00
55aef6a70c
Fix scss styles being in an old state
2024-02-16 15:03:21 +01:00
ce878a78bb
Merge branch 'glitch-soc' into develop
2024-02-16 14:48:08 +01:00
Claire
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
Claire
e7ca82762d
Fix user creation failure handling in OAuth paths ( #29207 )
2024-02-14 23:12:59 +01:00
1c9291adcd
Merge branch 'glitch-soc' into develop
...
# Conflicts:
# app/javascript/flavours/glitch/styles/components/accounts.scss
# app/javascript/flavours/glitch/styles/components/status.scss
2024-02-14 18:02:38 +01:00
Claire
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
Emelia Smith
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
Emelia Smith
b83076647e
Ignore legacy moderator and admin columns on User model ( #29188 )
2024-02-13 20:03:00 +01:00
Claire
e3c4e90646
Fix new list button being blank ( #2616 )
2024-02-13 12:48:01 +01:00
Claire
c249c10f74
Fix account suggestion size inconsistency with upstream
2024-02-11 21:55:36 +01:00
Essem
4cbaf46950
Hydrate reactions on streaming API
2024-02-11 17:25:53 +01:00
Essem
d61b323c84
Purge status reactions on account delete
2024-02-09 17:57:22 +01:00
Claire
d391e01b59
Revert notification bar color for now
2024-02-08 21:12:57 +01:00
Claire
3f89cec3c9
Further reduce differences with upstream
2024-02-08 19:52:03 +01:00
Claire
f6f62002c7
Remove leftovers from glitch-soc's layout option
2024-02-08 19:21:35 +01:00
Claire
189b70cd6a
Merge SCSS in a single components.scss file
2024-02-08 18:50:38 +01:00
e4a333c6ae
Adjust initial_state_serializer to state of updated emoji reactions PR
2024-02-07 16:46:08 +01:00
40ef7b3849
Merge branch 'glitch-soc' into develop
...
# Conflicts:
# app/javascript/flavours/glitch/initial_state.js
# app/serializers/initial_state_serializer.rb
2024-02-06 22:58:23 +01:00
Eugen Rochko
65eb943b9d
Fix confirmation e-mails when signing up through an app ( #29064 )
2024-02-06 21:00:33 +01:00
github-actions[bot]
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
JS Moore
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
Essem
08e511cecb
Fix doodle modal icons ( #2597 )
2024-02-06 20:22:42 +01:00
1caf07f427
merge with catstodon/main
2024-02-02 00:14:06 +00:00
c7e37c256e
Merge branch 'glitch-soc' into develop
2024-02-01 18:18:19 +01:00
Claire
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
Claire
8b87673f5e
Remove obsolete locale file ( #2596 )
2024-01-30 23:21:35 +01:00
Claire
3ede233146
Fix crash in private mention conversations in glitch-soc flavor ( #2595 )
2024-01-30 22:42:22 +01:00
bf4d613731
Merge branch 'glitch-soc' into develop
2024-01-28 17:56:47 +01:00
Claire
80308d384a
[Glitch] Refactor conversations components in web UI ( #2589 )
...
Port 3205a654ca
2024-01-28 14:53:08 +01:00
c2c2afc294
Merge branch 'glitch-soc' into develop
2024-01-28 02:29:46 +01:00
Essem
ae854b8027
Port three new emoji reaction PR commits to Catstodon:
...
"Update reaction emails
Reaction icon made by @t3rminus@calamity.world"
"Simplify reactions API controller"
"Refactor status reactions query
This was done to announcement reactions in 1b0cb3b54d
2024-01-28 02:22:43 +01:00
Claire
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
Claire
dd7a66949a
Fix CSS loading in redirect controller
2024-01-26 21:04:02 +01:00
Claire
54ece5040d
[Glitch] Use active variants for boost icons and increase icon size
...
Port 5a838ceaa9
2024-01-26 20:53:53 +01:00
Eugen Rochko
e5f50478b5
[Glitch] Add confirmation when redirecting logged-out requests to permalink
...
Port SCSS changes from b19ae521b7
2024-01-26 20:51:08 +01:00
Claire
5fa2821853
Merge commit '3205a654caf903002c2db872f802a3332201678b' into glitch-soc/merge-upstream
2024-01-26 20:47:20 +01:00
github-actions[bot]
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
Claire
70de52c297
Merge commit '7a1f087659204e9d0cbba2de37e45b1921cefe20' into glitch-soc/merge-upstream
2024-01-25 19:51:19 +01:00
Matt Jankowski
42ab855b23
Add specs for Instance model scopes and add with_domain_follows scope ( #28767 )
2024-01-25 15:28:27 +00:00
Matt Jankowski
17ea22671d
Fix Style/GuardClause cop in app/controllers ( #28420 )
2024-01-25 15:13:41 +00:00
Eugen Rochko
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
github-actions[bot]
59d2ea0d82
New Crowdin Translations (automated) ( #28899 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-01-25 13:00:44 +00:00
Matt Jankowski
6b6586f5d0
Add CustomFilterKeyword#to_regex method ( #28893 )
2024-01-25 13:00:34 +00:00
Matt Jankowski
7c9c6c7f80
Fix remaining Rails/WhereExists cop violations, regenerate todo ( #28892 )
2024-01-25 12:37:07 +00:00
Claire
c50274a0ac
Fix redirect confirmation for accounts ( #28902 )
2024-01-25 10:44:25 +00:00
KMY（雪あすか）
9a8293f58d
Fix process of receiving posts with bearcaps is not working ( #26527 )
2024-01-25 10:37:09 +00:00
