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
..
actions	[Glitch] Change how unread announcements are handled	2020-02-03 09:31:32 +01:00
components	[Glitch] Change the tooltip "Toggle visibility" to "Hide media" in web UI	2020-03-08 20:45:36 +01:00
containers	Fix edit filter link in filtered “Show why” dialog	2019-12-12 16:32:47 +01:00
features	Fix missing media description dialog when sending toots with keyboard shortcuts	2020-03-14 14:59:14 +01:00
images	Port 7badad7797 to glitch frontend	2018-01-18 10:25:37 -06:00
locales	Add glitch-soc front-end support for many upstream translations	2020-01-20 16:43:18 +01:00
middleware	[Glitch] Add missing rejection handling for Promises	2019-02-10 21:44:14 +01:00
packs	Merge branch 'master' into glitch-soc/merge-upstream	2020-03-22 16:10:44 +01:00
reducers	[Glitch] Code style improvements in JavaScript	2020-03-08 20:43:53 +01:00
selectors	[Glitch] Code style improvements in JavaScript	2020-03-08 20:43:53 +01:00
store	[Glitch] Code style improvements in JavaScript	2020-03-08 20:43:53 +01:00
styles	[Glitch] Fix text area above/right of emoji picker being accidentally clickable in web UI	2020-03-08 20:19:08 +01:00
util	Merge branch 'master' into glitch-soc/merge-upstream	2020-03-22 16:10:44 +01:00
names.yml	i18n: Update Polish translation	2018-01-04 14:42:58 +01:00
theme.yml	Fix menu in settings/admin pages	2019-09-30 17:01:16 +02:00