Thibaut Girka 249991c498 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile.lock - app/controllers/accounts_controller.rb - app/controllers/admin/dashboard_controller.rb - app/controllers/follower_accounts_controller.rb - app/controllers/following_accounts_controller.rb - app/controllers/remote_follow_controller.rb - app/controllers/stream_entries_controller.rb - app/controllers/tags_controller.rb - app/javascript/packs/public.js - app/lib/sanitize_config.rb - app/models/account.rb - app/models/form/admin_settings.rb - app/models/media_attachment.rb - app/models/stream_entry.rb - app/models/user.rb - app/serializers/initial_state_serializer.rb - app/services/batched_remove_status_service.rb - app/services/post_status_service.rb - app/services/process_mentions_service.rb - app/services/reblog_service.rb - app/services/remove_status_service.rb - app/views/admin/settings/edit.html.haml - config/locales/simple_form.pl.yml - config/settings.yml - docker-compose.yml		2019-07-19 18:26:49 +02:00
..
account/components	Improve blocked view of profiles (#10491)	2019-04-07 04:59:13 +02:00
account_gallery	Bring back crossed eye icon on gallery (#10715)	2019-05-08 18:01:33 +02:00
account_timeline	Change single-column mode to scroll the whole page (#11359)	2019-07-19 09:25:22 +02:00
blocks	Change single-column mode to scroll the whole page (#11359)	2019-07-19 09:25:22 +02:00
community_timeline	Change single-column mode to scroll the whole page (#11359)	2019-07-19 09:25:22 +02:00
compose	Merge branch 'master' into glitch-soc/merge-upstream	2019-07-19 18:26:49 +02:00
direct_timeline	When selecting a toot via keyboard, ensure it is scrolled into view (#10593)	2019-05-03 06:20:35 +02:00
domain_blocks	Change single-column mode to scroll the whole page (#11359)	2019-07-19 09:25:22 +02:00
emoji	Add categories for custom emojis (#11196)	2019-06-28 15:54:10 +02:00
favourited_statuses	Change single-column mode to scroll the whole page (#11359)	2019-07-19 09:25:22 +02:00
favourites	Change single-column mode to scroll the whole page (#11359)	2019-07-19 09:25:22 +02:00
follow_requests	Change single-column mode to scroll the whole page (#11359)	2019-07-19 09:25:22 +02:00
followers	Change single-column mode to scroll the whole page (#11359)	2019-07-19 09:25:22 +02:00
following	Change single-column mode to scroll the whole page (#11359)	2019-07-19 09:25:22 +02:00
generic_not_found	Replace sprockets/browserify with Webpack (#2617)	2017-05-03 02:04:16 +02:00
getting_started	Refactor footers in web UI into a single component (#10846)	2019-05-27 21:58:41 +02:00
hashtag_timeline	Change single-column mode to scroll the whole page (#11359)	2019-07-19 09:25:22 +02:00
home_timeline	Change single-column mode to scroll the whole page (#11359)	2019-07-19 09:25:22 +02:00
introduction	change "finish tutorial" text to "finish toot-orial" (#9905)	2019-02-04 04:45:29 +01:00
keyboard_shortcuts	Add a keyboard shortcut to hide/show media (#10647)	2019-05-25 23:20:51 +02:00
list_adder	Refactor icons in web UI to use Icon component (#9951)	2019-02-01 00:14:05 +01:00
list_editor	Add list title editing (#9748)	2019-02-13 18:52:02 +01:00
list_timeline	Change single-column mode to scroll the whole page (#11359)	2019-07-19 09:25:22 +02:00
lists	Change single-column mode to scroll the whole page (#11359)	2019-07-19 09:25:22 +02:00
mutes	Change single-column mode to scroll the whole page (#11359)	2019-07-19 09:25:22 +02:00
notifications	Change single-column mode to scroll the whole page (#11359)	2019-07-19 09:25:22 +02:00
pinned_statuses	Change single-column mode to scroll the whole page (#11359)	2019-07-19 09:25:22 +02:00
public_timeline	Change single-column mode to scroll the whole page (#11359)	2019-07-19 09:25:22 +02:00
reblogs	Change single-column mode to scroll the whole page (#11359)	2019-07-19 09:25:22 +02:00
report	Add blurhash (#10630)	2019-04-27 03:24:09 +02:00
search	Add responsive panels to the single-column layout (#10820)	2019-05-25 21:27:00 +02:00
standalone	Disable real-time updates on public pages to improve readability (#10260)	2019-03-18 18:34:56 +01:00
status	Memoize ancestorIds and descendantIds in detailed status view (#11234)	2019-07-02 16:03:54 +02:00
ui	Change single-column mode to scroll the whole page (#11359)	2019-07-19 09:25:22 +02:00
video	Add option to disable blurhash previews (#11188)	2019-06-26 19:33:04 +02:00