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

Conflicts:
	app/models/user.rb

Resolved by adding :default_language to user settings fields

2018-06-21 20:49:57 +02:00

..

account/components

Adjust account__action-bar contents (#7818)

2018-06-16 12:57:25 +02:00

account_gallery

Fix LoadMore on account media gallery (#6933)

2018-03-27 16:53:52 +02:00

account_timeline

Fix domain hiding logic (#7765)

2018-06-09 22:46:54 +02:00

blocks

Replace react-router-scroll to react-router-scroll-4 (#5568)

2017-11-01 06:58:38 +09:00

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

Replace onScrollToBottom with onLoadMore (#6615)

2018-03-05 19:31:40 +01:00

favourites

Replace react-router-scroll to react-router-scroll-4 (#5568)

2017-11-01 06:58:38 +09:00

follow_requests

Replace react-router-scroll to react-router-scroll-4 (#5568)

2017-11-01 06:58:38 +09:00

followers

Federate pinned statuses over ActivityPub (#6610)

2018-03-04 09:19:11 +01:00

following

Federate pinned statuses over ActivityPub (#6610)

2018-03-04 09:19:11 +01:00

generic_not_found

Replace sprockets/browserify with Webpack (#2617)

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

getting_started

Fix broken single column getting-started menu (Fix #7854) (#7862)

2018-06-20 15:22:07 +02:00

hashtag_timeline

Allow clients to fetch statuses made while they were offline (#6876)

2018-03-24 15:25:15 +01:00

home_timeline

Allow clients to fetch statuses made while they were offline (#6876)

2018-03-24 15:25:15 +01:00

keyboard_shortcuts

Add revealing/hiding statuses button to keyboard shortcuts legend column (#7178)

2018-04-18 13:15:57 +02:00

list_editor

Upgrade ESLint to version 4.x (#6276)

2018-01-17 16:57:15 +01:00

list_timeline

Change list icons different from the getting-started icons (#7838)

2018-06-18 15:33:11 +02:00

lists

Change list icons different from the getting-started icons (#7838)

2018-06-18 15:33:11 +02:00

mutes

Replace react-router-scroll to react-router-scroll-4 (#5568)

2017-11-01 06:58:38 +09:00

notifications

Improve load gap styling in web UI (#7100)

2018-04-10 17:12:10 +02:00

pinned_statuses

Add Pinned toot column (#4817)

2017-09-07 09:58:11 +02:00

public_timeline

Put "Media Only" option in column settings instead of content area headline (#7801)

2018-06-15 11:15:15 +02:00

reblogs

Replace react-router-scroll to react-router-scroll-4 (#5568)

2017-11-01 06:58:38 +09:00

report

Show media on report UI (#6619)

2018-03-04 20:29:12 +01:00

standalone

Allow clients to fetch statuses made while they were offline (#6876)

2018-03-24 15:25:15 +01:00

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

DataTransfer.types may Array-like object (#7827)

2018-06-18 01:10:58 +09:00

video

Open video modal on public UI (#7469)

2018-05-13 13:48:14 +02:00