Merge branch 'develop' into styling/patch_fixes_for_theme_colors
This commit is contained in:
commit
a84ccff4cc
@ -182,7 +182,7 @@ class SwitchingColumnsArea extends React.PureComponent {
|
||||
|
||||
return (
|
||||
<Switch>
|
||||
<Redirect from='/' to='/home' exact />
|
||||
{/* <Redirect from='/' to='/home' exact /> */}
|
||||
<WrappedRoute path='/home' exact layout={LAYOUT.HOME} component={HomeTimeline} content={children} />
|
||||
|
||||
<WrappedRoute path='/groups' component={Groups} content={children} />
|
||||
|
@ -42,12 +42,30 @@ self.addEventListener('fetch', function(event) {
|
||||
return response;
|
||||
}));
|
||||
} else if (
|
||||
url.pathname.startsWith('/system/') ||
|
||||
url.pathname.startsWith('/api/') ||
|
||||
url.pathname.startsWith('/settings/') ||
|
||||
url.pathname.startsWith('/media/') ||
|
||||
url.pathname.startsWith('/admin/') ||
|
||||
url.pathname.startsWith('/about/')) {
|
||||
url.pathname.startsWith('/system') ||
|
||||
url.pathname.startsWith('/api') ||
|
||||
url.pathname.startsWith('/settings') ||
|
||||
url.pathname.startsWith('/media') ||
|
||||
url.pathname.startsWith('/admin') ||
|
||||
url.pathname.startsWith('/about') ||
|
||||
url.pathname.startsWith('/auth') ||
|
||||
url.pathname.startsWith('/oauth') ||
|
||||
url.pathname.startsWith('/invites') ||
|
||||
url.pathname.startsWith('/pghero') ||
|
||||
url.pathname.startsWith('/sidekiq') ||
|
||||
url.pathname.startsWith('/filters') ||
|
||||
url.pathname.startsWith('/tags') ||
|
||||
url.pathname.startsWith('/emojis') ||
|
||||
url.pathname.startsWith('/inbox') ||
|
||||
url.pathname.startsWith('/accounts') ||
|
||||
url.pathname.startsWith('/user') ||
|
||||
url.pathname.startsWith('/users') ||
|
||||
url.pathname.startsWith('/src') ||
|
||||
url.pathname.startsWith('/public') ||
|
||||
url.pathname.startsWith('/avatars') ||
|
||||
url.pathname.startsWith('/authorize_follow') ||
|
||||
url.pathname.startsWith('/media_proxy') ||
|
||||
url.pathname.startsWith('/relationships')) {
|
||||
//non-webapp routes
|
||||
} else if (url.pathname.startsWith('/')) {
|
||||
// : TODO : if is /web
|
||||
|
Loading…
x
Reference in New Issue
Block a user