Jeremy Kescher 1661561640 Merge branch 'reactions' into develop ... # Conflicts: # Gemfile.lock # app/javascript/flavours/glitch/locales/de.js # app/javascript/flavours/glitch/locales/en.js # app/javascript/flavours/glitch/locales/es.js # app/javascript/flavours/glitch/locales/fr.js # app/javascript/flavours/glitch/locales/ja.js # app/javascript/flavours/glitch/locales/ko.js # app/javascript/flavours/glitch/locales/pl.js # app/javascript/flavours/glitch/locales/zh-CN.js # app/javascript/mastodon/actions/interactions.js # app/javascript/mastodon/locales/fr.json # db/migrate/20221124114030_create_status_reactions.rb		2022-12-22 00:18:36 +01:00
..
actions	Merge branch 'reactions' into develop	2022-12-22 00:18:36 +01:00
components	Merge remote-tracking branch 'upstream/main' into reactions	2022-12-21 23:45:28 +01:00
containers	fix image for new custom emoji reactions	2022-12-20 18:27:55 +01:00
features	Merge branch 'reactions' into develop	2022-12-22 00:18:36 +01:00
locales	Merge remote-tracking branch 'upstream/main' into reactions	2022-12-21 23:45:28 +01:00
middleware	Enable eslint:recommended ruleset (#22433)	2022-12-19 00:51:37 +09:00
reducers	Merge branch 'reactions' into develop	2022-12-22 00:18:36 +01:00
selectors	rebase with upstream	2022-12-20 18:27:51 +01:00
service_worker	Disable media cache on service worker (#19471)	2022-10-26 18:21:36 +02:00
store	Enable eslint:recommended ruleset (#22433)	2022-12-19 00:51:37 +09:00
utils	Merge remote-tracking branch 'upstream/main' into develop	2022-10-03 17:39:52 +02:00
api.js	Replace CancelToken to AbortSignal (#19352)	2022-10-14 03:16:37 +02:00
base_polyfills.js	Fix old browsers crashing because of missing finally polyfill in web UI (#13115)	2020-02-18 17:22:44 +01:00
blurhash.js	Fix not being able to open audio modal in web UI (#15283)	2020-12-07 04:29:37 +01:00
common.js	Enable eslint:recommended ruleset (#22433)	2022-12-19 00:51:37 +09:00
compare_id.js	Enable eslint:recommended ruleset (#22433)	2022-12-19 00:51:37 +09:00
extra_polyfills.js	Replace CancelToken to AbortSignal (#19352)	2022-10-14 03:16:37 +02:00
initial_state.js	cleanup JS imports and other minor stuff	2022-12-20 18:27:53 +01:00
is_mobile.js	Hide list panel from nav bar in mobile layout (#19337)	2022-10-10 21:41:25 +02:00
load_keyboard_extensions.js	fix: support KaiOS arrow navigation on public pages (#12251)	2019-11-04 13:03:09 +01:00
load_polyfills.js	Replace CancelToken to AbortSignal (#19352)	2022-10-14 03:16:37 +02:00
main.js	Delay workbox import (#20376)	2022-11-11 01:33:59 +01:00
performance.js	Restore vanilla components	2017-11-17 19:29:16 -08:00
permissions.js	Add customizable user roles (#18641)	2022-07-05 02:41:40 +02:00
ready.js	Disable push notification when not logged in (#19272)	2022-10-03 18:15:47 +02:00
scroll.js	Use ScrollToOptions for smooth scrolling if supported (#11207)	2019-06-29 18:32:06 +02:00
settings.js	Add dismissable hints to various timelines in web UI (#19315)	2022-10-09 06:08:37 +02:00
stream.js	Fixed ESLint error (#15214)	2020-11-23 17:35:14 +01:00
test_setup.js	Replace to testing-library from enzyme (#14152)	2020-06-29 13:58:07 +02:00
uuid.js	Enable eslint:recommended ruleset (#22433)	2022-12-19 00:51:37 +09:00