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
..
admin_report.jsx	Further reduce CSS and markup differences with upstream (#2635)	2024-02-20 18:49:59 +01:00
admin_signup.jsx	Further reduce CSS and markup differences with upstream (#2635)	2024-02-20 18:49:59 +01:00
clear_column_button.jsx	[Glitch] Add a new @/ alias for the root frontend directory and use it where possible	2024-01-16 12:21:13 +01:00
column_settings.jsx	Add reaction notification column settings	2023-12-29 12:39:02 -06:00
filter_bar.jsx	Fix certain jsx files being in an old state in relation to the emoji reactions PR	2024-02-16 15:12:22 +01:00
follow.jsx	Further reduce CSS and markup differences with upstream (#2635)	2024-02-20 18:49:59 +01:00
follow_request.jsx	Further reduce CSS and markup differences with upstream (#2635)	2024-02-20 18:49:59 +01:00
grant_permission_button.jsx	Fix import order with ESLint	2023-05-28 16:38:10 +02:00
notification.jsx	Add support for emoji reactions	2023-12-29 12:33:13 -06:00
notifications_permission_banner.jsx	[Glitch] Add a new @/ alias for the root frontend directory and use it where possible	2024-01-16 12:21:13 +01:00
overlay.jsx	[Glitch] Add a new @/ alias for the root frontend directory and use it where possible	2024-01-16 12:21:13 +01:00
pill_bar_button.jsx	Fix extraneous newlines	2023-05-28 18:06:09 +02:00
report.jsx	[Glitch] Use Immutable Record for accounts in Redux state	2023-12-20 19:49:44 +01:00
setting_toggle.jsx	Further reduce CSS and markup differences with upstream (#2637)	2024-02-20 23:06:17 +01:00