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
Jeremy Kescher
93ae46fa14
Merge branch 'glitch-soc' into develop
2024-01-18 22:59:27 +01:00
Claire
07b6777c99
Fix styling issue in account fields ( #2578 )
2024-01-18 20:27:47 +01:00
Claire
d80d8f6bb9
Merge pull request #2577 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 127503eb2c
2024-01-18 20:27:31 +01:00
Jeremy Kescher
16be9e975b
Remove local account check in like and emoji_react inbound activity handling
2024-01-18 19:46:29 +01:00
Essem
7b63fd98c2
Revert variant selector normalization
...
Probably worth tackling later, but for now it's not worth worrying about; some other implementations (e.g. Misskey's) look to have the same behavior anyways.
2024-01-18 18:44:29 +01:00
Jeremy Kescher
d06ea73a04
Bump version
2024-01-17 22:41:16 +01:00
Essem
f0cba6f57d
Apply changes from emoji PR:
...
- Quick fixes
- Move reaction normalization to API controller
2024-01-17 22:40:51 +01:00
Jeremy Kescher
5d4cfe4cd8
Merge branch 'glitch-soc' into develop
2024-01-17 22:37:29 +01:00
Santiago Kozak
036e25f19d
[Glitch] Improve display of lock icon in account headers
...
Port 30b193b856
2024-01-17 18:37:04 +01:00
Claire
0207c4b055
[Glitch] Change media “ALT” label to a specific class
...
Port e817fe4c35
2024-01-17 18:36:09 +01:00
Claire
e8294925e6
[Glitch] Fix various icon alignment issues
...
Port baab58c80b
2024-01-17 18:34:57 +01:00
Claire
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
renovate[bot]
d56e9fb873
[Glitch] Update devDependencies (non-major)
...
Port 4e277f83dc
2024-01-17 18:12:00 +01:00
Claire
8485bedddc
Merge commit '4e277f83dc740b3a842c7fd8ed167c3c76fcabf8' into glitch-soc/merge-upstream
2024-01-17 18:09:15 +01:00
Matt Jankowski
127503eb2c
Fix Rails/RakeEnvironment cop ( #28782 )
2024-01-17 16:33:17 +00:00
Santiago Kozak
30b193b856
Improve display of lock icon in account headers ( #28780 )
2024-01-17 16:32:30 +00:00
Matt Jankowski
09f76c5c8d
Regenerate rubocop todo, removes last Layout/LineLength violation ( #28778 )
2024-01-17 15:42:13 +00:00
Claire
e817fe4c35
Change media “ALT” label to a specific class ( #28777 )
2024-01-17 15:32:56 +00:00
HTeuMeuLeu
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
Matt Jankowski
6fab50ba9e
Use bundler version 2.5.4 ( #28765 )
2024-01-17 14:35:55 +00:00
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
Matt Jankowski
9a475ea8b3
Finish up the CLI spec area pattern adoption for CLI::Accounts#refresh specs ( #28764 )
2024-01-17 13:38:37 +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
c523a9601b
Rename local webpack* var in development env CSP config ( #28766 )
2024-01-17 09:22:16 +00:00
Matt Jankowski
1b0cb3b54d
Announcement reactions query spec improvement and refactor ( #28768 )
2024-01-17 09:18:13 +00:00
renovate[bot]
afb5e6cf46
Update dependency rails to v7.1.3 ( #28772 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-01-17 09:11:22 +00:00
renovate[bot]
259874f2ac
Update dependency @rails/ujs to v7.1.3 ( #28771 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-01-17 09:11:18 +00:00
Matt Jankowski
0ce081fe49
Remove monkey patch in favor of supported Devise config value ( #28760 )
2024-01-17 09:08:17 +00:00
renovate[bot]
8cc322a0e1
Update dependency concurrent-ruby to v1.2.3 ( #28754 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-01-17 09:06:38 +00:00
renovate[bot]
bd538598c2
Update formatjs monorepo ( #28751 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-01-16 18:34:53 +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
renovate[bot]
e85e2929aa
Update eslint (non-major) ( #28729 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-01-16 17:53:32 +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
Claire
1fa9da1f39
Merge pull request #2573 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 01b6c83c36
2024-01-16 17:18:26 +01:00
Renaud Chaput
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
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
renovate[bot]
f09035cc3f
Update dependency stackprof to v0.2.26 ( #28743 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-01-16 08:32:40 +00:00
Claire
dee561604b
Merge commit 'b4c332104a8b3748f619de250f77c0acc8e80628' into glitch-soc/merge-upstream
2024-01-15 22:37:21 +01:00
Matt Jankowski
b4c332104a
Use top-level warn in JS errors check ( #28745 )
2024-01-15 21:26:11 +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
4fcb372776
Fix Ruby linting issue
2024-01-15 20:57:55 +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
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
