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.		5 years ago
..
actions	Allow multiple files upload through web UI, including drag & drop (#9856)	5 years ago
components	Fix IntersectionObserverArticle not hiding some out-of-view items (#9982)	5 years ago
containers	Fix not showing custom emojis in share page emoji picker (#9970)	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)	6 years ago
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	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	Add WebP support (#9879)	5 years ago
api.js	Update dependencies for Node.js (2018-12-31) (#9669)	6 years ago
base_polyfills.js	Refactor resizeImage method (#7236)	6 years ago
common.js	Improve the public hashtag page (#9831)	6 years ago
compare_id.js	Fix comparing id (#7180)	6 years ago
extra_polyfills.js	Restore vanilla components	7 years ago
initial_state.js	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
is_mobile.js	Restore vanilla components	7 years ago
load_polyfills.js	Refactor resizeImage method (#7236)	6 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	Restore vanilla components	7 years ago
scroll.js	Restore vanilla components	7 years ago
settings.js	Implement tag auto-completion by history (#6621)	6 years ago
stream.js	Use randomized setTimeout when fallback-polling and re-add since_id (#7522)	6 years ago
test_setup.js	Restore vanilla components	7 years ago
uuid.js	Restore vanilla components	7 years ago