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 a2a64ecd3e Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - .eslintrc.yml Removed, as upstream removed it. - app/controllers/admin/statuses_controller.rb Minor code cleanup when porting one of our features. - app/models/account.rb Note length validation has changed upstream. We now use upstream's validation (dropped legacy glitch-soc account metadata stuff) but with configurable limit. - app/services/post_status_service.rb Upstream has added support for scheduled toots, refactoring the code a bit. Adapted our changes to this refactoring. - app/views/stream_entries/_detailed_status.html.haml Not a real conflict, changes too close. - app/views/stream_entries/_simple_status.html.haml Not a real conflict, changes too close.		6 years ago
..
actions	Immediately go back in browser history upon successfully sending toot (#9663)	6 years ago
components	Stop gifv timeline preview explicitly when open the media gallery. (#9749)	6 years ago
containers	Upgrade ESLint to v5.x (#9694)	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	Add missing rejection handling for Promises (#7008)	7 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	Fix a problem about generating an url of notifications (#8758)	6 years ago
storage	Cache media only when storage can be freed (#7547)	7 years ago
store	Update dependencies for Node.js (2018-12-31) (#9669)	6 years ago
utils	Resize images by area instead of fixed dimensions (#8083)	6 years ago
api.js	Update dependencies for Node.js (2018-12-31) (#9669)	6 years ago
base_polyfills.js	Refactor resizeImage method (#7236)	7 years ago
common.js	Revert Font Awesome 5 upgrade (#8810)	6 years ago
compare_id.js	Fix comparing id (#7180)	7 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)	7 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)	7 years ago
stream.js	Use randomized setTimeout when fallback-polling and re-add since_id (#7522)	7 years ago
test_setup.js	Restore vanilla components	7 years ago
uuid.js	Restore vanilla components	7 years ago