Skip to content

Commit

Permalink
Update branding and bump version number to 1.2.2
Browse files Browse the repository at this point in the history
  • Loading branch information
meyer9 committed Mar 14, 2018
1 parent 740b811 commit 72855ef
Show file tree
Hide file tree
Showing 13 changed files with 77 additions and 94 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Brief Description:

Operating System (OS and version):
OpenBazaar version (shown on `About OpenBazaar` page in menu):
Phore Marketplace version (shown on `About Phore Marketplace` page in menu):
Hardware:

Reproducible (Always / Almost Always / Sometimes / Rarely / Couldn't Reproduce):
Expand Down
16 changes: 8 additions & 8 deletions .travis/config_amd64.client.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"productName": "OpenBazaar",
"name": "openbazaar2client",
"description": "Decentralized Peer to Peer Marketplace for Bitcoin",
"version": "2.0.12",
"bin": "openbazaar2client",
"maintainer": "OpenBazaar <project@openbazaar.org>",
"productName": "PhoreMarketplace",
"name": "phoremarketplaceclient",
"description": "Decentralized Peer to Peer Marketplace for Phore",
"version": "1.2.2",
"bin": "phoremarketplaceclient",
"maintainer": "Phore <admin@phore.io>",
"arch": "amd64",
"src": "dist/openbazaar2client-linux-x64/",
"src": "dist/phoremarketplaceclient-linux-x64/",
"dest": "dist/linux64",
"productDescription": "Decentralized Peer to Peer Marketplace for Bitcoin",
"productDescription": "Decentralized Peer to Peer Marketplace for Phore",
"intianOverrides": [
"changelog-file-missing-in-native-package",
"executable-not-elf-or-script",
Expand Down
16 changes: 8 additions & 8 deletions .travis/config_amd64.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"productName": "OpenBazaar",
"name": "openbazaar2",
"description": "Decentralized Peer to Peer Marketplace for Bitcoin",
"version": "1.0.0",
"bin": "openbazaar2",
"maintainer": "OpenBazaar <project@openbazaar.org>",
"productName": "PhoreMarketplace",
"name": "phoremarketplace",
"description": "Decentralized Peer to Peer Marketplace for Phore",
"version": "1.2.2",
"bin": "phoremarketplace",
"maintainer": "phore <admin@phore.io>",
"arch": "amd64",
"src": "dist/openbazaar2-linux-x64/",
"src": "dist/phoremarketplace-linux-x64/",
"dest": "dist/linux64",
"productDescription": "Decentralized Peer to Peer Marketplace for Bitcoin",
"productDescription": "Decentralized Peer to Peer Marketplace for Phore",
"intianOverrides": [
"changelog-file-missing-in-native-package",
"executable-not-elf-or-script",
Expand Down
16 changes: 8 additions & 8 deletions .travis/config_ia32.client.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"productName": "OpenBazaar",
"name": "openbazaar2client",
"version": "2.0.12",
"bin": "openbazaar2client",
"description": "Decentralized Peer to Peer Marketplace for Bitcoin",
"maintainer": "OpenBazaar <project@openbazaar.org>",
"productName": "PhoreMarketplace",
"name": "phoremarketplaceclient",
"version": "1.2.2",
"bin": "phoremarketplaceclient",
"description": "Decentralized Peer to Peer Marketplace for Phore",
"maintainer": "Phore <admin@phore.io>",
"arch": "i386",
"src": "dist/openbazaar2client-linux-ia32/",
"src": "dist/phoremarketplace-linux-ia32/",
"dest": "dist/linux32",
"productDescription": "Decentralized Peer to Peer Marketplace for Bitcoin",
"productDescription": "Decentralized Peer to Peer Marketplace for Phore",
"intianOverrides": [
"changelog-file-missing-in-native-package",
"executable-not-elf-or-script",
Expand Down
16 changes: 8 additions & 8 deletions .travis/config_ia32.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"productName": "OpenBazaar",
"name": "openbazaar2",
"version": "1.0.0",
"bin": "openbazaar2",
"description": "Decentralized Peer to Peer Marketplace for Bitcoin",
"maintainer": "OpenBazaar <project@openbazaar.org>",
"productName": "PhoreMarketplace",
"name": "phoremarketplace",
"version": "1.2.2",
"bin": "phoremarketplace",
"description": "Decentralized Peer to Peer Marketplace for Phore",
"maintainer": "Phore <admin@phore.io>",
"arch": "i386",
"src": "dist/openbazaar2-linux-ia32/",
"src": "dist/phoremarketplace-linux-ia32/",
"dest": "dist/linux32",
"productDescription": "Decentralized Peer to Peer Marketplace for Bitcoin",
"productDescription": "Decentralized Peer to Peer Marketplace for Phore",
"intianOverrides": [
"changelog-file-missing-in-native-package",
"executable-not-elf-or-script",
Expand Down
2 changes: 1 addition & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ module.exports = function setup(grunt) {
productName: 'OpenBazaar',
name: 'openbazaar2',
arch: 'amd64',
version: '1.0.0',
version: '1.2.2',
bin: 'openbazaar2',
maintainer: 'OpenBazaar <project@openbazaar.org>',
rename(dest) {
Expand Down
6 changes: 3 additions & 3 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ PACKAGE_VERSION=$(cat package.json \
| awk -F: '{ print $2 }' \
| sed 's/[",]//g' \
| tr -d '[[:space:]]')
echo "OpenBazaar Version: $PACKAGE_VERSION"
echo "Phore Marketplace Version: $PACKAGE_VERSION"

# Create temp/build dirs
mkdir dist/
Expand Down Expand Up @@ -78,7 +78,7 @@ case "$TRAVIS_OS_NAME" in
fi

if [ -z "$CLIENT_VERSION" ]; then
APPNAME="openbazaar2"
APPNAME="phoremarketplace"

echo "Packaging Electron application"
electron-packager . ${APPNAME} --platform=linux --arch=ia32 --version=${ELECTRONVER} --overwrite --prune --out=dist
Expand Down Expand Up @@ -114,7 +114,7 @@ case "$TRAVIS_OS_NAME" in
echo 'Create RPM archive'
electron-installer-redhat --config .travis/config_amd64.json
else
APPNAME="openbazaar2client"
APPNAME="phoremarketplaceclient"

echo "Packaging Electron application"
electron-packager . ${APPNAME} --platform=linux --arch=ia32 --version=${ELECTRONVER} --overwrite --prune --out=dist
Expand Down
24 changes: 12 additions & 12 deletions docs/connectionIssues.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ Troubleshooting connection issues
comming soon...

### Tor
Refer to the guide to [configuring OpenBazaar to run on Tor](https://github.com/OpenBazaar/openbazaar-desktop/wiki/Tor-Setup).
Refer to the guide to [configuring Phore Marketplace to run on Tor](https://github.com/phoreproject/openbazaar-desktop/wiki/Tor-Setup).

More information is available in the [server Tor documentation](https://github.com/OpenBazaar/openbazaar-go/blob/master/docs/tor.md), if you need it.
More information is available in the [server Tor documentation](https://github.com/phoreproject/openbazaar-go/blob/master/docs/tor.md), if you need it.


### Local Stand-alone Server
Expand All @@ -19,7 +19,7 @@ Check your JS console. If you are **not** seeing any red `WebSocket...` errors:
2. In the config file, ensure Addresses.Gateway has your server's IP embedded in it. For example, if your server ip is `123.45.6.78`, the `Gateway` value would be `/ip4/123.45.6.78/tcp/5002`.
3. In the client, ensure the port set in the server configuration UI matches the port value you set above:

![](https://github.com/OpenBazaar/openbazaar-desktop/blob/master/imgs/connectionIssues/setPortInUi.png)
![](https://github.com/phoreproject/openbazaar-desktop/blob/master/imgs/connectionIssues/setPortInUi.png)

4. Check the JSON-API section of your config file. Make sure:
- Authenticated is true
Expand All @@ -28,7 +28,7 @@ Check your JS console. If you are **not** seeing any red `WebSocket...` errors:
- SSLKey is the path to your key
- Username is your username
5. The password in your config file, in the JSON-API section, must be the hex-encoded SHA-256 hash of your plain text password. There are several options for setting it:
- In the remote server, in your OpenBazaar server directory, you can enter the command `go run openbazaard.go setapicreds` and follow the instructions.
- In the remote server, in your Phore Marketplace server directory, you can enter the command `go run openbazaard.go setapicreds` and follow the instructions.
- On Linux or Macintosh, you can use this command in your terminal: `echo -n yourpassword | sha256sum` (replace "yourpassword" with your actual password), and paste the hash into your config file.
- You can use an online hex generator (there are many options, just search for "create hex-encoded SHA-256 hash"), and paste the hash into your config file.

Expand All @@ -38,35 +38,35 @@ In the client, you should enter the plain text password in your server configura

If you are seeing the following error in your JS console:

![](https://github.com/OpenBazaar/openbazaar-desktop/blob/master/imgs/connectionIssues/sslProtocolError.png)
![](https://github.com/phoreproject/openbazaar-desktop/blob/master/imgs/connectionIssues/sslProtocolError.png)

For your protection, the client will only connect to a remote server via SSL. The above error indicates that your server is not set-up to run SSL.

To enable SSL on your remote server, follow this [doc](https://github.com/OpenBazaar/openbazaar-go/blob/master/docs/ssl.md).
To enable SSL on your remote server, follow this [doc](https://github.com/phoreproject/openbazaar-go/blob/master/docs/ssl.md).

You may also find this [guide to remote server security helpful.](https://github.com/OpenBazaar/openbazaar-go/blob/master/docs/security.md#basic-authentication)
You may also find this [guide to remote server security helpful.](https://github.com/phoreproject/openbazaar-go/blob/master/docs/security.md#basic-authentication)

When you install the OpenBazaar.crt file on your client machine, be sure to enable it as a trusted certificate.
When you install the Phore Marketplace.crt file on your client machine, be sure to enable it as a trusted certificate.

On OSX, this is done via the Always Trust button.

![](https://github.com/OpenBazaar/openbazaar-desktop/blob/master/imgs/connectionIssues/osxTrustCertificate.png)
![](https://github.com/phoreproject/openbazaar-desktop/blob/master/imgs/connectionIssues/osxTrustCertificate.png)

On Windows, you should import the certificate using the [Microsoft Management Console.](http://www.thewindowsclub.com/manage-trusted-root-certificates-windows)

![](https://github.com/OpenBazaar/openbazaar-desktop/blob/master/imgs/connectionIssues/windowsCertManager.png)
![](https://github.com/phoreproject/openbazaar-desktop/blob/master/imgs/connectionIssues/windowsCertManager.png)

For Linux, please follow step 2 in the next section.

---

If you are seeing the following error in your JS console:

![](https://github.com/OpenBazaar/openbazaar-desktop/blob/master/imgs/connectionIssues/sslBadHandshake.png)
![](https://github.com/phoreproject/openbazaar-desktop/blob/master/imgs/connectionIssues/sslBadHandshake.png)

It is likely one of two things:

1. You may have not properly specified your server ip when generating the server.csr file. When following this [doc](https://github.com/OpenBazaar/openbazaar-go/blob/master/docs/ssl.md), be sure to replace \<server-ip\> with the ip of your remote server when executing this command `openssl req -new -key server.key -out server.csr `...
1. You may have not properly specified your server ip when generating the server.csr file. When following this [doc](https://github.com/phoreproject/openbazaar-go/blob/master/docs/ssl.md), be sure to replace \<server-ip\> with the ip of your remote server when executing this command `openssl req -new -key server.key -out server.csr `...

2. If you're running on Linux, that error could also indicate that the certificate needs to be added to the trusted list. Here's how to do it on Ubuntu ([detailed instructions](http://blog.tkassembled.com/410/adding-a-certificate-authority-to-the-trusted-list-in-ubuntu/)):
- First, install libnss3-tools, which contains the certutil command: `sudo apt-get install libnss3-tools`
Expand Down
16 changes: 8 additions & 8 deletions docs/releaseProcess.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Before every release:

TBD

### OpenBazaar maintainer/release engineers, update version in sources
### Phore Project maintainer/release engineers, update version in sources

Update the following:

Expand Down Expand Up @@ -51,13 +51,13 @@ cd verify

The list of files should be:
```
OpenBazaar2-${VERSION}-full.nupkg
OpenBazaar2-${VERSION}-Setup-32.exe
OpenBazaar2-${VERSION}-Setup-64.exe
OpenBazaar2-${VERSION}.dmg
OpenBazaar2-mac-${VERSION}.zip
openbazaar2_${VERSION}_amd64.deb
openbazaar2_${VERSION}_i386.deb
PhoreMarketplace-${VERSION}-full.nupkg
PhoreMarketplace-${VERSION}-Setup-32.exe
PhoreMarketplace-${VERSION}-Setup-64.exe
PhoreMarketplace-${VERSION}.dmg
PhoreMarketplace-mac-${VERSION}.zip
PhoreMarketplace_${VERSION}_amd64.deb
PhoreMarketplace_${VERSION}_i386.deb
```

- Upload `SHA256SUMS.${VERSION}.asc` from last step, to the openbazaar.org server
Expand Down
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<html id="ov1" class="pre-release"><!-- remove pre-release class when released -->
<head>
<meta charset="UTF-8">
<title>OpenBazaar</title>
<title>Phore Marketplace</title>
<link rel="stylesheet" href="../node_modules/ionicons/css/ionicons.min.css">
<link rel="stylesheet" href="../node_modules/trumbowyg/dist/ui/trumbowyg.min.css">
<link rel="stylesheet" href="../node_modules/selectize/dist/css/selectize.css">
Expand Down
Loading

0 comments on commit 72855ef

Please sign in to comment.