252 commits

Author	SHA1	Message	Date
Jeremy Kescher	fae98d1deb	Merge branch 'refs/heads/glitch-soc' into develop ... # Conflicts: # app/javascript/flavours/glitch/initial_state.js # app/javascript/mastodon/initial_state.js	2024-05-20 23:57:04 +02:00
Renaud Chaput	ca5955ed76	[Glitch] Use a modern React context for identity in the app ... Port a178ba7cd5 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2024-05-20 12:53:52 +02:00
Jeremy Kescher	e73c612cb1	Merge branch 'refs/heads/glitch-soc' into develop	2024-05-11 23:31:31 +02:00
Renaud Chaput	b3d5567bd0	[Glitch] Remove global boosts state and convert boosts modal to Typescript ... Port 67442f9039 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2024-05-01 16:42:20 +02:00
Jeremy Kescher	0353a3d759	Merge branch 'glitch-soc' into develop ... # Conflicts: # app/javascript/flavours/glitch/features/compose/components/emoji_picker_dropdown.jsx # app/javascript/flavours/glitch/features/ui/components/navigation_panel.jsx # app/javascript/mastodon/features/ui/components/navigation_panel.jsx	2024-03-20 22:59:13 +01:00
Claire	d959501ef1	[Glitch] Fix extra separator besides favourite count on private posts ... Port 726e7ad024 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2024-03-19 19:24:34 +01:00
Jeremy Kescher	21a23b58ab	Merge branch 'glitch-soc' into develop	2024-03-14 21:46:57 +01:00
Jeremy Kescher	caccc2e0f4	Merge branch 'glitch-soc' into develop ... # Conflicts: # README.md # app/javascript/flavours/glitch/components/status.jsx # app/javascript/flavours/glitch/features/notifications/components/column_settings.jsx # app/javascript/flavours/glitch/locales/en.json # app/javascript/flavours/glitch/reducers/compose.js # app/javascript/flavours/glitch/styles/components.scss # app/javascript/mastodon/reducers/compose.js # app/models/notification.rb	2024-03-14 20:01:30 +01:00
Eugen Rochko	4b2a935c4a	[Glitch] Change design of metadata underneath posts in web UI ... Port 4991198b70 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2024-03-14 17:43:38 +01:00
Claire	98cf4b7ba0	Reduce code differences with upstream	2024-03-08 12:42:03 +01:00
Jeremy Kescher	6aa17a7c1b	Merge branch 'glitch-soc' into develop	2024-03-03 03:12:37 +01:00
Claire	bbfcd71118	[Glitch] Fix preview card player getting embedded when clicking on the external link button ... Port f24c62a5c8 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2024-02-29 18:29:57 +01:00
Renaud Chaput	5b97fdf84c	[Glitch] Fix full date display not respecting the locale 12/24h format ... Port 4185f3792c to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2024-02-29 18:29:11 +01:00
Essem	4edbebfbac	Fix reaction picker dropdown appearance	2024-02-25 18:16:15 +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	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
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	5d4cfe4cd8	Merge branch 'glitch-soc' into develop	2024-01-17 22:37:29 +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
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	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
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
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	c677b8de19	v4.3.0-alpha.0+glitch+cat+1.0.5	2024-01-12 22:03:50 +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
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	408d4710ed	Further reduce differences with upstream	2023-12-09 20:58:50 +01:00
Claire	a27abb4802	Further reduce code differences with upstream (#2509)	2023-12-09 20:29:23 +01:00
Claire	0c727a6790	Fix more import style discrepancies	2023-11-15 17:16:21 +01:00
Claire	c226d00490	Fix interaction between CWs and hashtag bars	2023-11-15 12:56:58 +01:00
Renaud Chaput	18462ee4b6	[Glitch] Remove hashtags from the last line of a status if it only contains hashtags ... Port 061fd66ee6 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2023-11-15 12:56:58 +01:00
Claire	a81ed84453	[Glitch] Add display of out-of-band hashtags in the web interface ... Port df6e719898 to glitch-soc Co-authored-by: Eugen Rochko <eugen@zeonfederated.com> Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2023-11-15 12:56:58 +01:00
Claire	a97b722ad5	Reduce differences with upstream due to import style (#2465) ... Fix relative / VS absolute style imports, and fix whitespace discrepancies	2023-11-15 12:01:51 +01:00
Renaud Chaput	d6eacb79c6	[Glitch] Upgrade to react-router v5 ... Port 1b70d7ed7c to glitch-soc Co-authored-by: Claire <claire.github-309c@sitedethib.com> Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2023-10-21 22:14:24 +02:00
Claire	99c72830bc	[Glitch] Fix scroll position in thread view reseting when closing a modal ... Port 9d1c3d0678 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2023-10-10 19:53:59 +02:00
Claire	05159d2f94	[Glitch] Fix clicking on already-loaded thread scrolling to the top of the thread ... Port 4c2aca777f to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2023-10-09 21:15:59 +02:00
Claire	b63d526590	[Glitch] Fix clicking on already-opened thread post scrolling to the top of the thread ... Port c310374a2f to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2023-10-09 21:11:44 +02:00
Christian Schmidt	def58f8ac3	[Glitch] Fix some React warnings ... Port 152b10b624 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2023-08-24 21:49:26 +02:00
Claire	128daefc7a	Remove leftover .orig files that were mistakenly included (#2379)	2023-08-22 18:24:03 +02:00
Christian Schmidt	1461cc53ed	[Glitch] Add alt text for preview card thumbnails ... Port 8da99ffb0d to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2023-08-13 18:56:58 +02:00
Claire	aa1789f0dd	[Glitch] Change interaction modal in web UI ... Port b4e739ff0f to glitch-soc Co-authored-by: Eugen Rochko <eugen@zeonfederated.com> Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2023-07-30 16:59:32 +02:00
Eugen Rochko	e48a6a5f2c	[Glitch] Fix missing action label on sensitive videos and embeds in web UI ... Port 714a20697f to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2023-07-30 15:50:53 +02:00
gunchleoc	09ebf7e37c	[Glitch] Replace 'favourite' by 'favorite' for American English ... Port 217ef7f2af to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2023-07-30 14:44:36 +02:00
Claire	5914dfdd69	[Glitch] Change thread view to scroll to the selected post rather than the post being replied to ... Port e4ea80d808 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2023-07-30 14:26:52 +02:00