Noa Himesaka
006ea5ea5e
Merge branch 'pr2462'
2024-01-19 18:40:53 +09:00
Noa Himesaka
ee2178203b
Merge branch 'main' of https://github.com/glitch-soc/mastodon
2024-01-19 18:10:15 +09:00
Essem
0223ea14fc
Update reaction emails
...
Reaction icon made by @t3rminus@calamity.world
2024-01-18 21:39:10 -06:00
Claire
07b6777c99
Fix styling issue in account fields ( #2578 )
2024-01-18 20:27:47 +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
Santiago Kozak
30b193b856
Improve display of lock icon in account headers ( #28780 )
2024-01-17 16:32:30 +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
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
Claire
baab58c80b
Fix various icon alignment issues ( #28775 )
2024-01-17 10:42:47 +00:00
Essem
3361f8851e
Quick fixes
2024-01-16 20:47:01 -06:00
Essem
b787dc9046
Add reaction notification column settings
...
This was in a previous PR. Not quite sure how it didn't carry over.
2024-01-16 20:47:01 -06:00
Essem
3da6e4d57f
More cleanup
2024-01-16 20:47:01 -06:00
Essem
3ee5e3352c
Linting fixes
2024-01-16 20:47:01 -06:00
Essem
cd36daecfe
Add notification emails for reactions
2024-01-16 20:47:00 -06:00
Essem
f578317f53
Add support for emoji reactions
...
Squashed, modified, and rebased from glitch-soc/mastodon#2221 .
Co-authored-by: fef <owo@fef.moe>
Co-authored-by: Jeremy Kescher <jeremy@kescher.at>
Co-authored-by: neatchee <neatchee@gmail.com>
Co-authored-by: Ivan Rodriguez <104603218+IRod22@users.noreply.github.com>
Co-authored-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2024-01-16 20:46:59 -06: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
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
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
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
Renaud Chaput
8cad0a4d6b
[Glitch] Change icon SVG imports to use a default import
...
Port 608f66f978
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
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
2024-01-15 12:16:05 +01: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
Josh Goldberg ✨
f8941c41a5
[Glitch] Converted hashtag.jsx to TypeScript
...
Port 3a7f10c3f1
2024-01-14 19:22:39 +01:00
Josh Goldberg ✨
695dcc6ca8
[Glitch] Converted app/javascript/flavours/glitch/utils/ folder to TypeScript
...
Port 1142f4c79e
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
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
2024-01-14 16:32:08 +01:00
Eugen Rochko
cc363629be
[Glitch] Fix focus and hover styles in web UI
...
Port cfd50f30bb
2024-01-14 16:32:08 +01:00
Trevor Wolf
7565a328d0
[Glitch] change column link to add a better keyboard focus indicator
...
Port 6308dca76a
2024-01-14 16:32:08 +01:00
Trevor Wolf
c1e28c8913
[Glitch] change focus ui for keyboard only input
...
Port 59478a1b46
2024-01-14 16:32:08 +01:00
Eugen Rochko
a7bad8f45c
[Glitch] Fix profile setup showing default avatar in web UI
...
Port 01f0a6ca4f
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
2024-01-14 16:32:08 +01:00
