keejef
/
session-desktop
mirror of https://github.com/oxen-io/session-desktop
2
0
Fork 0
Code Issues 8 Projects Releases Wiki Activity

Big update to new signal branding (#2018)

Browse Source
pull/1/head
Scott Nonnenberg 7 years ago committed by GitHub
parent c64f0fc75e
commit 7b49180bc0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File

12
CONTRIBUTING.md
Unescape Escape View File

@ -12,7 +12,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. 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 You're most likely to have your pull request accepted easily if it addresses bugs already
in the [Next Steps project](https://github.com/WhisperSystems/Signal-Desktop/projects/1), in the [Next Steps project](https://github.com/signalapp/Signal-Desktop/projects/1),
especially if they are near the top of the Backlog column. Those are what we'll be looking especially if they are near the top of the Backlog column. Those are what we'll be looking
at next, so it would be a great help if you helped us out! at next, so it would be a great help if you helped us out!
@ -24,7 +24,7 @@ ounce of prevention, as they say!](https://www.goodreads.com/quotes/247269-an-ou
## Developer Setup ## Developer Setup
First, you'll need [Node.js](https://nodejs.org/) which matches our current version. 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/WhisperSystems/Signal-Desktop/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/signalapp/Signal-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 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 desired Node.js version. [nvm for windows](https://github.com/coreybutler/nvm-windows) is
still useful, but it doesn't support `.nvmrc` files. still useful, but it doesn't support `.nvmrc` files.
@ -46,7 +46,7 @@ favorite package manager. Python 2.x and GCC are two key necessary components.
Now, run these commands in your preferred terminal in a good directory for development: Now, run these commands in your preferred terminal in a good directory for development:
``` ```
git clone https://github.com/WhisperSystems/Signal-Desktop.git git clone https://github.com/signalapp/Signal-Desktop.git
cd Signal-Desktop cd Signal-Desktop
npm install -g yarn # (only if you don't already have yarn) npm install -g yarn # (only if you don't already have yarn)
npm install -g grunt-cli # (only if you don't already have grunt) npm install -g grunt-cli # (only if you don't already have grunt)
@ -215,13 +215,13 @@ and register it with one of your extra phone numbers:
First, build Signal for Android or iOS from source, and point its TextSecure service URL to `textsecure-service-staging.whispersystems.org`: First, build Signal for Android or iOS from source, and point its TextSecure service URL to `textsecure-service-staging.whispersystems.org`:
**on Android:** Replace the `SIGNAL_URL` value in [build.gradle](https://github.com/WhisperSystems/Signal-Android/blob/master/build.gradle) **on Android:** Replace the `SIGNAL_URL` value in [build.gradle](https://github.com/signalapp/Signal-Android/blob/master/build.gradle)
**on iOS:** Replace the `textSecureServerURL` value in `TSConstants.h`(located in the SignalServiceKit pod) **on iOS:** Replace the `textSecureServerURL` value in `TSConstants.h`(located in the SignalServiceKit pod)
This task is 1% search and replace, 99% setting up your build environment. Instructions are available for both This task is 1% search and replace, 99% setting up your build environment. Instructions are available for both
the [Android](https://github.com/WhisperSystems/Signal-Android/blob/master/BUILDING.md) the [Android](https://github.com/signalapp/Signal-Android/blob/master/BUILDING.md)
and [iOS](https://github.com/WhisperSystems/Signal-iOS/blob/master/BUILDING.md) projects. and [iOS](https://github.com/signalapp/Signal-iOS/blob/master/BUILDING.md) projects.
Then you can set up your development build of Signal Desktop as normal. If you've already Then you can set up your development build of Signal Desktop as normal. If you've already
set up as a standalone install, you can switch by opening the DevTools (View -> Toggle set up as a standalone install, you can switch by opening the DevTools (View -> Toggle

2
Gruntfile.js
Unescape Escape View File

@ -282,7 +282,7 @@ module.exports = function(grunt) {
var https = require('https'); var https = require('https');
var urlBase = "https://s3-us-west-1.amazonaws.com/signal-desktop-builds"; var urlBase = "https://s3-us-west-1.amazonaws.com/signal-desktop-builds";
var keyBase = 'WhisperSystems/Signal-Desktop'; var keyBase = 'signalapp/Signal-Desktop';
var sha = gitinfo.local.branch.current.SHA; var sha = gitinfo.local.branch.current.SHA;
var files = [{ var files = [{
zip: packageJson.name + '-' + packageJson.version + '.zip', zip: packageJson.name + '-' + packageJson.version + '.zip',

10
README.md
Unescape Escape View File

@ -1,10 +1,10 @@
[![Build Status](https://travis-ci.org/WhisperSystems/Signal-Desktop.svg?branch=master)](https://travis-ci.org/WhisperSystems/Signal-Desktop) [![Build Status](https://travis-ci.org/signalapp/Signal-Desktop.svg?branch=master)](https://travis-ci.org/signalapp/Signal-Desktop)
Signal Desktop Signal Desktop
========================== ==========================
Signal Desktop is an Electron application that links with your Signal Desktop is an Electron application that links with your
[Signal Android](https://github.com/WhisperSystems/Signal-Android) [Signal Android](https://github.com/signalapp/Signal-Android)
or [Signal iOS](https://github.com/WhisperSystems/Signal-iOS) app. or [Signal iOS](https://github.com/signalapp/Signal-iOS) app.
## Install production version: https://signal.org/download/ ## Install production version: https://signal.org/download/
@ -27,7 +27,7 @@ The discussion groups are another good place for questions: https://whispersyste
Please search the existing issues for your bug and create a new one if the issue is not yet tracked! Please search the existing issues for your bug and create a new one if the issue is not yet tracked!
https://github.com/WhisperSystems/Signal-Desktop/issues https://github.com/signalapp/Signal-Desktop/issues
## Contributing Translations ## Contributing Translations
@ -38,7 +38,7 @@ https://www.transifex.com/projects/p/signal-desktop
## Contributing Code ## Contributing Code
Please see [CONTRIBUTING.md](https://github.com/WhisperSystems/Signal-Desktop/blob/master/CONTRIBUTING.md) Please see [CONTRIBUTING.md](https://github.com/signalapp/Signal-Desktop/blob/master/CONTRIBUTING.md)
for setup instructions and contributor guidelines. And don't forget to sign the for setup instructions and contributor guidelines. And don't forget to sign the
[CLA](https://signal.org/cla/). [CLA](https://signal.org/cla/).

4
_locales/en/messages.json
Unescape Escape View File

@ -52,7 +52,7 @@
"description": "Message shown on the migration screen while we export data" "description": "Message shown on the migration screen while we export data"
}, },
"exportComplete": { "exportComplete": {
"message": "Your data has been exported to: <p><b>$location$</b></p> You'll be able to import this data as you set up <a target='_blank' href='https://support.whispersystems.org/hc/en-us/articles/214507138'>the new Signal Desktop</a>.", "message": "Your data has been exported to: <p><b>$location$</b></p> You'll be able to import this data as you set up <a target='_blank' href='https://support.signal.org/hc/en-us/articles/214507138'>the new Signal Desktop</a>.",
"description": "Message shown on the migration screen when we are done exporting data", "description": "Message shown on the migration screen when we are done exporting data",
"placeholders": { "placeholders": {
"location": { "location": {
@ -74,7 +74,7 @@
"description": "Title of the popup window used to select data previously exported" "description": "Title of the popup window used to select data previously exported"
}, },
"importError": { "importError": {
"message": "Unfortunately, something went wrong during the import. <p>First, double-check your target directory. It should start with 'Signal Export.'</p><p>Next, try with a new export of your data from the Chrome App.</p>If that still fails, please <a target='_blank' href='https://support.whispersystems.org/hc/en-us/articles/215188737'>submit a debug log</a> so we can help you get migrated!", "message": "Unfortunately, something went wrong during the import. <p>First, double-check your target directory. It should start with 'Signal Export.'</p><p>Next, try with a new export of your data from the Chrome App.</p>If that still fails, please <a target='_blank' href='https://support.signal.org/hc/en-us/articles/215188737'>submit a debug log</a> so we can help you get migrated!",
"description": "Message shown if the import went wrong." "description": "Message shown if the import went wrong."
}, },
"tryAgain": { "tryAgain": {

2
app/auto_update.js
Unescape Escape View File

@ -42,7 +42,7 @@ function showUpdateDialog(mainWindow, messages) {
if (response === RESTART_BUTTON) { if (response === RESTART_BUTTON) {
// We delay these update calls because they don't seem to work in this // We delay these update calls because they don't seem to work in this
// callback - but only if the message box has a parent window. // callback - but only if the message box has a parent window.
// Fixes this bug: https://github.com/WhisperSystems/Signal-Desktop/issues/1864 // Fixes this bug: https://github.com/signalapp/Signal-Desktop/issues/1864
setTimeout(() => { setTimeout(() => {
windowState.markShouldQuit(); windowState.markShouldQuit();
autoUpdater.quitAndInstall(); autoUpdater.quitAndInstall();

4
background.html
Unescape Escape View File

@ -536,7 +536,7 @@
</div> </div>
</script> </script>
<script type='text/x-tmpl-mustache' id='link_to_support'> <script type='text/x-tmpl-mustache' id='link_to_support'>
<a href='http://support.whispersystems.org/hc/articles/213134107' target='_blank'> <a href='http://support.signal.org/hc/articles/213134107' target='_blank'>
{{ learnMore }} {{ learnMore }}
</a> </a>
</script> </script>
@ -562,7 +562,7 @@
</div> </div>
<p> <p>
<a class='report-link' target='_blank' <a class='report-link' target='_blank'
href='https://github.com/WhisperSystems/Signal-Desktop/issues/new/'> href='https://github.com/signalapp/Signal-Desktop/issues/new/'>
{{ reportIssue }} {{ reportIssue }}
</a> </a>
</p> </p>

4
bower.json
Unescape Escape View File

@ -1,7 +1,7 @@
{ {
"name": "textsecure-chrome", "name": "signal-desktop",
"version": "0.0.0", "version": "0.0.0",
"homepage": "https://github.com/WhisperSystems/TextSecure-Browser", "homepage": "https://github.com/signalapp/Signal-Desktop",
"license": "GPLV3", "license": "GPLV3",
"private": true, "private": true,
"dependencies": { "dependencies": {

2
js/signal_protocol_store.js
Unescape Escape View File

@ -688,7 +688,7 @@
}.bind(this)); }.bind(this));
}, },
// This matches the Java method as of // This matches the Java method as of
// https://github.com/WhisperSystems/Signal-Android/blob/d0bb68e1378f689e4d10ac6a46014164992ca4e4/src/org/thoughtcrime/securesms/util/IdentityUtil.java#L188 // https://github.com/signalapp/Signal-Android/blob/d0bb68e1378f689e4d10ac6a46014164992ca4e4/src/org/thoughtcrime/securesms/util/IdentityUtil.java#L188
processVerifiedMessage: function(identifier, verifiedStatus, publicKey) { processVerifiedMessage: function(identifier, verifiedStatus, publicKey) {
if (identifier === null || identifier === undefined) { if (identifier === null || identifier === undefined) {
throw new Error("Tried to set verified for undefined/null key"); throw new Error("Tried to set verified for undefined/null key");

2
js/views/install_view.js
Unescape Escape View File

@ -18,7 +18,7 @@
templateName: 'install_flow_template', templateName: 'install_flow_template',
className: 'main install', className: 'main install',
render_attributes: function() { render_attributes: function() {
var twitterHref = 'https://twitter.com/whispersystems'; var twitterHref = 'https://twitter.com/signalapp';
var signalHref = 'https://signal.org/install'; var signalHref = 'https://signal.org/install';
return { return {
installWelcome: i18n('installWelcome'), installWelcome: i18n('installWelcome'),

4
libtextsecure/message_receiver.js
Unescape Escape View File

@ -815,8 +815,8 @@ MessageReceiver.prototype.extend({
// Before June, all incoming messages were still DataMessage: // Before June, all incoming messages were still DataMessage:
// - iOS: Michael Kirk says that they were sending Legacy messages until June // - iOS: Michael Kirk says that they were sending Legacy messages until June
// - Desktop: https://github.com/WhisperSystems/Signal-Desktop/commit/e8548879db405d9bcd78b82a456ad8d655592c0f // - Desktop: https://github.com/signalapp/Signal-Desktop/commit/e8548879db405d9bcd78b82a456ad8d655592c0f
// - Android: https://github.com/WhisperSystems/libsignal-service-java/commit/61a75d023fba950ff9b4c75a249d1a3408e12958 // - Android: https://github.com/signalapp/libsignal-service-java/commit/61a75d023fba950ff9b4c75a249d1a3408e12958
// //
// var d = new Date('2017-06-01T07:00:00.000Z'); // var d = new Date('2017-06-01T07:00:00.000Z');
// d.getTime(); // d.getTime();

2
libtextsecure/websocket-resources.js
Unescape Escape View File

@ -22,7 +22,7 @@
* error: function(message, status, request) {...} * error: function(message, status, request) {...}
* }); * });
* *
* 1. https://github.com/WhisperSystems/WebSocket-Resources * 1. https://github.com/signalapp/WebSocket-Resources
* *
*/ */

6
main.js
Unescape Escape View File

@ -54,7 +54,7 @@ function showWindow() {
// Using focus() instead of show() seems to be important on Windows when our window // Using focus() instead of show() seems to be important on Windows when our window
// has been docked using Aero Snap/Snap Assist. A full .show() call here will cause // has been docked using Aero Snap/Snap Assist. A full .show() call here will cause
// the window to reposition: // the window to reposition:
// https://github.com/WhisperSystems/Signal-Desktop/issues/1429 // https://github.com/signalapp/Signal-Desktop/issues/1429
if (mainWindow.isVisible()) { if (mainWindow.isVisible()) {
mainWindow.focus(); mainWindow.focus();
} else { } else {
@ -315,11 +315,11 @@ function showDebugLog() {
} }
function openReleaseNotes() { function openReleaseNotes() {
shell.openExternal(`https://github.com/WhisperSystems/Signal-Desktop/releases/tag/v${app.getVersion()}`); shell.openExternal(`https://github.com/signalapp/Signal-Desktop/releases/tag/v${app.getVersion()}`);
} }
function openNewBugForm() { function openNewBugForm() {
shell.openExternal('https://github.com/WhisperSystems/Signal-Desktop/issues/new'); shell.openExternal('https://github.com/signalapp/Signal-Desktop/issues/new');
} }
function openSupportPage() { function openSupportPage() {

4
package.json
Unescape Escape View File

@ -2,12 +2,12 @@
"name": "signal-desktop", "name": "signal-desktop",
"productName": "Signal", "productName": "Signal",
"description": "Private messaging from your desktop", "description": "Private messaging from your desktop",
"repository": "https://github.com/WhisperSystems/Signal-Desktop.git", "repository": "https://github.com/signalapp/Signal-Desktop.git",
"version": "1.3.0-beta.1", "version": "1.3.0-beta.1",
"license": "GPL-3.0", "license": "GPL-3.0",
"author": { "author": {
"name": "Open Whisper Systems", "name": "Open Whisper Systems",
"email": "support@whispersystems.org" "email": "support@signal.org"
}, },
"main": "main.js", "main": "main.js",
"scripts": { "scripts": {

4
test/index.html
Unescape Escape View File

@ -450,7 +450,7 @@
</div> </div>
</script> </script>
<script type='text/x-tmpl-mustache' id='link_to_support'> <script type='text/x-tmpl-mustache' id='link_to_support'>
<a href='http://support.whispersystems.org/hc/articles/213134107' target='_blank'> <a href='http://support.signal.org/hc/articles/213134107' target='_blank'>
{{ learnMore }} {{ learnMore }}
</a> </a>
</script> </script>
@ -476,7 +476,7 @@
</div> </div>
<p> <p>
<a class='report-link' target='_blank' <a class='report-link' target='_blank'
href='https://github.com/WhisperSystems/Signal-Desktop/issues/new/'> href='https://github.com/signalapp/Signal-Desktop/issues/new/'>
{{ reportIssue }} {{ reportIssue }}
</a> </a>
</p> </p>

Write Preview
Loading…
Cancel
Save