matty/ncd-fe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
ea94b0560840efccfc75f6f56c6fb8bab560a4c4
ncd-fe/app/soapbox/components
History
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__
Fix avatar tests
2020-06-15 16:43:24 -03:00
account.js
gabsocial --> soapbox paths
2020-05-28 17:56:55 -05:00
attachment_list.js
gabsocial --> soapbox paths
2020-05-28 17:56:55 -05:00
autosuggest_emoji.js
gabsocial --> soapbox paths
2020-05-28 17:56:55 -05:00
autosuggest_input.js
componentWillReceiveProps fixes, fixes #184, #231, !80
2020-07-04 19:14:12 -05:00
autosuggest_textarea.js
componentWillReceiveProps fixes, fixes #184, #231, !80
2020-07-04 19:14:12 -05:00
avatar_composite.js
Handle autoPlayGif for avatars and banners
2020-06-15 16:43:24 -03:00
avatar_overlay.js
Handle autoPlayGif for avatars and banners
2020-06-15 16:43:24 -03:00
avatar.js
Handle autoPlayGif for avatars and banners
2020-06-15 16:43:24 -03:00
badge.js
gabsocial --> soapbox paths
2020-05-28 17:56:55 -05:00
button.js
gabsocial --> soapbox paths
2020-05-28 17:56:55 -05:00
column_back_button_slim.js
gabsocial --> soapbox paths
2020-05-28 17:56:55 -05:00
column_back_button.js
gabsocial --> soapbox paths
2020-05-28 17:56:55 -05:00
column_header.js
gabsocial --> soapbox paths
2020-05-28 17:56:55 -05:00
column.js
gabsocial --> soapbox paths
2020-05-28 17:56:55 -05:00
display_name.js
Verified: Use getIn in display_name.js
2020-08-05 18:04:32 +00:00
domain.js
gabsocial --> soapbox paths
2020-05-28 17:56:55 -05:00
dropdown_menu.js
gabsocial --> soapbox paths
2020-05-28 17:56:55 -05:00
emoji_selector.js
gabsocial --> soapbox paths
2020-05-28 17:56:55 -05:00
error_boundary.js
gabsocial --> soapbox paths
2020-05-28 17:56:55 -05:00
extended_video_player.js
gabsocial --> soapbox paths
2020-05-28 17:56:55 -05:00
hashtag.js
Search: Conditionally display hashtag features, fixes #142
2020-06-07 14:09:33 -05:00
helmet.js
gabsocial --> soapbox paths
2020-05-28 17:56:55 -05:00
home_column_header.js
Final fixes to the switch from Font Awesome to Fork Awesome
2020-06-26 22:47:48 -06:00
icon_button.js
gabsocial --> soapbox paths
2020-05-28 17:56:55 -05:00
icon_with_badge.js
gabsocial --> soapbox paths
2020-05-28 17:56:55 -05:00
icon.js
Final fixes to the switch from Font Awesome to Fork Awesome
2020-06-26 22:47:48 -06:00
intersection_observer_article.js
gabsocial --> soapbox paths
2020-05-28 17:56:55 -05:00
load_gap.js
gabsocial --> soapbox paths
2020-05-28 17:56:55 -05:00
load_more.js
gabsocial --> soapbox paths
2020-05-28 17:56:55 -05:00
loading_indicator.js
Add missing <span> tags back to some FormattedMessages
2020-06-04 18:11:24 -05:00
media_gallery.js
componentWillReceiveProps fixes, fixes #184, #231, !80
2020-07-04 19:14:12 -05:00
missing_indicator.js
gabsocial --> soapbox paths
2020-05-28 17:56:55 -05:00
modal_root.js
componentWillReceiveProps fixes, fixes #184, #231, !80
2020-07-04 19:14:12 -05:00
more_follows.js
Pluralize messages on more_follows.js
2020-06-06 14:06:45 -05:00
permalink.js
gabsocial --> soapbox paths
2020-05-28 17:56:55 -05:00
poll.js
gabsocial --> soapbox paths
2020-05-28 17:56:55 -05:00
progress_bar.js
gabsocial --> soapbox paths
2020-05-28 17:56:55 -05:00
relative_timestamp.js
componentWillReceiveProps fixes, fixes #184, #231, !80
2020-07-04 19:14:12 -05:00
scrollable_list.js
Fix empty column display
2020-06-12 16:46:46 -05:00
setting_text.js
gabsocial --> soapbox paths
2020-05-28 17:56:55 -05:00
settings_checkbox.js
Moved settings_checkbox to components primary folder. Created features/configuration.
2020-07-20 18:18:54 -05:00
sidebar_menu.js
Resolve merge conflicts
2020-08-09 23:02:48 +00:00
status_action_bar.js
only render emoji selector in the dom when needed
2020-08-05 15:53:30 -05:00
status_content.js
gabsocial --> soapbox paths
2020-05-28 17:56:55 -05:00
status_list.js
TimelineQueueButtonHeader: Make more i18n friendly
2020-06-07 11:26:08 -05:00
status.js
Only render a hover profile card in the dom when relevant
2020-08-05 14:27:42 -05:00
still_image.js
Handle autoPlayGif for avatars and banners
2020-06-15 16:43:24 -03:00
timeline_queue_button_header.js
TimelineQueueButtonHeader: Make more i18n friendly
2020-06-07 11:26:08 -05:00
verification_badge.js
gabsocial --> soapbox paths
2020-05-28 17:56:55 -05:00