Merge branch 'master' into staging

# Conflicts:
#	public/config.json
#	src/pages/About.tsx
This commit is contained in:
Marquis Kurt 2019-11-02 15:23:52 -04:00
commit 19139ae732
No known key found for this signature in database
GPG Key ID: 725636D259F5402D
5 changed files with 13 additions and 4 deletions

View File

@ -108,6 +108,12 @@ For the child ones (inherited `entitlements.mas.inherit.plist`):
- `com.apple.security.app-sandbox`
- `com.apple.security.inherit`
- `com.apple.security.files.downloads.read-write`
- `com.apple.security.files.user-selected.read-write`
- `com.apple.security.allow-unsigned-executable-memory`
- `com.apple.security.network.client`
> ⚠️ Note that the inherited permissions are the same as that of the parent. This is due to an issue where the hardened runtime fails to pass down the inherited properties (see [electron/electron#20560](https://github.com/electron/electron/issues/20560#issuecomment-546110018)). This might change in future versions of macOS.
It is also recommended to add the `com.apple.security.applications-groups` entry with your bundle's identifier. You'll also need to create an `info.plist` in the `desktop` directory containing the team identifier and application identifier and install the developer certificates on the Mac you plan to build from.

View File

@ -1,7 +1,7 @@
{
"name": "hyperspace",
"productName": "Hyperspace",
"version": "1.0.1",
"version": "1.0.2",
"description": "A beautiful, fluffy client for the fediverse",
"author": "Marquis Kurt <hyperspacedev@marquiskurt.net>",
"repository": "https://github.com/hyperspacedev/hyperspace.git",

View File

@ -1,5 +1,5 @@
{
"version": "1.0.1",
"version": "1.0.2",
"location": "https://hyperspaceapp-next.herokuapp.com",
"branding": {
"name": "Hyperspace",
@ -24,4 +24,4 @@
"url": "https://thufie.lain.haus/NPL.html"
},
"repository": "https://github.com/hyperspacedev/hyperspace"
}
}

View File

@ -14,6 +14,9 @@ export const styles = (theme: Theme) =>
backgroundColor: theme.palette.secondary.main,
marginBottom: theme.spacing.unit
},
postReblogMenu: {
outline: "none"
},
postContent: {
paddingTop: 0,
paddingBottom: 0,

View File

@ -798,7 +798,7 @@ export class Post extends React.Component<any, IPostState> {
}}
/>
{post.reblog ? (
<div>
<div className={classes.postReblogMenu}>
<LinkableMenuItem
to={`/profile/${post.reblog.account.id}`}
>