Commit graph

682 commits

Author SHA1 Message Date
Jeremy Kescher
8f8cb0fad3
Merge branch 'glitch-soc' into develop 2024-02-24 17:51:18 +01:00
Jeremy Kescher
004b22602b
Merge branch 'emoji-reactions-base' into develop
# Conflicts:
#	app/javascript/flavours/glitch/components/status.jsx
#	app/javascript/flavours/glitch/locales/en.json
#	app/javascript/flavours/glitch/styles/components.scss
2024-02-24 11:08:13 +01:00
Claire
138286147f Fix emoji being inserted in incorrect places 2024-02-23 21:45:48 +01:00
Eugen Rochko
9c10aaa4d5 [Glitch] Change design of compose form in web UI
Port 6936e5aa69 to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-02-22 23:06:12 +01:00
Claire
5f50b634cf
Further reduce CSS and markup differences with upstream (#2635)
* Further reduce CSS differences with upstream

* Reduce differences in markup and CSS with upstream

* Redo collapsible post notifications

* Reduce CSS differences further

* Reduce differences with upstream regarding `.status` and `.status__wrapper`

* Further reduce differences with upstream

* Reduce differences with upstream in DisplayName
2024-02-20 18:49:59 +01:00
Claire
0a2b95c4f5
Adopt upstream's design for preview cards (#2634)
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Christian Schmidt <github@chsc.dk>
2024-02-19 22:47:01 +01:00
Claire
bbecf1c56b
Further reduce differences with upstream (#2631)
* Further reduce CSS diffs with upstream

* Remove superfluous “Sensitive content” label in media galleries and clean up dead code
2024-02-18 22:30:20 +01:00
Jeremy Kescher
e60d3df9bb
Merge branch 'glitch-soc' into develop 2024-02-17 18:53:31 +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
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
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
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
Jeremy Kescher
93ae46fa14
Merge branch 'glitch-soc' into develop 2024-01-18 22:59:27 +01:00
Jeremy Kescher
5d4cfe4cd8
Merge branch 'glitch-soc' into develop 2024-01-17 22:37:29 +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
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
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
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
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
e2ba5f6e35 Fix glitch-soc high color privacy icons 2024-01-14 00:04:09 +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
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
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
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
Jeremy Kescher
abb21a1eab
Merge branch 'glitch-soc' into develop 2024-01-04 17:30:03 +01: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
Claire
b41af99673 [Glitch] Change dismissed banners to be stored server-side
Port 7faa27e17d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-12-20 20:40:47 +01:00
Renaud Chaput
7fe5623a27 [Glitch] Use Immutable Record for accounts in Redux state
Port 3bf2a7296e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-12-20 19:49:44 +01:00
Claire
f5de9fe99a [Glitch] Allow viewing and severing relationships with suspended accounts
Port c451bbe249 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-12-18 18:49:48 +01:00
Claire
bb4fa0c374 [Glitch] Rewrite AutosuggestTextarea as Functional Component
Port 9c8891b39a to glitch-soc

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