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
..
checkbox_with_label.jsx	[Glitch] Add notification policies and notification requests in web UI	2024-03-13 18:38:46 +01:00
clear_column_button.jsx	Reduce code differences with upstream	2024-03-08 12:42:03 +01:00
column_settings.jsx	Merge branch 'refs/heads/glitch-soc' into develop	2024-05-20 23:57:04 +02:00
filter_bar.jsx	Merge branch 'glitch-soc' into develop	2024-03-14 20:01:30 +01:00
filtered_notifications_banner.jsx	[Glitch] Fix incorrect label for filtered notifications badge	2024-05-01 19:18:06 +02:00
follow_request.jsx	Refactor notifications code to reduce differences with upstream (#2692)	2024-04-06 19:34:30 +02:00
grant_permission_button.jsx	Fix import order with ESLint	2023-05-28 16:38:10 +02:00
moderation_warning.tsx	[Glitch] Change moderation warning notification icon	2024-05-04 15:29:51 +02:00
notification.jsx	Merge branch 'refs/heads/glitch-soc' into develop	2024-05-14 18:56:01 +02:00
notification_request.jsx	[Glitch] Fix background and icon on notification requests in web UI	2024-04-06 21:51:51 +02:00
notifications_permission_banner.jsx	[Glitch] Fix icon and styling in browser notifications banner	2024-03-20 12:30:45 +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
relationships_severance_event.jsx	[Glitch] Change design of notification about lost connections in web UI	2024-04-06 21:49:57 +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