Commit graph

2917 commits

Author SHA1 Message Date
Jeremy Kescher
e60d3df9bb
Merge branch 'glitch-soc' into develop 2024-02-17 18:53:31 +01:00
Claire
d86b642dc6
Fix dead and misapplied CSS (#2627) 2024-02-17 18:52:59 +01:00
Claire
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
Jeremy Kescher
05a5c20681
Merge branch 'glitch-soc' into develop 2024-02-17 18:16:14 +01:00
Claire
50d9cd66d3 [Glitch] Use container queries to hide profile share button
Port c94bedf4e6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-02-16 18:18:17 +01:00
Eugen Rochko
ce3978246b [Glitch] Add prominent share/copy button on profiles in web UI
Port 87696ea26e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-02-16 18:17:55 +01:00
Claire
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
Jeremy Kescher
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
Jeremy Kescher
55aef6a70c
Fix scss styles being in an old state 2024-02-16 15:03:21 +01:00
Jeremy Kescher
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
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
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
Jeremy Kescher
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
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
Jeremy Kescher
c7e37c256e
Merge branch 'glitch-soc' into develop 2024-02-01 18:18:19 +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
Jeremy Kescher
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 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
2024-01-28 14:53:08 +01:00
Jeremy Kescher
c2c2afc294
Merge branch 'glitch-soc' into develop 2024-01-28 02:29:46 +01:00
Claire
54ece5040d [Glitch] Use active variants for boost icons and increase icon size
Port 5a838ceaa9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
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 to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-26 20:51:08 +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
Eugen Rochko
22e419f95e [Glitch] Fix search form re-rendering spuriously in web UI
Port 01ce9df880 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-24 20:53:15 +01:00
Eugen Rochko
72bae7e170 [Glitch] Fix duplicate and missing keys in search popout component in web UI
Port 9f8e3cca9a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-22 19:21:02 +01:00
renovate[bot]
1d381c1664 [Glitch] Update dependency react-redux to v9.1.0
Port 163db814c2 to glitch-soc

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-22 19:15:02 +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
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 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-17 18:37:04 +01:00
Claire
0207c4b055 [Glitch] Change media “ALT” label to a specific class
Port e817fe4c35 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-17 18:36:09 +01:00
Claire
e8294925e6 [Glitch] Fix various icon alignment issues
Port baab58c80b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-17 18:34:57 +01:00
renovate[bot]
d56e9fb873 [Glitch] Update devDependencies (non-major)
Port 4e277f83dc to glitch-soc

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-17 18:12:00 +01: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 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-16 12:21:13 +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 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-15 20:53:08 +01:00
Renaud Chaput
8cad0a4d6b [Glitch] Change icon SVG imports to use a default import
Port 608f66f978 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-15 20:20:38 +01: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 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2024-01-15 12:16:05 +01:00
Jeremy Kescher
a9b0515086
Emoji picker dropdown condition change from permissions to signedIn 2024-01-14 19:48:46 +01:00
Jeremy Kescher
777be10810
Merge branch 'glitch-soc' into develop 2024-01-14 19:46:03 +01:00
Josh Goldberg ✨
f8941c41a5 [Glitch] Converted hashtag.jsx to TypeScript
Port 3a7f10c3f1 to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-14 19:22:39 +01:00
Josh Goldberg ✨
695dcc6ca8 [Glitch] Converted app/javascript/flavours/glitch/utils/ folder to TypeScript
Port 1142f4c79e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
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
Jeremy Kescher
ad4e692669
Set heart_plus as reaction button icon 2024-01-14 19:03:01 +01:00
Jeremy Kescher
3c8b9a7784
Set heart_plus as reaction button icon 2024-01-14 18:16:26 +01:00
Jeremy Kescher
2047683539
v4.3.0-alpha.0+glitch+cat+1.0.8 2024-01-14 17:48:42 +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 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-14 16:32:08 +01:00
Eugen Rochko
cc363629be [Glitch] Fix focus and hover styles in web UI
Port cfd50f30bb to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-14 16:32:08 +01:00
Trevor Wolf
7565a328d0 [Glitch] change column link to add a better keyboard focus indicator
Port 6308dca76a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-14 16:32:08 +01:00
Trevor Wolf
c1e28c8913 [Glitch] change focus ui for keyboard only input
Port 59478a1b46 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-14 16:32:08 +01:00
Eugen Rochko
a7bad8f45c [Glitch] Fix profile setup showing default avatar in web UI
Port 01f0a6ca4f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
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 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-14 16:32:08 +01:00
Eugen Rochko
bacb9134cc [Glitch] Add profile setup to onboarding in web UI
Port d67bd44ca1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-14 16:32:08 +01:00
Renaud Chaput
2653651bfa [Glitch] Simplify column headers
Port 13d310e64d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
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 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
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
Santiago Kozak
731f01adb1 [Glitch] Fix reply icon display in picture-in-picture footer
Port 1cba91d6d1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-13 23:19:01 +01:00
Renaud Chaput
dd56900fac [Glitch] Fixes dropdown target without a buttonRef (edit history)
Port 7b1d390734 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-13 23:19:01 +01:00
Eugen Rochko
a8c59c2506 [Glitch] Add icons for private and disabled boost in web UI
Port 7e3c10dec6 to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-13 23:19:01 +01:00
zunda
b2a6386b7d [Glitch] Adjust transform origin for favorite star
Port e4e752c26e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-13 23:19:01 +01:00
Eugen Rochko
6230d50f3f [Glitch] Fix various icon styles in web UI
Port fa7e64df1d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-13 23:19:01 +01:00
Renaud Chaput
b67d977e20 [Glitch] Add missing ban icons
Port a4e6fe36cb to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-13 23:19:01 +01:00
Renaud Chaput
9b32a37b6f [Glitch] Fix missing icon props
Port f08ca3f042 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-13 23:19:01 +01:00
Eugen Rochko
d54414866c [Glitch] Change icons in web UI
Port 134de736dc to glitch-soc

Co-authored-by: Renaud Chaput <renchap@gmail.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-13 23:19:01 +01:00
Jeremy Kescher
3df2bc2caf
v4.3.0-alpha.0+glitch+cat+1.0.6 2024-01-13 17:46:55 +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 to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-13 13:09:04 +01:00
Claire
a40ce78f11 [Glitch] Add role badges to the WebUI
Port 1e4ccc655a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
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 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-13 12:39:09 +01:00
Essem
ca31b4de3a [Glitch] Add new emojis from jdecked/twemoji 15.0
Port b6e353537b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-13 12:39:09 +01:00
Jeremy Kescher
c677b8de19
v4.3.0-alpha.0+glitch+cat+1.0.5 2024-01-12 22:03:50 +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
Renaud Chaput
09376a8207 [Glitch] Upgrade Redux packages
Port a0e237a96f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-10 18:34:23 +01:00
Claire
7cd88ae2f4 [Glitch] Fix scrolling to detailed status not always working
Port d0fd14f851 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-10 18:02:37 +01:00
Jeremy Kescher
3b9a52aab6
Merge branch 'glitch-soc' into develop 2024-01-04 17:57:02 +01:00
Jeremy Kescher
abb21a1eab
Merge branch 'glitch-soc' into develop 2024-01-04 17:30:03 +01:00
Claire
48c9192b47 [Glitch] Fix loading local accounts with extraneous domain part in WebUI
Port 65ea097f1d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-02 18:16:57 +01:00
Michael Stanclift
0cd497ba7d [Glitch] Fix OCR when using S3/CDN for assets
Port fdec8d7ffb to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-01-02 13:37:04 +01:00
Jeremy Kescher
5be3fb3d66
Merge remote-tracking branch 'essem/feature/emoji-reactions' into merge/emoji-reactions 2024-01-02 12:16:35 +01:00
Essem
67190e09f0
Add reaction notification column settings
This was in a previous PR. Not quite sure how it didn't carry over.
2023-12-29 12:39:02 -06:00
Essem
9670ba6a1b
More cleanup 2023-12-29 12:39:01 -06:00
Essem
01b6cbe577
Linting fixes 2023-12-29 12:39:01 -06:00
Essem
6ae86f40d1
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>
2023-12-29 12:33:13 -06:00
Claire
eb342a6082 Fix media attachments not being hidden in report modal in glitch flavor 2023-12-29 17:47:30 +01:00
Cal Moody
df43bb124c [Glitch] Fix destructive actions in dropdowns not using error color in light theme
Port 3599622b5b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-12-29 17:43:53 +01:00