Thibaut Girka 9abb227250 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Our README.md files are completely different. Discarded upstream changes. - `app/javascript/core/admin.js`: Updating rails-ujs, no real conflict, but a comment to close to changed code. Various glitch-soc-only files have been updated to match those changes, though. - `package.json`: No real conflict, just an additional dependency in glitch-soc that was too close to something updated upstream. Took upstream's changes.		2020-03-22 16:10:44 +01:00
..
emoji	[Glitch] Fix emoji search not showing custom emoji when none are uncategorized	2019-09-30 15:58:29 +02:00
api.js	[Glitch] Do not set CSRF Token when no csrf header	2019-03-26 16:12:46 +01:00
async-components.js	[Glitch] Add explanation to mute dialog, refactor and clean up mute/block UI	2019-09-30 15:58:29 +02:00
backend_links.js	Update backend links and fix hardcoded ones	2019-08-31 18:23:24 +02:00
base64.js	…
base_polyfills.js	[Glitch] Fix old browsers crashing because of missing `finally` polyfill in web UI	2020-02-19 23:10:37 +01:00
compare_id.js	[Glitch] Add option to disable real-time updates in web UI	2019-07-16 16:51:08 +02:00
content_warning.js	…
counter.js	…
dom_helpers.js	…
extra_polyfills.js	…
fullscreen.js	…
get_rect_from_entry.js	…
hashtag.js	Fix hashtag processing when sending toots	2019-02-01 12:37:28 +01:00
html.js	…
idna.js	Move decodeIDNA to app/javascript/flavours/glitch/util	2019-08-04 22:25:56 +02:00
initial_state.js	[Glitch] Add trends UI with admin and user settings	2019-09-02 10:57:44 +02:00
intersection_observer_wrapper.js	…
is_mobile.js	Use forceSingleColumn only in automatic layout mode	2019-06-13 22:15:31 +02:00
js_helpers.js	…
load_keyboard_extensions.js	[Glitch] fix: support KaiOS arrow navigation on public pages	2019-11-06 14:59:57 +01:00
load_polyfills.js	[Glitch] Fix old browsers crashing because of missing `finally` polyfill in web UI	2020-02-19 23:10:37 +01:00
log_out.js	Merge branch 'master' into glitch-soc/merge-upstream	2020-03-22 16:10:44 +01:00
main.js	[Glitch] Fix `/web` redirecting to `/web/web` in web UI	2020-02-25 14:30:43 +01:00
numbers.js	[Glitch] Fix shortNumberFormat to within 3 chars without units	2020-01-04 23:04:52 +01:00
optional_motion.js	…
performance.js	…
privacy_preference.js	…
react_helpers.js	…
react_router_helpers.js	…
ready.js	…
reduced_motion.js	…
redux_helpers.js	…
resize_image.js	[Glitch] Fix client-side resizing of image uploads	2019-08-19 21:49:39 +02:00
rtl.js	[Glitch] Exclude URLs from text analysis	2019-09-05 14:13:03 +02:00
schedule_idle_task.js	…
scroll.js	[Glitch] Use ScrollToOptions for smooth scrolling if supported	2019-06-30 11:01:01 +02:00
scrollbar.js	Partially revert scrollbar handling on mobile, since its width-based and wrong	2019-10-06 00:32:06 +02:00
settings.js	…
stream.js	[Glitch] minor server-sent events fixes	2020-01-25 10:13:56 +01:00
url_regex.js	…
uuid.js	…