Thibaut Girka 1488be7d96 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- app/controllers/home_controller.rb
- app/controllers/shares_controller.rb
- app/javascript/packs/public.js
- app/models/status.rb
- app/serializers/initial_state_serializer.rb
- app/views/home/index.html.haml
- app/views/layouts/public.html.haml
- app/views/public_timelines/show.html.haml
- app/views/shares/show.html.haml
- app/views/tags/show.html.haml
- config/initializers/content_security_policy.rb
- config/locales/en.yml
- config/webpack/shared.js
- package.json

2019-08-19 21:49:35 +02:00

..

account/components

Fix "cancel follow request" button having unreadable text in web UI (#11521)

2019-08-08 08:56:55 +02:00

account_gallery

Fix scroll to top in single column UI (#11463)

2019-08-01 19:17:17 +02:00

account_timeline

Fix scroll to top in single column UI (#11463)

2019-08-01 19:17:17 +02:00

blocks

Fix scroll to top in single column UI (#11463)

2019-08-01 19:17:17 +02:00

community_timeline

Fix scroll to top in single column UI (#11463)

2019-08-01 19:17:17 +02:00

compose

Merge branch 'master' into glitch-soc/merge-upstream

2019-08-19 21:49:35 +02:00

direct_timeline

Fix scroll to top in single column UI (#11463)

2019-08-01 19:17:17 +02:00

domain_blocks

Fix scroll to top in single column UI (#11463)

2019-08-01 19:17:17 +02:00

emoji

Play animated custom emoji on hover (#11348)

2019-07-21 18:10:40 +02:00

favourited_statuses

Fix scroll to top in single column UI (#11463)

2019-08-01 19:17:17 +02:00

favourites

Fix scroll to top in single column UI (#11463)

2019-08-01 19:17:17 +02:00

follow_requests

Fix scroll to top in single column UI (#11463)

2019-08-01 19:17:17 +02:00

followers

Fix scroll to top in single column UI (#11463)

2019-08-01 19:17:17 +02:00

following

Fix scroll to top in single column UI (#11463)

2019-08-01 19:17:17 +02:00

generic_not_found

Replace sprockets/browserify with Webpack (#2617)

2017-05-03 02:04:16 +02:00

getting_started

Add trends UI with admin and user settings (#11502)

2019-08-06 17:57:52 +02:00

hashtag_timeline

Fix scroll to top in single column UI (#11463)

2019-08-01 19:17:17 +02:00

home_timeline

Fix scroll to top in single column UI (#11463)

2019-08-01 19:17:17 +02:00

introduction

change "finish tutorial" text to "finish toot-orial" (#9905)

2019-02-04 04:45:29 +01:00

keyboard_shortcuts

Fix scroll to top in single column UI (#11463)

2019-08-01 19:17:17 +02:00

list_adder

Refactor icons in web UI to use Icon component (#9951)

2019-02-01 00:14:05 +01:00

list_editor

Disable list title validation button when list title is empty (#11475)

2019-08-03 19:10:39 +02:00

list_timeline

Fix scroll to top in single column UI (#11463)

2019-08-01 19:17:17 +02:00

lists

Disable list title validation button when list title is empty (#11475)

2019-08-03 19:10:39 +02:00

mutes

Fix scroll to top in single column UI (#11463)

2019-08-01 19:17:17 +02:00

notifications

Fix scroll to top in single column UI (#11463)

2019-08-01 19:17:17 +02:00

pinned_statuses

Fix scroll to top in single column UI (#11463)

2019-08-01 19:17:17 +02:00

public_timeline

Fix scroll to top in single column UI (#11463)

2019-08-01 19:17:17 +02:00

reblogs

Fix scroll to top in single column UI (#11463)

2019-08-01 19:17:17 +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

Revert "Change links in webUI to rewrite misleading links (#11426)" (#11500)

2019-08-06 12:09:28 +02:00

ui

Improve focal point modal on mobile (#11575)

2019-08-15 22:49:00 +02:00

video

Add media editing modal (#11563)

2019-08-14 04:07:32 +02:00