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 a7aedebc31 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Not a real conflict, upstream updated dependencies that were too close to glitch-soc-only ones in the file. - `app/controllers/oauth/authorized_applications_controller.rb`: Upstream changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's theming system. Ported upstream changes. - `app/controllers/settings/base_controller.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's theming system. Ported upstream changes. - `app/controllers/settings/sessions_controller.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's theming system. Ported upstream changes. - `app/models/user.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc not preventing moved accounts from logging in. Ported upstream changes while keeping the ability for moved accounts to log in. - `app/policies/status_policy.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's local-only toots. Ported upstream changes. - `app/serializers/rest/account_serializer.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's ability to hide followers count. Ported upstream changes. - `app/services/process_mentions_service.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's local-only toots. Ported upstream changes. - `package.json`: Not a real conflict, upstream updated dependencies that were too close to glitch-soc-only ones in the file.		4 years ago
..
actions	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
components	Add pop-out player for audio/video in web UI (#14870)	4 years ago
containers	Add pop-out player for audio/video in web UI (#14870)	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	Fix 404 and 410 API errors being silently discarded in WebUI (#13279)	5 years ago
reducers	Add pop-out player for audio/video in web UI (#14870)	4 years ago
selectors	Fix audio and video items in account gallery in web UI (#14282)	4 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	Replace shortNumberFormat with <ShortNumber> (#14061)	4 years ago
api.js	…
base_polyfills.js	Fix old browsers crashing because of missing `finally` polyfill in web UI (#13115)	5 years ago
common.js	Migrate Rails ujs as required for Rails 6 Upgrade. (#13280)	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)	5 years ago
initial_state.js	Merge branch 'master' into glitch-soc/merge-upstream	5 years ago
is_mobile.js	…
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)	5 years ago
main.js	Fix `/web` redirecting to `/web/web` in web UI (#13128)	5 years ago
performance.js	…
ready.js	…
rtl.js	Exclude URLs from text analysis (#11759)	5 years ago
scroll.js	Use ScrollToOptions for smooth scrolling if supported (#11207)	6 years ago
settings.js	…
stream.js	Better manage subscriptionCounters (#14608)	4 years ago
test_setup.js	Replace to testing-library from enzyme (#14152)	5 years ago
uuid.js	…