Browse Source

Merge remote-tracking branch 'refs/remotes/origin/master' into v0.5.8

v0.5.8
Ramiro Saenz 8 years ago
parent
commit
2b520e6a99
  1. 18
      README.md
  2. 1
      app/store/ServicesList.js
  3. 0
      resources/installer/icon.icns
  4. 0
      resources/installer/icon.ico

18
README.md

@ -173,7 +173,8 @@ If you're comfortable getting up and running from a `git clone`, this method is
#### Environment:
* Sencha Cmd 6.1.2.15
* Sencha Cmd 6.1.2.15 (make sure to check "Compass extension" during install if you don't have installed yet)
* Ruby 2.3
* NPM 3.8.7
* Node.js 4.0.0
@ -185,7 +186,20 @@ If you're comfortable getting up and running from a `git clone`, this method is
4. `npm run sencha:compile`
5. `npm start`
----------
#### Compile on Ubuntu:
These instructions were tested with Ubuntu 17.04.
1. Install dependencies: `sudo apt install nodejs-legacy npm git`
2. Build and install electron: `sudo npm install electron-prebuilt -g`
3. Install Sencha Cmd (non-free): https://www.sencha.com/products/extjs/cmd-download/
4. Clone repository: `git clone https://github.com/saenzramiro/rambox.git`
5. Install npm dependencies: `npm install`
6. Configure `env-sample.js` and rename it to `env.js`.
7. Compile: `npm run sencha:compile`
8. Start program: `npm start`
-------------------
Disclosure
-------------------

1
app/store/ServicesList.js

@ -265,7 +265,6 @@ Ext.define('Rambox.store.ServicesList', {
,description: 'HD quality calls, private and group chats with inline photos, music and video. Also available for your phone or tablet.'
,url: 'https://app.wire.com/'
,type: 'messaging'
,userAgent: 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.116 Safari/537.36'
},
{
id: 'sync'

0
resources/installer/Icon.icns → resources/installer/icon.icns

0
resources/installer/Icon.ico → resources/installer/icon.ico

Before

Width:  |  Height:  |  Size: 361 KiB

After

Width:  |  Height:  |  Size: 361 KiB

Loading…
Cancel
Save