Thibaut Girka db200226b8 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/javascript/mastodon/initial_state.js db/schema.rb Upstream added a new field to initial_state. Not too sure about what happened with db/schema.rb though…		2018-06-15 20:51:39 +02:00
..
account/components	Display numbers in account header using shortNumberFormat for consistency (#7723)	2018-06-04 05:15:50 +02:00
account_gallery	…
account_timeline	Fix domain hiding logic (#7765)	2018-06-09 22:46:54 +02:00
blocks	…
community_timeline	Put "Media Only" option in column settings instead of content area headline (#7801)	2018-06-15 11:15:15 +02:00
compose	Merge branch 'master' into glitch-soc/merge-upstream	2018-06-15 20:51:39 +02:00
direct_timeline	Put "Media Only" option in column settings instead of content area headline (#7801)	2018-06-15 11:15:15 +02:00
domain_blocks	Improve getting started column (#7676)	2018-05-30 18:41:47 +02:00
emoji	Fix issues with updated emoji mart (#7761)	2018-06-08 13:28:04 +02:00
favourited_statuses	…
favourites	…
follow_requests	…
followers	…
following	…
generic_not_found	…
getting_started	Add "find friends", "invite people", and more to getting started footer (#7803)	2018-06-15 15:51:37 +02:00
hashtag_timeline	…
home_timeline	…
keyboard_shortcuts	Add revealing/hiding statuses button to keyboard shortcuts legend column (#7178)	2018-04-18 13:15:57 +02:00
list_editor	…
list_timeline	…
lists	…
mutes	…
notifications	Improve load gap styling in web UI (#7100)	2018-04-10 17:12:10 +02:00
pinned_statuses	…
public_timeline	Put "Media Only" option in column settings instead of content area headline (#7801)	2018-06-15 11:15:15 +02:00
reblogs	…
report	…
standalone	…
status	Add redraft function (#7735)	2018-06-05 00:17:38 +02:00
trends	Improve trends layout (#7700)	2018-06-01 19:18:37 +02:00
ui	Submit report using meta key (#7729)	2018-06-04 13:09:52 +02:00
video	Open video modal on public UI (#7469)	2018-05-13 13:48:14 +02:00