From a85fc9d0bad5ff97f269ec3ef40dbf75bdc63338 Mon Sep 17 00:00:00 2001 From: Ryan Tharp Date: Mon, 17 Feb 2020 17:02:21 -0800 Subject: [PATCH 1/4] loki-messenger => session-desktop --- CONTRIBUTING.md | 8 ++++---- bower.json | 4 ++-- debug_log.html | 2 +- js/modules/debuglogs.js | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9795e48b9..5dbc997e0 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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 don’t already have `yarn`) yarn install --frozen-lockfile # Install and build dependencies (this will take a while) yarn grunt # Generate final JS and CSS assets diff --git a/bower.json b/bower.json index 04a267455..8b2fbba06 100644 --- a/bower.json +++ b/bower.json @@ -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": { diff --git a/debug_log.html b/debug_log.html index 414473fcf..f0b7b0262 100644 --- a/debug_log.html +++ b/debug_log.html @@ -41,7 +41,7 @@

+ href='https://github.com/loki-project/session-desktop/issues/new/'> {{ reportIssue }}

diff --git a/js/modules/debuglogs.js b/js/modules/debuglogs.js index 6bed2f0e4..81b00a5b8 100644 --- a/js/modules/debuglogs.js +++ b/js/modules/debuglogs.js @@ -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`: From 2fd279e5146f7a5c3c2f31e2875658935d8e4c65 Mon Sep 17 00:00:00 2001 From: Ryan Tharp Date: Mon, 17 Feb 2020 17:04:31 -0800 Subject: [PATCH 2/4] Update loki-messenger links Update loki-messenger => session-desktop and fix support page --- main.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/main.js b/main.js index b13c1be9a..2295cbd9d 100644 --- a/main.js +++ b/main.js @@ -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/Messenger/' ); } From ec34f50c48a417171e42831a0cc641429393b2f3 Mon Sep 17 00:00:00 2001 From: Ryan Tharp Date: Mon, 17 Feb 2020 17:05:57 -0800 Subject: [PATCH 3/4] update windows path --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5dbc997e0..04557db73 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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 From 2f73836f85a14ff59363ad034ac463d52ba20413 Mon Sep 17 00:00:00 2001 From: Ryan Tharp Date: Mon, 17 Feb 2020 18:06:28 -0800 Subject: [PATCH 4/4] Update Messenger/Messenger to Messenger/Session per Jimmy --- main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.js b/main.js index 2295cbd9d..3912076af 100644 --- a/main.js +++ b/main.js @@ -440,7 +440,7 @@ function openNewBugForm() { function openSupportPage() { shell.openExternal( - 'https://docs.loki.network/LokiServices/Messenger/Messenger/' + 'https://docs.loki.network/LokiServices/Messenger/Session/' ); }