Merge pull request #872 from neuroscr/update

loki-messenger => session-desktop
pull/881/head
Ryan Tharp 5 years ago committed by GitHub
commit 0b25ab7fac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -11,7 +11,7 @@ for it or creating a new one yourself. You can use also that issue as a place to
your intentions and get feedback from the users most likely to appreciate your changes.
You're most likely to have your pull request accepted easily if it addresses bugs already
in the [Next Steps project](https://github.com/loki-project/loki-messenger/projects/1),
in the [Next Steps project](https://github.com/loki-project/session-desktop/projects/1),
especially if they are near the top of the Backlog column. Those are what we'll be looking
at next, so it would be great if you helped us out!
@ -22,7 +22,7 @@ ounce of prevention, as they say!](https://www.goodreads.com/quotes/247269-an-ou
## Developer Setup
First, you'll need [Node.js](https://nodejs.org/) which matches our current version.
You can check [`.nvmrc` in the `development` branch](https://github.com/loki-project/loki-messenger/blob/development/.nvmrc) to see what the current version is. If you have [nvm](https://github.com/creationix/nvm)
You can check [`.nvmrc` in the `development` branch](https://github.com/loki-project/session-desktop/blob/development/.nvmrc) to see what the current version is. If you have [nvm](https://github.com/creationix/nvm)
you can just run `nvm use` in the project directory and it will switch to the project's
desired Node.js version. [nvm for windows](https://github.com/coreybutler/nvm-windows) is
still useful, but it doesn't support `.nvmrc` files.
@ -56,8 +56,8 @@ Then you need `git`, if you don't have that yet: https://git-scm.com/
Now, run these commands in your preferred terminal in a good directory for development:
```
git clone https://github.com/loki-project/loki-messenger.git
cd loki-messenger
git clone https://github.com/loki-project/session-desktop.git
cd session-desktop
npm install --global yarn # (only if you dont already have `yarn`)
yarn install --frozen-lockfile # Install and build dependencies (this will take a while)
yarn grunt # Generate final JS and CSS assets
@ -115,7 +115,7 @@ NODE_APP_INSTANCE=alice yarn run start
```
This changes the [userData](https://electron.atom.io/docs/all/#appgetpathname)
directory from `%appData%/Loki-Messenger` to `%appData%/Loki-Messenger-aliceProfile`.
directory from `%appData%/Session` to `%appData%/Session-aliceProfile`.
# Making changes

@ -1,7 +1,7 @@
{
"name": "loki-messenger",
"name": "session-desktop",
"version": "0.0.0",
"homepage": "https://github.com/loki-project/loki-messenger",
"homepage": "https://github.com/loki-project/session-desktop",
"license": "GPLV3",
"private": true,
"dependencies": {

@ -41,7 +41,7 @@
</div>
<p>
<a class='report-link' target='_blank'
href='https://github.com/loki-project/loki-messenger/issues/new/'>
href='https://github.com/loki-project/session-desktop/issues/new/'>
{{ reportIssue }}
</a>
</p>

@ -57,7 +57,7 @@ exports.upload = async content => {
form.append('Content-Type', contentType);
form.append('file', contentBuffer, {
contentType,
filename: `loki-messenger-debug-log-${VERSION}.txt`,
filename: `session-desktop-debug-log-${VERSION}.txt`,
});
// WORKAROUND: See comment on `submitFormData`:

@ -428,19 +428,19 @@ ipc.on('ready-for-updates', async () => {
function openReleaseNotes() {
shell.openExternal(
`https://github.com/loki-project/loki-messenger/releases/tag/v${app.getVersion()}`
`https://github.com/loki-project/session-desktop/releases/tag/v${app.getVersion()}`
);
}
function openNewBugForm() {
shell.openExternal(
'https://github.com/loki-project/loki-messenger/issues/new'
'https://github.com/loki-project/session-desktop/issues/new'
);
}
function openSupportPage() {
shell.openExternal(
'https://loki-project.github.io/loki-docs/LokiServices/Messenger/'
'https://docs.loki.network/LokiServices/Messenger/Session/'
);
}

Loading…
Cancel
Save