inex/index.community
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'develop' into 'production'

Browse source 
update GitHub links -> GitLab, allow CORS from all subdomains

See merge request taobojlen/fediverse.space!44
This commit is contained in:
Tao Bojlén 2019-02-27 09:11:20 +00:00
parent 2a178ee5ff 648f225772
commit c7b5c862f1
4 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -1,4 +1,4 @@
# fediverse.space 🌐 [![Netlify Status](https://api.netlify.com/api/v1/badges/ddc939c0-c12f-4e0e-8ca3-cf6abe8b9a5a/deploy-status)](https://app.netlify.com/sites/sharp-curran-4b66d3/deploys) # fediverse.space 🌐
The map of the fediverse that you always wanted. The map of the fediverse that you always wanted.
![A screenshot of fediverse.space](screenshot.png) ![A screenshot of fediverse.space](screenshot.png)

8
backend/backend/settings/production.py
View file

@ -4,9 +4,7 @@ DEBUG = False
ALLOWED_HOSTS = ['backend.fediverse.space'] ALLOWED_HOSTS = ['backend.fediverse.space']
CORS_ORIGIN_WHITELIST = [ CORS_ORIGIN_REGEX_WHITELIST = [
'fediverse.space', r'^(https?:\/\/)?(\w+\.)?(.*)?fediverse-space\.netlify\.com\/?$',
'www.fediverse.space', r'^(https?:\/\/)?(\w+\.)?(.*)?fediverse\.space\/?$',
'staging.fediverse.space',
] ]
CORS_ORIGIN_REGEX_WHITELIST = (r'^(https?:\/\/)?(\w+\.)?(.*)?fediverse-space\.netlify\.com\/?$', )

2
frontend/src/components/Nav.tsx
View file

@ -106,7 +106,7 @@ export class Nav extends React.Component<{}, INavState> {
</li> </li>
</ul> </ul>
The source code for fediverse.space is available on{' '} The source code for fediverse.space is available on{' '}
<a href="https://github.com/brortao/fediverse.space" target="_blank">GitHub</a>;{' '} <a href="https://gitlab.com/taobojlen/fediverse.space" target="_blank">GitLab</a>;{' '}
issues and pull requests are welcome! issues and pull requests are welcome!
</p> </p>
</div> </div>

4
frontend/src/components/Sidebar.tsx
View file

@ -268,8 +268,8 @@ class SidebarImpl extends React.Component<ISidebarProps, ISidebarState> {
icon={IconNames.BLOCKED_PERSON} icon={IconNames.BLOCKED_PERSON}
title="No data" title="No data"
description="This instance has fewer than 5 users. It was not crawled in order to protect their privacy, but if it's your instance you can opt in." description="This instance has fewer than 5 users. It was not crawled in order to protect their privacy, but if it's your instance you can opt in."
action={<AnchorButton icon={IconNames.CONFIRM} href="https://github.com/brortao/fediverse.space/issues/new" target="_blank"> action={<AnchorButton icon={IconNames.CONFIRM} href="https://sunbeam.city/@tao" target="_blank">
Open a GitHub issue to opt in</AnchorButton>} Message @tao to opt in</AnchorButton>}
/> />
) )
} }