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
..
__tests__	Add comment, test to unescapeHTML (#7949)	2018-07-05 19:19:38 +09:00
base64.js	Refactor resizeImage method (#7236)	2018-04-23 09:15:51 +02:00
config.js	Change how CDN_HOST is passed down to make assets build reproducible (#14381)	2020-10-13 01:19:35 +02:00
filters.js	Add ability to filter individual posts (#18945)	2022-08-25 04:27:47 +02:00
html.js	Add comment, test to unescapeHTML (#7949)	2018-07-05 19:19:38 +09:00
icons.jsx	Rename JSX files with proper .jsx extension (#23733)	2023-02-20 03:20:59 +01:00
log_out.js	Migrate Rails ujs as required for Rails 6 Upgrade. (#13280)	2020-03-21 03:14:50 +01:00
notifications.js	Enable ESLint Promise plugin defaults (#22229)	2023-02-16 15:30:56 +09:00
numbers.js	Add graphs and retention metrics to admin dashboard (#16829)	2021-10-14 20:44:59 +02:00
resize_image.js	Allow higher-resolution images (4096x4096)	2022-07-07 00:21:05 +02:00
scrollbar.js	Do not add margin light when opening modal on mobile (#11830)	2019-09-29 14:30:58 +02:00