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 d392020da6 Merge branch 'master' into glitch-soc/tentative-merge ... Conflicts: README.md app/controllers/statuses_controller.rb app/lib/feed_manager.rb config/navigation.rb spec/lib/feed_manager_spec.rb Conflicts were resolved by taking both versions for each change. This means the two filter systems (glitch-soc's keyword mutes and tootsuite's custom filters) are in place, which will be changed in a follow-up commit.		7 years ago
..
account/components	Adjust account__action-bar contents (#7818)	7 years ago
account_gallery	Fix LoadMore on account media gallery (#6933)	7 years ago
account_timeline	Fix domain hiding logic (#7765)	7 years ago
blocks	Replace react-router-scroll to react-router-scroll-4 (#5568)	7 years ago
community_timeline	Keyword/phrase filtering (#7905)	7 years ago
compose	Merge branch 'master' into glitch-soc/tentative-merge	7 years ago
direct_timeline	Keyword/phrase filtering (#7905)	7 years ago
domain_blocks	Improve getting started column (#7676)	7 years ago
emoji	Fix issues with updated emoji mart (#7761)	7 years ago
favourited_statuses	Replace onScrollToBottom with onLoadMore (#6615)	7 years ago
favourites	Replace react-router-scroll to react-router-scroll-4 (#5568)	7 years ago
follow_requests	Replace react-router-scroll to react-router-scroll-4 (#5568)	7 years ago
followers	Federate pinned statuses over ActivityPub (#6610)	7 years ago
following	Federate pinned statuses over ActivityPub (#6610)	7 years ago
generic_not_found	Replace sprockets/browserify with Webpack (#2617)	8 years ago
getting_started	Fix broken single column getting-started menu (Fix #7854) (#7862)	7 years ago
hashtag_timeline	Allow clients to fetch statuses made while they were offline (#6876)	7 years ago
home_timeline	Keyword/phrase filtering (#7905)	7 years ago
keyboard_shortcuts	Add revealing/hiding statuses button to keyboard shortcuts legend column (#7178)	7 years ago
list_editor	Upgrade ESLint to version 4.x (#6276)	7 years ago
list_timeline	Change list icons different from the getting-started icons (#7838)	7 years ago
lists	Change list icons different from the getting-started icons (#7838)	7 years ago
mutes	Replace react-router-scroll to react-router-scroll-4 (#5568)	7 years ago
notifications	Fix filters not affecting notifications in web UI (#7977)	7 years ago
pinned_statuses	Add Pinned toot column (#4817)	7 years ago
public_timeline	Put "Media Only" option in column settings instead of content area headline (#7801)	7 years ago
reblogs	Replace react-router-scroll to react-router-scroll-4 (#5568)	7 years ago
report	Show media on report UI (#6619)	7 years ago
standalone	Allow clients to fetch statuses made while they were offline (#6876)	7 years ago
status	Fix M hotkey inserting @undefined when in detailed status (#7931)	7 years ago
trends	Improve trends layout (#7700)	7 years ago
ui	Check if router is injected in media modal (#7941)	7 years ago
video	Open video modal on public UI (#7469)	7 years ago