Curtis 675f580d60 Resolve merge conflicts ...

Merge branch 'develop' into 'translate_public_header'

# Conflicts:
#   app/soapbox/locales/ar.json
#   app/soapbox/locales/ast.json
#   app/soapbox/locales/bg.json
#   app/soapbox/locales/bn.json
#   app/soapbox/locales/br.json
#   app/soapbox/locales/ca.json
#   app/soapbox/locales/co.json
#   app/soapbox/locales/cs.json
#   app/soapbox/locales/cy.json
#   app/soapbox/locales/da.json
#   app/soapbox/locales/de.json
#   app/soapbox/locales/defaultMessages.json
#   app/soapbox/locales/el.json
#   app/soapbox/locales/en.json
#   app/soapbox/locales/eo.json
#   app/soapbox/locales/es-AR.json
#   app/soapbox/locales/es.json
#   app/soapbox/locales/et.json
#   app/soapbox/locales/eu.json
#   app/soapbox/locales/fa.json
#   app/soapbox/locales/fi.json
#   app/soapbox/locales/fr.json
#   app/soapbox/locales/ga.json
#   app/soapbox/locales/gl.json
#   app/soapbox/locales/he.json
#   app/soapbox/locales/hi.json
#   app/soapbox/locales/hr.json
#   app/soapbox/locales/hu.json
#   app/soapbox/locales/hy.json
#   app/soapbox/locales/id.json
#   app/soapbox/locales/io.json
#   app/soapbox/locales/it.json
#   app/soapbox/locales/ja.json
#   app/soapbox/locales/ka.json
#   app/soapbox/locales/kk.json
#   app/soapbox/locales/ko.json
#   app/soapbox/locales/lt.json
#   app/soapbox/locales/lv.json
#   app/soapbox/locales/mk.json
#   app/soapbox/locales/ms.json
#   app/soapbox/locales/nl.json
#   app/soapbox/locales/nn.json
#   app/soapbox/locales/no.json
#   app/soapbox/locales/oc.json
#   app/soapbox/locales/pl.json
#   app/soapbox/locales/pt-BR.json
#   app/soapbox/locales/pt.json
#   app/soapbox/locales/ro.json
#   app/soapbox/locales/ru.json
#   app/soapbox/locales/sk.json
#   app/soapbox/locales/sl.json
#   app/soapbox/locales/sq.json
#   app/soapbox/locales/sr-Latn.json
#   app/soapbox/locales/sr.json
#   app/soapbox/locales/sv.json
#   app/soapbox/locales/ta.json
#   app/soapbox/locales/te.json
#   app/soapbox/locales/th.json
#   app/soapbox/locales/tr.json
#   app/soapbox/locales/uk.json
#   app/soapbox/locales/zh-CN.json
#   app/soapbox/locales/zh-HK.json
#   app/soapbox/locales/zh-TW.json

2020-08-13 22:28:27 +00:00

..

about

Replace componentWillMount with componentDidMount and as required, construct(). Fixes #179

2020-06-17 20:42:30 -05:00

account/components

Added Admin settings opening in new tab

2020-08-07 12:58:59 -05:00

account_gallery

componentWillReceiveProps fixes, fixes #184, #231, !80

2020-07-04 19:14:12 -05:00

account_timeline

Show donor badge

2020-07-04 21:25:43 -05:00

audio

Audio player work (change of sensitive content handling)

2020-07-02 16:31:48 -05:00

auth_login/components

Multi-Factor Auth with OTP

2020-08-07 20:17:13 +00:00

blocks

Replace componentWillMount with componentDidMount and as required, construct(). Fixes #179

2020-06-17 20:42:30 -05:00

bookmarks

Bookmarks: don't update constantly, fixes #263

2020-07-30 00:38:40 -05:00

community_timeline

timeline filtering improvements

2020-08-07 19:28:30 -05:00

compose

add video and audio media placeholders in compose form

2020-08-10 20:59:24 -05:00

direct_timeline

…

domain_blocks

Replace componentWillMount with componentDidMount and as required, construct(). Fixes #179

2020-06-17 20:42:30 -05:00

edit_profile

Fix edit profile checkbox state, fixes #261 #284

2020-08-10 16:17:39 -05:00

emoji

…

explore

…

favourited_statuses

Replace componentWillMount with componentDidMount and as required, construct(). Fixes #179

2020-06-17 20:42:30 -05:00

favourites

componentWillReceiveProps fixes, fixes #184, #231, !80

2020-07-04 19:14:12 -05:00

filters

styles on filter form

2020-08-04 21:57:54 -05:00

follow_requests

Replace componentWillMount with componentDidMount and as required, construct(). Fixes #179

2020-06-17 20:42:30 -05:00

followers

componentWillReceiveProps fixes, fixes #184, #231, !80

2020-07-04 19:14:12 -05:00

following

componentWillReceiveProps fixes, fixes #184, #231, !80

2020-07-04 19:14:12 -05:00

forms

add and remove muted words, filters

2020-08-04 21:15:16 -05:00

generic_not_found

…

getting_started

…

groups

React 17.x upgrade fixes

2020-07-04 19:32:07 -05:00

hashtag_timeline

componentWillReceiveProps fixes, fixes #184, #231, !80

2020-07-04 19:14:12 -05:00

home_timeline

add DM filter option for Home timeline, fixes #254

2020-08-07 20:47:04 -05:00

introduction

React 17.x upgrade fixes

2020-07-04 19:32:07 -05:00

landing_page

update reason or joining form to simpletextarea

2020-07-28 21:43:27 -05:00

list_adder

…

list_editor

…

list_timeline

componentWillReceiveProps fixes, fixes #184, #231, !80

2020-07-04 19:14:12 -05:00

lists

Replace componentWillMount with componentDidMount and as required, construct(). Fixes #179

2020-06-17 20:42:30 -05:00

mutes

Replace componentWillMount with componentDidMount and as required, construct(). Fixes #179

2020-06-17 20:42:30 -05:00

notifications

Toggle for all notification sounds

2020-08-06 11:54:58 -06:00

pinned_statuses

Replace componentWillMount with componentDidMount and as required, construct(). Fixes #179

2020-06-17 20:42:30 -05:00

preferences

Light/dark theme toggle in top navbar

2020-07-10 22:35:02 -06:00

profile_hover_card

fixes #278, large awaiting approval button

2020-08-10 12:23:59 -05:00

public_layout

Added suffix to Back to <instance> button on public_layout header and created translations

2020-08-07 16:58:10 -05:00

public_timeline

timeline filtering improvements

2020-08-07 19:28:30 -05:00

reblogs

componentWillReceiveProps fixes, fixes #184, #231, !80

2020-07-04 19:14:12 -05:00

report

Audio player work (change of sensitive content handling)

2020-07-02 16:31:48 -05:00

search

componentWillReceiveProps fixes, fixes #184, #231, !80

2020-07-04 19:14:12 -05:00

security

Multi-Factor Auth with OTP

2020-08-07 20:17:13 +00:00

standalone

…

status

Revert "only render emoji selector in the dom when needed"

2020-08-10 15:06:39 -05:00

ui

Translation strings for FeaturesPanel

2020-08-10 21:03:28 -06:00

video

Revert "Remove unnecessary video preview url that was fixing video previews"

2020-08-11 00:12:26 +00:00