Curtis 6435bb0bc5 Resolved merge conflicts ...

Merge branch 'develop' into 'translate_public_header'

# Conflicts:
#   app/soapbox/features/public_layout/components/header.js

2020-08-07 20:53:42 +00:00

..

__fixtures__

add reason field on registration when by approval mode is on

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

__mocks__

…

actions

Multi-Factor Auth with OTP

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

components

Added Admin settings opening in new tab

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

containers

Merge branch 'profile-hover-cards' into 'develop'

2020-08-03 02:27:14 +00:00

features

Resolved merge conflicts

2020-08-07 20:53:42 +00:00

locales

Added translations for public_header text elements

2020-08-05 21:12:15 -05:00

middleware

…

pages

Show profile preview on hover

2020-07-28 14:15:57 -05:00

reducers

Store fieldsLimits in instance/pleroma/metadata of the Redux store. Render fields to maxFields value in features/edit_profile, using maxFields value

2020-08-04 18:05:16 -05:00

selectors

…

service_worker

…

storage

…

store

…

utils

…

api.js

…

base_polyfills.js

…

common.js

…

compare_id.js

…

extra_polyfills.js

…

initial_state.js

…

is_mobile.js

…

load_polyfills.js

…

main.js

…

performance.js

…

ready.js

…

rtl.js

…

settings.js

…

stream.js

…

test_helpers.js

…

test_setup.js

…

uuid.js

…