Curtis ea94b05608 Resolve merge conflicts ...

Merge branch 'develop' into 'admin_cfg'

# Conflicts:
#   app/soapbox/features/compose/components/action_bar.js
#   app/soapbox/features/edit_profile/index.js

2020-08-09 23:02:48 +00:00

..

__tests__

Resolve merge conflicts

2020-08-09 23:02:48 +00:00

accounts_counters.js

…

accounts.js

Refactor account reducer

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

alerts.js

…

auth.js

…

compose.js

Merge remote-tracking branch 'origin/develop' into add-markdown-posts

2020-07-28 14:00:25 -05:00

contexts.js

…

conversations.js

…

custom_emojis.js

…

domain_lists.js

…

dropdown_menu.js

…

filters.js

…

group_editor.js

…

group_lists.js

…

group_relationships.js

…

groups.js

…

height_cache.js

…

identity_proofs.js

…

index.js

…

instance.js

Handle max_fields fallback differently

2020-08-09 14:01:16 -05:00

list_adder.js

…

list_editor.js

…

lists.js

…

me.js

Use distinct ME_PATCH_SUCCESS action for responding to account updates

2020-06-16 17:36:49 -05:00

media_attachments.js

Audio player work (change of sensitive content handling)

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

meta.js

Use distinct ME_PATCH_SUCCESS action for responding to account updates

2020-06-16 17:36:49 -05:00

modal.js

…

mutes.js

…

notifications.js

…

patron.js

Show donor badge

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

polls.js

…

push_notifications.js

…

relationships.js

Pleroma relationship fixes

2020-08-02 21:45:42 -05:00

reports.js

…

search.js

…

settings.js

Use distinct ME_PATCH_SUCCESS action for responding to account updates

2020-06-16 17:36:49 -05:00

sidebar.js

…

soapbox.js

SB settings Save works and brandcolor renders. Logo/banner paths are issues, and adding new homefooter/customCSS are issues

2020-08-01 16:38:29 -05:00

status_lists.js

Bookmark posts

2020-07-29 21:08:36 +00:00

statuses.js

…

suggestions.js

…

timelines.js

…

trends.js

…

user_lists.js

…