Jeremy Kescher 7318b74ebf Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # Gemfile.lock # app/models/notification.rb # config/locales/simple_form.de.yml		2023-03-05 12:34:16 +01:00
..
backend_links.js	[Glitch] Add ability to view previous edits of a status in admin UI	2022-10-28 19:24:02 +02:00
base64.js	Rename flavours/glitch/util into flavours/glitch/utils	2022-10-11 11:31:11 +02:00
config.js	Move flavours/glitch/utils/ready to flavours/glitch/ready	2022-10-11 11:31:11 +02:00
content_warning.js	Rename flavours/glitch/util into flavours/glitch/utils	2022-10-11 11:31:11 +02:00
dom_helpers.js	Rename flavours/glitch/util into flavours/glitch/utils	2022-10-11 11:31:11 +02:00
filters.js	Rename flavours/glitch/util into flavours/glitch/utils	2022-10-11 11:31:11 +02:00
hashtag.js	[Glitch] Enable ESLint no-useless-escape	2023-02-18 16:02:12 +01:00
html.js	Rename flavours/glitch/util into flavours/glitch/utils	2022-10-11 11:31:11 +02:00
icons.jsx	[Glitch] Rename JSX files with proper .jsx extension	2023-02-25 14:35:31 +01:00
idna.js	Rename flavours/glitch/util into flavours/glitch/utils	2022-10-11 11:31:11 +02:00
js_helpers.js	Rename flavours/glitch/util into flavours/glitch/utils	2022-10-11 11:31:11 +02:00
log_out.js	Rename flavours/glitch/util into flavours/glitch/utils	2022-10-11 11:31:11 +02:00
notifications.js	[Glitch] Enable ESLint Promise plugin defaults	2023-02-19 10:53:18 +01:00
numbers.js	Rename flavours/glitch/util into flavours/glitch/utils	2022-10-11 11:31:11 +02:00
privacy_preference.js	[Glitch] Run eslint --fix	2023-02-03 20:52:07 +01:00
react_helpers.js	[Glitch] Run eslint --fix	2023-02-03 20:52:07 +01:00
resize_image.js	Merge remote-tracking branch 'upstream/main' into develop	2022-10-12 07:25:19 +02:00
scrollbar.js	Rename flavours/glitch/util into flavours/glitch/utils	2022-10-11 11:31:11 +02:00