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 bf94a43496 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/oauth/authorized_applications_controller.rb Two changes too close to each other - app/controllers/settings/sessions_controller.rb - app/lib/user_settings_decorator.rb Two changes too close to each other - app/models/media_attachment.rb New changes too close to glitch-soc only changes. - app/models/user.rb Two changes too close to each other. - app/services/remove_status_service.rb Kept direct timeline code which had been removed upstream. - app/views/settings/preferences/show.html.haml Two changes too close to each other. - config/locales/en.yml Introduction of a new string too close to glitch-soc-only's “flavour” - config/locales/ja.yml Introduction of a new string too close to glitch-soc-only's “flavour” - config/locales/pl.yml Introduction of a new string too close to glitch-soc-only's “flavour” - config/locales/simple_form.en.yml Introduction of a new string too close to glitch-soc-only's “skin” - config/locales/simple_form.pl.yml Introduction of a new string too close to glitch-soc-only's “skin” - config/settings.yml Reverted upstream's decision of enabling posting application by default.		6 years ago
..
actions	Allow multiple files upload through web UI, including drag & drop (#9856)	6 years ago
components	Fix IntersectionObserverArticle not hiding some out-of-view items (#9982)	6 years ago
containers	Fix not showing custom emojis in share page emoji picker (#9970)	6 years ago
features	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
locales	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
middleware	…
reducers	Fix crash when clearing uninitialized timeline (#9662)	6 years ago
selectors	Don't filter own toots (fixes #8289) (#8298)	6 years ago
service_worker	Hide CWed content in notifications and fix sensitive images without CWs (#9778)	6 years ago
storage	…
store	Update dependencies for Node.js (2018-12-31) (#9669)	6 years ago
utils	Add WebP support (#9879)	6 years ago
api.js	Update dependencies for Node.js (2018-12-31) (#9669)	6 years ago
base_polyfills.js	…
common.js	Improve the public hashtag page (#9831)	6 years ago
compare_id.js	…
extra_polyfills.js	…
initial_state.js	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
is_mobile.js	…
load_polyfills.js	…
main.js	…
performance.js	…
ready.js	…
rtl.js	…
scroll.js	…
settings.js	…
stream.js	…
test_setup.js	…
uuid.js	…