matty/ncd-fe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
ea94b0560840efccfc75f6f56c6fb8bab560a4c4
ncd-fe/app/soapbox/features
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
..
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
Resolve merge conflicts
2020-08-09 23:02:48 +00:00
configuration
Refactoring to use soapbox object as state. Still buggy
2020-08-09 11:03:24 -05:00
direct_timeline
gabsocial --> soapbox paths
2020-05-28 17:56:55 -05:00
domain_blocks
Replace componentWillMount with componentDidMount and as required, construct(). Fixes #179
2020-06-17 20:42:30 -05:00
edit_profile
Bio fixes
2020-08-09 15:13:36 -05:00
emoji
gabsocial --> soapbox paths
2020-05-28 17:56:55 -05:00
explore
gabsocial --> soapbox paths
2020-05-28 17:56:55 -05:00
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
Resolve merge conflicts
2020-08-09 23:02:48 +00:00
generic_not_found
gabsocial --> soapbox paths
2020-05-28 17:56:55 -05:00
getting_started
Favourite --> Like, fixes #167
2020-06-08 20:48:11 -05:00
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
gabsocial --> soapbox paths
2020-05-28 17:56:55 -05:00
list_editor
gabsocial --> soapbox paths
2020-05-28 17:56:55 -05:00
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
Moved settings_checkbox to components primary folder. Created features/configuration.
2020-07-20 18:18:54 -05:00
profile_hover_card
HoverCard: Fix JS console errors
2020-08-02 21:05:21 -05:00
public_layout
Resolve merge conflicts
2020-08-09 23:02:48 +00: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
gabsocial --> soapbox paths
2020-05-28 17:56:55 -05:00
status
only render emoji selector in the dom when needed
2020-08-05 15:53:30 -05:00
ui
Resolve merge conflicts
2020-08-09 23:02:48 +00:00
video
componentWillReceiveProps fixes, fixes #184, #231, !80
2020-07-04 19:14:12 -05:00