Thibaut Girka 8b4abaa90d Merge branch 'master' into glitch-soc/master ...

Conflicts:
	config/routes.rb

Added the “endorsements” route from upstream.

2018-08-21 18:24:48 +02:00

..

account/components

Show exact number of followers/statuses on export page/in tooltip (#8199)

2018-08-14 21:56:17 +02:00

account_gallery

Do not scroll up when modal is opened (#8095)

2018-07-29 16:52:06 +02:00

account_timeline

Public profile endorsements (accounts picked by profile owner) (#8146)

2018-08-09 09:56:53 +02:00

blocks

Do not scroll up when modal is opened (#8095)

2018-07-29 16:52:06 +02:00

community_timeline

Do not scroll up when modal is opened (#8095)

2018-07-29 16:52:06 +02:00

compose

Merge branch 'master' into glitch-soc/master

2018-08-21 18:24:48 +02:00

direct_timeline

Do not scroll up when modal is opened (#8095)

2018-07-29 16:52:06 +02:00

domain_blocks

Do not scroll up when modal is opened (#8095)

2018-07-29 16:52:06 +02:00

emoji

…

favourited_statuses

Do not scroll up when modal is opened (#8095)

2018-07-29 16:52:06 +02:00

favourites

Do not scroll up when modal is opened (#8095)

2018-07-29 16:52:06 +02:00

follow_requests

Do not scroll up when modal is opened (#8095)

2018-07-29 16:52:06 +02:00

followers

Do not scroll up when modal is opened (#8095)

2018-07-29 16:52:06 +02:00

following

Do not scroll up when modal is opened (#8095)

2018-07-29 16:52:06 +02:00

generic_not_found

…

getting_started

Link to mobile apps page (#8278)

2018-08-19 01:17:44 +02:00

hashtag_timeline

Do not scroll up when modal is opened (#8095)

2018-07-29 16:52:06 +02:00

home_timeline

Do not scroll up when modal is opened (#8095)

2018-07-29 16:52:06 +02:00

keyboard_shortcuts

…

list_editor

…

list_timeline

Do not scroll up when modal is opened (#8095)

2018-07-29 16:52:06 +02:00

lists

…

mutes

Do not scroll up when modal is opened (#8095)

2018-07-29 16:52:06 +02:00

notifications

…

pinned_statuses

Do not scroll up when modal is opened (#8095)

2018-07-29 16:52:06 +02:00

public_timeline

Do not scroll up when modal is opened (#8095)

2018-07-29 16:52:06 +02:00

reblogs

Do not scroll up when modal is opened (#8095)

2018-07-29 16:52:06 +02:00

report

…

standalone

…

status

Show compose form on delete & redraft when in mobile layout (#8277)

2018-08-19 03:17:01 +02:00

trends

…

ui

Add hotkey for follow requests (#8307)

2018-08-20 03:44:16 +02:00

video

Various fixes regarding the video position slider (#8201)

2018-08-14 21:51:17 +02:00