Claire
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
Claire
5a838ceaa9
Use active variants for boost icons and increase icon size ( #27924 )
2024-01-24 12:37:43 +00:00
Eugen Rochko
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
Eugen Rochko
01ce9df880
Fix search form re-rendering spuriously in web UI ( #28876 )
2024-01-24 07:03:30 +00:00
github-actions[bot]
78ee1453f9
New Crowdin Translations (automated) ( #28857 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-01-23 10:11:37 +00:00
Eugen Rochko
72bae7e170
[Glitch] Fix duplicate and missing keys in search popout component in web UI
...
Port 9f8e3cca9a
2024-01-22 19:21:02 +01:00
Claire
102eff7c05
Merge commit 'e2d9635074ad33cc8144adc434bcd90faae9c424' into glitch-soc/merge-upstream
2024-01-22 19:19:40 +01:00
renovate[bot]
1d381c1664
[Glitch] Update dependency react-redux to v9.1.0
...
Port 163db814c2
2024-01-22 19:15:02 +01:00
Claire
0700eb58bc
Merge commit '163db814c2b3cf544b78e427e7f7bbd99b94a025' into glitch-soc/merge-upstream
2024-01-22 19:12:05 +01:00
github-actions[bot]
76e383ea1e
New Crowdin Translations (automated) ( #28827 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-01-22 11:52:26 +00:00
Eugen Rochko
9f8e3cca9a
Fix duplicate and missing keys in search popout component in web UI ( #28834 )
2024-01-21 07:44:46 +00:00
github-actions[bot]
9cd17020bc
New Crowdin Translations (automated) ( #28798 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-01-19 09:41:57 +00:00
renovate[bot]
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
HTeuMeuLeu
86cc88c216
Fix banner image not showing in follow emails ( #28814 )
2024-01-19 09:23:59 +00:00
Essem
b6ec4af6f3
Update reaction emails
...
Reaction icon made by @t3rminus@calamity.world
2024-01-18 21:38:39 -06:00
Essem
adfa7877c3
Merge remote-tracking branch 'upstream/main'
2024-01-18 18:15:06 -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
d96fd9f28f
Merge remote-tracking branch 'upstream/main'
2024-01-16 13:04:33 -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
Essem
dd7d7cb80a
Fix embed GIF icons
2024-01-14 17:22:38 -06:00
Essem
16839a6398
Update to mastomodern 1.9.1
2024-01-14 16:40:51 -06:00
Essem
ac71680dcb
Merge remote-tracking branch 'upstream/main'
2024-01-14 15:41:16 -06: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
Eugen Rochko
bacb9134cc
[Glitch] Add profile setup to onboarding in web UI
...
Port d67bd44ca1
2024-01-14 16:32:08 +01:00
Renaud Chaput
2653651bfa
[Glitch] Simplify column headers
...
Port 13d310e64d
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
2024-01-14 14:31:49 +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
Essem
d84bafcdc0
Merge remote-tracking branch 'upstream/main'
2024-01-13 16:28:34 -06:00
Santiago Kozak
731f01adb1
[Glitch] Fix reply icon display in picture-in-picture footer
...
Port 1cba91d6d1
2024-01-13 23:19:01 +01:00
Renaud Chaput
dd56900fac
[Glitch] Fixes dropdown target without a buttonRef (edit history)
...
Port 7b1d390734
2024-01-13 23:19:01 +01:00
Eugen Rochko
a8c59c2506
[Glitch] Add icons for private and disabled boost in web UI
...
Port 7e3c10dec6
2024-01-13 23:19:01 +01:00
zunda
b2a6386b7d
[Glitch] Adjust transform origin for favorite star
...
Port e4e752c26e
2024-01-13 23:19:01 +01:00
Eugen Rochko
6230d50f3f
[Glitch] Fix various icon styles in web UI
...
Port fa7e64df1d
2024-01-13 23:19:01 +01:00
Renaud Chaput
b67d977e20
[Glitch] Add missing ban icons
...
Port a4e6fe36cb
2024-01-13 23:19:01 +01:00
Renaud Chaput
9b32a37b6f
[Glitch] Fix missing icon props
...
Port f08ca3f042
2024-01-13 23:19:01 +01:00
Eugen Rochko
d54414866c
[Glitch] Change icons in web UI
...
Port 134de736dc
2024-01-13 23:19:01 +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
2024-01-13 13:09:04 +01:00
Claire
a40ce78f11
[Glitch] Add role badges to the WebUI
...
Port 1e4ccc655a
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
2024-01-13 12:39:09 +01:00
Essem
ca31b4de3a
[Glitch] Add new emojis from jdecked/twemoji 15.0
...
Port b6e353537b
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
Claire
6bbcd9348e
Switch from 48px weight 600 material symbol icons to 24px weight 400 icons ( #28064 )
2024-01-12 20:16:48 +00:00
Essem
f436a11c4e
Merge remote-tracking branch 'upstream/main'
2024-01-12 11:21:43 -06: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
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
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
Essem
843725b25b
Merge remote-tracking branch 'upstream/main'
2024-01-11 20:51:45 -06: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
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
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
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
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
