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 c790ecb14d Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/api/v1/statuses_controller.rb`: Conflict due to upstream adding a new parameter (with_rate_limit), too close to glitch-soc's own additional parameter (content_type). Added upstream's parameter. - `app/services/post_status_service.rb`: Conflict due to upstream adding a new parameter (rate_limit), too close to glitch-soc's own additional parameter (content_type). Added upstream's parameter. - `app/views/settings/preferences/appearance/show.html.haml`: Conflict due to us not exposing theme settings here (as we have a different flavour/skin menu). Took upstream change, while still not exposing theme settings. - `config/webpack/shared.js`: Coding style fixes for a part we have rewritten. Discarded upstream changes.		4 years ago
..
actions	Code style improvements in JavaScript (#13159)	4 years ago
components	Change the tooltip "Toggle visibility" to "Hide media" in web UI (#13199)	4 years ago
containers	Summary: fix slowness due to layout thrashing when reloading a large … (#12661)	4 years ago
features	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
locales	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
middleware	Add missing rejection handling for Promises (#7008)	6 years ago
reducers	Code style improvements in JavaScript (#13159)	4 years ago
selectors	Code style improvements in JavaScript (#13159)	4 years ago
service_worker	Code style improvements in JavaScript (#13159)	4 years ago
storage	Cache media only when storage can be freed (#7547)	6 years ago
store	Code style improvements in JavaScript (#13159)	4 years ago
utils	Fix shortNumberFormat to within 3 chars without units (#12706)	4 years ago
api.js	Do not set CSRF Token when no csrf header (#10383)	5 years ago
base_polyfills.js	Fix old browsers crashing because of missing `finally` polyfill in web UI (#13115)	4 years ago
common.js	Improve the public hashtag page (#9831)	5 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)	4 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	Fix old browsers crashing because of missing `finally` polyfill in web UI (#13115)	4 years ago
main.js	Fix `/web` redirecting to `/web/web` in web UI (#13128)	4 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)	6 years ago
stream.js	minor server-sent events fixes (#12945)	4 years ago
test_setup.js	Restore vanilla components	7 years ago
uuid.js	Restore vanilla components	7 years ago