matty/ncd-fe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
36e634b0aae328829f7259bc2c4a95c98d2c8146
ncd-fe/app/soapbox/features
History
Curtis 36e634b0aa Resolved merge conflicts 
Merge branch 'develop' into 'timeline-word-filters'

# Conflicts:
#   app/soapbox/components/sidebar_menu.js
#   app/styles/application.scss
2020-08-07 20:46:44 +00:00
..
about
…
account/components
Added Admin settings opening in new tab
2020-08-07 12:58:59 -05:00
account_gallery
…
account_timeline
…
audio
…
auth_login/components
Multi-Factor Auth with OTP
2020-08-07 20:17:13 +00:00
blocks
…
bookmarks
Bookmarks: don't update constantly, fixes #263
2020-07-30 00:38:40 -05:00
community_timeline
…
compose
Resolved merge conflicts
2020-08-07 20:46:44 +00:00
direct_timeline
…
domain_blocks
…
edit_profile
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
emoji
…
explore
…
favourited_statuses
…
favourites
…
filters
styles on filter form
2020-08-04 21:57:54 -05:00
follow_requests
…
followers
…
following
…
forms
add and remove muted words, filters
2020-08-04 21:15:16 -05:00
generic_not_found
…
getting_started
…
groups
…
hashtag_timeline
…
home_timeline
…
introduction
…
landing_page
update reason or joining form to simpletextarea
2020-07-28 21:43:27 -05:00
list_adder
…
list_editor
…
list_timeline
…
lists
…
mutes
…
notifications
Toggle for all notification sounds
2020-08-06 11:54:58 -06:00
pinned_statuses
…
preferences
…
profile_hover_card
HoverCard: Fix JS console errors
2020-08-02 21:05:21 -05:00
public_layout
Multi-Factor Auth with OTP
2020-08-07 20:17:13 +00:00
public_timeline
…
reblogs
…
report
…
search
…
security
Multi-Factor Auth with OTP
2020-08-07 20:17:13 +00:00
standalone
…
status
only render emoji selector in the dom when needed
2020-08-05 15:53:30 -05:00
ui
Multi-Factor Auth with OTP
2020-08-07 20:17:13 +00:00
video
…