moon
/
soapbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'public-timelines' into 'develop' 

Let public timelines be viewed

See merge request soapbox-pub/soapbox-fe!437
This commit is contained in:
Alex Gleason 2021-01-28 02:54:23 +00:00
parent da7e6cc17e 5d418d9269
commit e1d77a7012
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/soapbox/features/ui/index.js
View File

@ -213,8 +213,8 @@ class SwitchingColumnsArea extends React.PureComponent {
<WrappedRoute path='/auth/mfa' layout={LAYOUT.DEFAULT} component={MfaForm} exact />
<WrappedRoute path='/' exact page={HomePage} component={HomeTimeline} content={children} />
<WrappedRoute path='/timeline/local' exact page={HomePage} component={CommunityTimeline} content={children} />
<WrappedRoute path='/timeline/fediverse' exact page={HomePage} component={PublicTimeline} content={children} />
<WrappedRoute path='/timeline/local' exact page={HomePage} component={CommunityTimeline} content={children} publicRoute />
<WrappedRoute path='/timeline/fediverse' exact page={HomePage} component={PublicTimeline} content={children} publicRoute />
<WrappedRoute path='/timeline/:instance' exact page={HomePage} component={RemoteTimeline} content={children} />
<WrappedRoute path='/messages' layout={LAYOUT.DEFAULT} component={DirectTimeline} content={children} componentParams={{ shouldUpdateScroll: this.shouldUpdateScroll }} />

4
app/soapbox/pages/home_page.js
View File

@ -49,7 +49,7 @@ class HomePage extends ImmutablePureComponent {
<div className='columns-area__panels__main'>
<div className='columns-area columns-area--mobile'>
<div className='timeline-compose-block' ref={this.composeBlock}>
{me && <div className='timeline-compose-block' ref={this.composeBlock}>
<div className='timeline-compose-block__avatar'>
<Avatar account={account} size={46} />
</div>
@ -58,7 +58,7 @@ class HomePage extends ImmutablePureComponent {
autoFocus={false}
clickableAreaRef={this.composeBlock}
/>
</div>
</div>}
{children}
</div>