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.		5 years ago
..
actions	Code style improvements in JavaScript (#13159)	5 years ago
components	Change the tooltip "Toggle visibility" to "Hide media" in web UI (#13199)	5 years ago
containers	…
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	…
reducers	Code style improvements in JavaScript (#13159)	5 years ago
selectors	Code style improvements in JavaScript (#13159)	5 years ago
service_worker	Code style improvements in JavaScript (#13159)	5 years ago
storage	…
store	Code style improvements in JavaScript (#13159)	5 years ago
utils	…
api.js	…
base_polyfills.js	…
common.js	…
compare_id.js	…
extra_polyfills.js	…
initial_state.js	…
is_mobile.js	…
load_keyboard_extensions.js	…
load_polyfills.js	…
main.js	Fix `/web` redirecting to `/web/web` in web UI (#13128)	5 years ago
performance.js	…
ready.js	…
rtl.js	…
scroll.js	…
settings.js	…
stream.js	…
test_setup.js	…
uuid.js	…