You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Thibaut Girka 980c004f06 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: No real conflict, glitch-soc-only dependency (redcarpet) too close to an upstream one (rdf-normalize) - `README.md`: we have different READMEs, discarded upstream's changes - `app/views/admin/custom_emojis/index.html.haml`: No real conflict, different context because of glitch-soc theming - `lib/mastodon/statuses_cli.rb`: Upstream added code to keep bookmarked statuses, we were already doing so with slightly different code. Discarded upstream's changes. - `package.json`: No real conflict, glitch-soc-only dependency (favico.js) too close to an upstream one		5 years ago
..
actions	Fix 12661 (#12744)	5 years ago
components	Fix 12661 (#12744)	5 years ago
containers	Summary: fix slowness due to layout thrashing when reloading a large … (#12661)	5 years ago
features	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
locales	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
middleware	Add missing rejection handling for Promises (#7008)	7 years ago
reducers	Fix 12661 (#12744)	5 years ago
selectors	Add special alert for throttled requests (#11677)	5 years ago
service_worker	Add follow_request notification type (#12198)	5 years ago
storage	Cache media only when storage can be freed (#7547)	6 years ago
store	Update dependencies for Node.js (2018-12-31) (#9669)	6 years ago
utils	Fix shortNumberFormat to within 3 chars without units (#12706)	5 years ago
api.js	Do not set CSRF Token when no csrf header (#10383)	6 years ago
base_polyfills.js	Refactor resizeImage method (#7236)	7 years ago
common.js	Improve the public hashtag page (#9831)	6 years ago
compare_id.js	Add option to disable real-time updates in web UI (#9984)	5 years ago
extra_polyfills.js	fix multiple space (#12655)	5 years ago
initial_state.js	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
is_mobile.js	Restore vanilla components	7 years ago
load_keyboard_extensions.js	fix: support KaiOS arrow navigation on public pages (#12251)	5 years ago
load_polyfills.js	Refactor resizeImage method (#7236)	7 years ago
main.js	bug fix (WebPush does not work) (#6120)	7 years ago
performance.js	Restore vanilla components	7 years ago
ready.js	Restore vanilla components	7 years ago
rtl.js	Exclude URLs from text analysis (#11759)	5 years ago
scroll.js	Use ScrollToOptions for smooth scrolling if supported (#11207)	5 years ago
settings.js	Implement tag auto-completion by history (#6621)	7 years ago
stream.js	upgrade/replace websocket.js to @gamestdio/websocket v2 (#12543)	5 years ago
test_setup.js	Restore vanilla components	7 years ago
uuid.js	Restore vanilla components	7 years ago