Skip to content
Snippets Groups Projects
Commit ff141e44 authored by Nberton's avatar Nberton
Browse files

Merge with up to date branch

parents 70b0e919 13df770d
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 284 additions and 202 deletions
.docker/dockerfiles/develop/Dockerfile 0 → 100644
+ 37
− 0
View file @ ff141e44
FROM node:0.10
MAINTAINER buildmaster@rocket.chat
RUN apt-get update \
&& apt-get install -y graphicsmagick \
&& rm -rf /var/lib/apt/lists/*
RUN groupadd -r rocketchat \
&& useradd -r -g rocketchat rocketchat \
&& mkdir /app \
&& mkdir /app/uploads
# gpg: key 4FD08014: public key "Rocket.Chat Buildmaster <buildmaster@rocket.chat>" imported
RUN gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 0E163286C20D07B9787EBE9FD7F9D0414FD08104
WORKDIR /app
RUN curl -fSL "https://s3.amazonaws.com/rocketchatbuild/develop.rocket.chat-v.latest.tgz" -o rocket.chat.tgz \
&& tar zxvf ./rocket.chat.tgz \
&& rm ./rocket.chat.tgz \
&& cd /app/bundle/programs/server \
&& npm install
USER rocketchat
VOLUME /app/uploads
WORKDIR /app/bundle
# needs a mongoinstance - defaults to container linking with alias 'mongo'
ENV MONGO_URL=mongodb://mongo:27017/rocketchat \
PORT=3000 \
ROOT_URL=http://localhost:3000 \
Accounts_AvatarStorePath=/app/uploads
EXPOSE 3000
CMD ["node", "main.js"]
.docker/dockerfiles/master/Dockerfile 0 → 100644
+ 37
− 0
View file @ ff141e44
FROM node:0.10
MAINTAINER buildmaster@rocket.chat
RUN apt-get update \
&& apt-get install -y graphicsmagick \
&& rm -rf /var/lib/apt/lists/*
RUN groupadd -r rocketchat \
&& useradd -r -g rocketchat rocketchat \
&& mkdir /app \
&& mkdir /app/uploads
# gpg: key 4FD08014: public key "Rocket.Chat Buildmaster <buildmaster@rocket.chat>" imported
RUN gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 0E163286C20D07B9787EBE9FD7F9D0414FD08104
WORKDIR /app
RUN curl -fSL "https://s3.amazonaws.com/rocketchatbuild/master.rocket.chat-v.latest.tgz" -o rocket.chat.tgz \
&& tar zxvf ./rocket.chat.tgz \
&& rm ./rocket.chat.tgz \
&& cd /app/bundle/programs/server \
&& npm install
USER rocketchat
VOLUME /app/uploads
WORKDIR /app/bundle
# needs a mongoinstance - defaults to container linking with alias 'mongo'
ENV MONGO_URL=mongodb://mongo:27017/rocketchat \
PORT=3000 \
ROOT_URL=http://localhost:3000 \
Accounts_AvatarStorePath=/app/uploads
EXPOSE 3000
CMD ["node", "main.js"]
.gitignore
+ 0
− 1
View file @ ff141e44
......@@ -46,7 +46,6 @@
.Trashes
.wtpmodules
\#*\#
BuildInfo.js
Desktop.ini
ehthumbs.db
example.css
......
.meteor/cordova-plugins deleted 100644 → 0
+ 0
− 2
View file @ 70b0e919
ionic-plugin-keyboard@1.0.7
phonegap-facebook-plugin@https://github.com/Sing-Li/phonegap-facebook-plugin.git#667dda292cf70d8fb725f512cedef3fe0dd55ac3
.meteor/packages
+ 4
− 0
View file @ ff141e44
......@@ -3,6 +3,7 @@
# 'meteor add' and 'meteor remove' will edit this file for you,
# but you can also edit it by hand.
rocketchat:cors
accounts-facebook
accounts-github
accounts-google
......@@ -24,6 +25,7 @@ meteor-base
mobile-experience
mongo
random
rate-limit
reactive-dict
reactive-var
reload
......@@ -71,6 +73,7 @@ rocketchat:ui-login
rocketchat:ui-master
rocketchat:ui-message
rocketchat:ui-sidenav
rocketchat:version
rocketchat:webrtc
rocketchat:wordpress
#rocketchat:chatops
......@@ -121,3 +124,4 @@ yasaricli:slugify
yasinuslu:blaze-meta
# sanjo:jasmine
# velocity:html-reporter
rocketchat:assets
.meteor/versions
+ 8
− 4
View file @ ff141e44
......@@ -7,7 +7,7 @@ accounts-oauth@1.1.8
accounts-password@1.1.4
accounts-twitter@1.0.6
alanning:roles@1.2.14
aldeed:simple-schema@1.3.3
aldeed:simple-schema@1.4.0
arunoda:streams@0.1.17
autoupdate@1.2.4
babel-compiler@5.8.24_1
......@@ -25,7 +25,7 @@ cfs:http-methods@0.0.30
check@1.1.0
chrismbeckett:toastr@2.1.2_1
coffeescript@1.0.11
cosmos:browserify@0.9.0
cosmos:browserify@0.9.2
dandv:caret-position@2.1.1
ddp@1.2.2
ddp-client@1.2.1
......@@ -58,8 +58,8 @@ jparker:crypto-core@0.1.0
jparker:crypto-md5@0.1.1
jparker:gravatar@0.4.1
jquery@1.11.4
kadira:blaze-layout@2.2.0
kadira:flow-router@2.9.0
kadira:blaze-layout@2.3.0
kadira:flow-router@2.10.0
kenton:accounts-sandstorm@0.1.8
kevohagan:sweetalert@1.0.0
konecty:autolinker@1.0.3
......@@ -75,6 +75,7 @@ livedata@1.0.15
localstorage@1.0.5
logging@1.0.8
matb33:collection-hooks@0.8.1
mdg:validation-error@0.1.0
meteor@1.1.10
meteor-base@1.0.1
meteor-developer@1.1.5
......@@ -121,10 +122,12 @@ reactive-dict@1.1.3
reactive-var@1.0.6
reload@1.1.4
retry@1.0.4
rocketchat:assets@0.0.1
rocketchat:authorization@0.0.1
rocketchat:autolinker@0.0.1
rocketchat:channel-settings@0.0.1
rocketchat:colors@0.0.1
rocketchat:cors@0.0.1
rocketchat:custom-oauth@1.0.0
rocketchat:emojione@0.0.1
rocketchat:favico@0.0.1
......@@ -157,6 +160,7 @@ rocketchat:ui-login@0.1.0
rocketchat:ui-master@0.1.0
rocketchat:ui-message@0.1.0
rocketchat:ui-sidenav@0.1.0
rocketchat:version@1.0.0
rocketchat:webrtc@0.0.1
rocketchat:wordpress@0.0.1
routepolicy@1.0.6
......
.sandstorm/buildrc.sh 0 → 100755
+ 19
− 0
View file @ ff141e44
#!/bin/bash
set -euo pipefail
cd /tmp
spk init -p3000 -- nothing
export SANDSTORM_ID="$(grep '\sid =' sandstorm-pkgdef.capnp)"
cd $TRAVIS_BUILD_DIR
export METEOR_WAREHOUSE_DIR="${METEOR_WAREHOUSE_DIR:-$HOME/.meteor}"
export METEOR_DEV_BUNDLE=$(dirname $(readlink -f "$METEOR_WAREHOUSE_DIR/meteor"))/dev_bundle
cd /home/vagrant && tar zxf ./Rocket.Chat.tar.gz
rm ./Rocket.Chat.tar.gz
cd /home/vagrant/bundle/programs/server && "$METEOR_DEV_BUNDLE/bin/npm" install
cd $TRAVIS_BUILD_DIR/.sandstorm
sed -i "s/\sid = .*/$SANDSTORM_ID/" sandstorm-pkgdef.capnp
mkdir -p /home/vagrant/bundle/opt/app/.sandstorm/
cp /opt/app/.sandstorm/launcher.sh /home/vagrant/bundle/opt/app/.sandstorm/
sed -i "s/\spgp/#pgp/g" sandstorm-pkgdef.capnp
spk pack $TRAVIS_BUILD_DIR/rocket.chat.latest.spk
.sandstorm/launcher.sh
+ 1
− 0
View file @ ff141e44
#!/bin/bash
set -euo pipefail
export METEOR_SETTINGS='{"public": {"sandstorm": true}}'
exec node /start.js -p 8000
.sandstorm/preprcbuild.sh 0 → 100755
+ 18
− 0
View file @ ff141e44
#!/bin/bash
set -euo pipefail
cd /tmp
curl https://dl.sandstorm.io/sandstorm-$SANDSTORM_VERSION.tar.xz | tar -xJf -
sudo mkdir -p /home/vagrant
sudo chown -R travis /home/vagrant
sudo mkdir -p /opt
sudo chown -R travis /opt
cd /opt
curl curl https://dl.sandstorm.io/meteor-spk-0.1.8.tar.xz | tar -xJf -
ln -s meteor-spk-0.1.8 meteor-spk
cp -a /bin/bash /opt/meteor-spk/meteor-spk.deps/bin/
cp -a /lib/x86_64-linux-gnu/libncurses.so.* /opt/meteor-spk/meteor-spk.deps/lib/x86_64-linux-gnu/
cp -a /lib/x86_64-linux-gnu/libtinfo.so.* /opt/meteor-spk/meteor-spk.deps/lib/x86_64-linux-gnu/
cd $TRAVIS_BUILD_DIR
cp -r . /opt/app
.sandstorm/sandstorm-pkgdef.capnp
+ 4
− 3
View file @ ff141e44
......@@ -19,9 +19,9 @@ const pkgdef :Spk.PackageDefinition = (
appTitle = (defaultText = "Rocket.Chat"),
appVersion = 1, # Increment this for every release.
appVersion = 2, # Increment this for every release.
appMarketingVersion = (defaultText = "0.6"),
appMarketingVersion = (defaultText = "0.7.2445"),
# Human-readable representation of appVersion. Should match the way you
# identify versions of your app in documentation and marketing.
......@@ -91,6 +91,7 @@ const myCommand :Spk.Manifest.Command = (
argv = ["/sandstorm-http-bridge", "8000", "--", "/opt/app/.sandstorm/launcher.sh"],
environ = [
# Note that this defines the *entire* environment seen by your app.
(key = "PATH", value = "/usr/local/bin:/usr/bin:/bin")
(key = "PATH", value = "/usr/local/bin:/usr/bin:/bin"),
(key = "SANDSTORM", value = "1")
]
);
.sandstorm/setup.sh
+ 1
− 2
View file @ ff141e44
......@@ -3,7 +3,7 @@ set -euo pipefail
cd /opt/
PACKAGE=meteor-spk-0.1.7
PACKAGE=meteor-spk-0.1.8
PACKAGE_FILENAME="$PACKAGE.tar.xz"
CACHE_TARGET="/host-dot-sandstorm/caches/${PACKAGE_FILENAME}"
......@@ -44,4 +44,3 @@ cd /home/vagrant/
su -c "tar xf '${METEOR_CACHE_TARGET}'" vagrant
# Link into global PATH
ln -s /home/vagrant/.meteor/meteor /usr/bin/meteor
.travis.yml
+ 18
− 30
View file @ ff141e44
......@@ -2,47 +2,32 @@ sudo: required
language: node_js
branches:
only:
- master
- develop
- master
node_js:
- '0.12'
addons:
apt:
sources:
- google-chrome
packages:
- google-chrome-stable
before_install:
- curl https://install.meteor.com | /bin/sh
- npm install -g npm@'>=2.13.5'
- mkdir -p node_modules
- npm install phantomjs
- npm install velocity-cli
- export PHANTOMJS_BIN=./node_modules/phantomjs/bin/phantomjs
- export JASMINE_BROWSER=PhantomJS
- export DEBUG=1
- export JASMINE_DEBUG=1
- export VELOCITY_DEBUG=1
- export VELOCITY_DEBUG_MIRROR=1
- cd $TRAVIS_BUILD_DIR
- mkdir ../build
- export SANDSTORM_VERSION=$(curl -f "https://install.sandstorm.io/dev?from=0&type=install")
- export PATH=$PATH:/tmp/sandstorm-$SANDSTORM_VERSION/bin
- cd .sandstorm
- ./preprcbuild.sh
script:
- cd $TRAVIS_BUILD_DIR
- if [[ "$TRAVIS_PULL_REQUEST" != "false" ]]; then echo "Building PR $TRAVIS_PULL_REQUEST"; meteor build ../build; exit $?; fi
- cd .travis
- npm install
- npm start
- cd ..
- export TAG=$(git describe --abbrev=0 --tags)
- meteor build ../build
- cp ../build/Rocket.Chat.tar.gz /home/vagrant
- cd .travis
- sh ./namefiles.sh
- cd ..
- meteor add rocketchat:livechat rocketchat:hubot sanjo:jasmine velocity:console-reporter
- ./node_modules/velocity-cli/bin/velocity test-packages --ci
- ./node_modules/velocity-cli/bin/velocity test-app --ci
- meteor build --server demo.rocket.chat ../build
- cd .travis
- sh ./namedemo.sh
- cd ..
after_deploy:
- "curl -H \"Content-Type: application/json\" --data \"{'build': true}\" -X POST https://registry.hub.docker.com/u/rocketchat/rocket.chat/trigger/$PUSHTOKEN/"
- cd $TRAVIS_BUILD_DIR/.sandstorm
- ./buildrc.sh
- cd $TRAVIS_BUILD_DIR
- mv rocket.chat.latest.spk ../build
deploy:
provider: s3
access_key_id: "AKIAIKIA7H7D47KUHYCA"
......@@ -52,5 +37,8 @@ deploy:
local_dir: ../build
on:
branch:
- master
- develop
- master
after_deploy:
- cd .travis
- sh ./builddocker.sh
.travis/builddocker.sh 0 → 100644
+ 5
− 0
View file @ ff141e44
if [ -z ${TRAVIS_TAG+x} ];
then "curl -H \"Content-Type: application/json\" --data \"{'source_type': 'Branch', 'source_name': \'$TRAVIS_BRANCH\', 'docker_tag': \'`cat ../../build/version.txt`\'}\" -X POST https://registry.hub.docker.com/u/rocketchat/rocket.chat/trigger/$PUSHTOKEN/";
else "curl -H \"Content-Type: application/json\" --data \"{'source_type': 'Tag', 'source_name': \'$TRAVIS_TAG\', 'docker_tag': \'`cat ../../build/version.txt`\'}\" -X POST https://registry.hub.docker.com/u/rocketchat/rocket.chat/trigger/$PUSHTOKEN/";
fi
.travis/namedemo.sh deleted 100644 → 0
+ 0
− 5
View file @ 70b0e919
cd ../../build
FILENAME=demo.rocket.chat-`cat version.txt`.tgz
mv Rocket.Chat.tar.gz $FILENAME
ln -s $FILENAME demo.rocket.chat-v.latest.tgz
.travis/namefiles.sh
+ 3
− 4
View file @ ff141e44
cd ../../build
FILENAME=rocket.chat-`cat version.txt`.tgz
mv Rocket.Chat.tar.gz $FILENAME
ln -s $FILENAME rocket.chat-v.latest.tgz
FILENAME=rocket.chat-"$TAG.$TRAVIS_BUILD_NUMBER.$TRAVIS_BRANCH".tgz
mv Rocket.Chat.tar.gz "$FILENAME"
ln -s "$FILENAME" "$TRAVIS_BRANCH.rocket.chat-v.latest.tgz"
.travis/package.json deleted 100644 → 0
+ 0
− 15
View file @ 70b0e919
{
"name": "setbuildinfo",
"version": "1.0.0",
"description": "Set the buildinfo.txt resource",
"main": "setbuildinfo.js",
"scripts": {
"start": "node setbuildinfo.js"
},
"author": "",
"license": "ISC",
"dependencies": {
"line-by-line": "^0.1.4",
"mkdirp": "^0.5.1"
}
}
.travis/setbuildinfo.js deleted 100644 → 0
+ 0
− 39
View file @ 70b0e919
var BUILD_INFO_PATH = '../public/buildinfo/buildinfo.txt';
var PACKAGES_PATH = '../.meteor/versions';
var BUILD_PATH = '../../build';
var LineByLineReader = require('line-by-line');
var mkdirp = require('mkdirp');
var fs = require('fs');
var lr = new LineByLineReader(BUILD_INFO_PATH);
var firstline = "";
if (process.env.TRAVIS_BUILD_NUMBER) {
var transformVersion = function (firstline) {
var versions = firstline.split(".");
return versions[0] + '.' + versions[1] + '.' + process.env.TRAVIS_BUILD_NUMBER + '\n';
};
lr.on('error', function (err) {
// 'err' contains error object
});
lr.on('line', function (line) {
if (firstline == "") {
firstline = line;
}
});
lr.on('end', function () {
var packages = fs.readFileSync(PACKAGES_PATH);
var verinfo = transformVersion(firstline);
var content = verinfo + packages;
mkdirp.sync(BUILD_PATH);
fs.writeFileSync(BUILD_PATH + "/version.txt", verinfo);
fs.writeFileSync(BUILD_INFO_PATH, content);
console.log('Version is ' + verinfo);
});
}
Dockerfile
+ 15
− 7
View file @ ff141e44
FROM node:0.10
MAINTAINER buildmaster@rocket.chat
MAINTAINER buildmaster@rocket.chat
RUN apt-get update \
&& apt-get install -y graphicsmagick \
&& rm -rf /var/lib/apt/lists/*
RUN groupadd -r rocketchat \
&& useradd -r -g rocketchat rocketchat \
&& mkdir /app
&& mkdir /app \
&& mkdir /app/uploads
# gpg: key 4FD08014: public key "Rocket.Chat Buildmaster <buildmaster@rocket.chat>" imported
RUN gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 0E163286C20D07B9787EBE9FD7F9D0414FD08104
WORKDIR /app
RUN curl -fSL "https://s3.amazonaws.com/rocketchatbuild/rocket.chat-v.latest.tgz" -o rocket.chat.tgz \
RUN curl -fSL "https://s3.amazonaws.com/rocketchatbuild/develop.rocket.chat-v.latest.tgz" -o rocket.chat.tgz \
&& tar zxvf ./rocket.chat.tgz \
&& rm ./rocket.chat.tgz \
&& cd /app/bundle/programs/server \
&& npm install
WORKDIR /app/bundle
USER rocketchat
# needs a mongoinstance - defaults to container linking with alias 'db'
ENV MONGO_URL=mongodb://db:27017/meteor \
VOLUME /app/uploads
WORKDIR /app/bundle
# needs a mongoinstance - defaults to container linking with alias 'mongo'
ENV MONGO_URL=mongodb://mongo:27017/rocketchat \
PORT=3000 \
ROOT_URL=http://localhost:3000
ROOT_URL=http://localhost:3000 \
Accounts_AvatarStorePath=/app/uploads
EXPOSE 3000
CMD ["node", "main.js"]
README.md
+ 113
− 88
View file @ ff141e44
......@@ -2,45 +2,106 @@
The Ultimate Open Source WebChat Platform
## Demo
* [Live Demo](#live-demo)
* [Mobile apps](#mobile-apps)
* [Desktop apps](#desktop-apps)
* [Deployment](#deployment)
* [Heroku](#heroku)
* [Sandstorm.io](#sandstormio)
* [Sloppy.io](#sloppyio)
* [Docker](#docker)
* [FreeBSD](#freebsd)
* [Ubuntu VPS](#ubuntu-vps)
* [Ubuntu Software Center](#ubuntu-software-center)
* [About Rocket.Chat](#about-rocketchat)
* [On the News](#on-the-news)
* [Features](#features)
* [Roadmap](#roadmap)
* [Issues](#issues)
* [Integrations](#integrations)
* [Documentation](#documentation)
* [License](#license)
* [Development](#development)
* [Installation](#installation)
* [Branching Model](#branching-model)
* [Translations](#translations)
* [Community](#community)
* [How to Contribute](#how-to-contribute)
* [Credits](#credits)
* [Donate](#donate)
# Live Demo
Checkout the latest version at [https://demo.rocket.chat](https://demo.rocket.chat)
Available from the AppStore:
[![Rocket.Chat on Apple AppStore](http://linkmaker.itunes.apple.com/images/badges/en-us/badge_appstore-lrg.svg)](https://itunes.apple.com/us/app/rocket.chat/id1028869439?mt=8)
# Desktop Apps
Download the Native Cross-Platform Desktop Application at [Rocket.Chat.Electron](https://github.com/RocketChat/Rocket.Chat.Electron/releases)
Get the app for your Android phone:
# Mobile Apps
### Available from the AppStore
[![Rocket.Chat on Apple AppStore](http://linkmaker.itunes.apple.com/images/badges/en-us/badge_appstore-lrg.svg)](https://itunes.apple.com/us/app/rocket.chat/id1028869439?mt=8)
### Available from the Google Play
[![Rocket.Chat on Google Play](https://developer.android.com/images/brand/en_app_rgb_wo_45.png)](https://play.google.com/store/apps/details?id=com.konecty.rocket.chat)
Now compatible with all Android devices as old as version 4.0.x - [download here](https://github.com/RocketChat/Rocket.Chat/wiki/Build-the-Android-Cordova-Web-App-and-connect-to-your-own-Rocket.Chat-Server), even on BlackBerry Passport!
Host your own Rocket.Chat server in four seconds flat:
### Also available as FirefoxOS app
[![Firefox OS app now available](https://raw.githubusercontent.com/Sing-Li/bbug/master/images/firefoxos.png)](https://github.com/RocketChat/Rocket.Chat/wiki/Native-Firefox-OS-app-%28hosted-webapp%29)
# Deployment
`Host your own Rocket.Chat server in four seconds flat`
## Heroku
Host your own Rocket.Chat server for **FREE** with [One-Click Deploy](https://heroku.com/deploy?template=https://github.com/RocketChat/Rocket.Chat/tree/master)
Branch **master** (Latest stable version):
[![Deploy](https://www.herokucdn.com/deploy/button.png)](https://heroku.com/deploy?template=https://github.com/RocketChat/Rocket.Chat/tree/master)
Branch **develop** (Newer but unstable):
[![Deploy](https://www.herokucdn.com/deploy/button.png)](https://heroku.com/deploy?template=https://github.com/RocketChat/Rocket.Chat/tree/develop)
## Sandstorm.io
[![Rocket.Chat on Sandstorm.io](https://raw.githubusercontent.com/Sing-Li/bbug/master/images/sandstorm.jpg)](https://apps.sandstorm.io/app/vfnwptfn02ty21w715snyyczw0nqxkv3jvawcah10c6z7hj1hnu0)
Also available as FirefoxOS app:
_*Grab*_ the latest [Sandstorm SPK](https://s3.amazonaws.com/rocketchatbuild/rocket.chat.latest.spk) for testing on your own server.
## Sloppy.io
Host your docker container at [sloppy.io](http://sloppy.io). Get an account and use the [quickstarter](https://github.com/sloppyio/quickstarters/tree/master/rocketchat)
[![Firefox OS app now available](https://raw.githubusercontent.com/Sing-Li/bbug/master/images/firefoxos.png)](https://github.com/RocketChat/Rocket.Chat/wiki/Native-Firefox-OS-app-%28hosted-webapp%29)
## Docker
[Deploy with docker compose](https://github.com/RocketChat/Rocket.Chat/wiki/Deploy-with-Docker)
or
Use the automated build at our [Official Docker Registry](https://hub.docker.com/r/rocketchat/rocket.chat/)
Try it on Ubuntu:
[![Rocket.Chat logo](https://d207aa93qlcgug.cloudfront.net/1.95.5.qa/img/nav/docker-logo-loggedout.png)](https://hub.docker.com/r/rocketchat/rocket.chat/)
[Deploy on VPS or standalone server](https://github.com/RocketChat/Rocket.Chat/wiki/Deploy-Rocket.Chat-without-docker)
```
docker pull rocketchat/rocket.chat
```
Try it with docker:
## FreeBSD
Run solid five-nines deployment on industry workhorse FreeBSD server:
[Deploy with docker](https://github.com/RocketChat/Rocket.Chat/wiki/Deploy-with-Docker)
[![FreeBSD Daemon](https://raw.githubusercontent.com/Sing-Li/bbug/master/images/freebsd.png)](https://github.com/RocketChat/Rocket.Chat/wiki/FreeBSD)
## Ubuntu VPS
Follow these [deployment instructions](https://github.com/RocketChat/Rocket.Chat/wiki/Deploy-Rocket.Chat-without-docker)
Download the Native Cross-Platform Desktop Application at [Rocket.Chat.Electron](https://github.com/RocketChat/Rocket.Chat.Electron/releases)
## Ubuntu Software Center
Easy one click install right from your Ubuntu Desktop (coming soon)
[![Ubuntu Software Center](https://raw.githubusercontent.com/Sing-Li/bbug/master/images/ubuntusoft.png)]()
[![Donate](https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=49QX7TYCVZK8L)
## About
# About Rocket.Chat
[![Build Status](https://img.shields.io/travis/RocketChat/Rocket.Chat/master.svg)](https://travis-ci.org/RocketChat/Rocket.Chat)
[![Coverage Status](https://coveralls.io/repos/RocketChat/Rocket.Chat/badge.svg)](https://coveralls.io/r/RocketChat/Rocket.Chat)
......@@ -52,7 +113,7 @@ Rocket.Chat is a Web Chat Server, developed in JavaScript, using the [Meteor](ht
It is a great solution for communities and companies wanting to privately host their own chat service or for developers looking forward to build and evolve their own chat platforms.
### On the News
## On the News
##### [Hacker News](https://news.ycombinator.com/item?id=9624737)
> Yes, we made it to the #1
......@@ -63,6 +124,9 @@ It is a great solution for communities and companies wanting to privately host t
##### [JavaScript Weekly](http://javascriptweekly.com/issues/234)
> An open source Web based, channel based chat system (a la Slack) built using Meteor, the full stack JavaScript development platform.
##### [Open Source China](http://www.oschina.net/p/rocket-chat)
> Rocket.Chat 是特性最丰富的 Slack 开源替代品之一。 主要功能：群组聊天，直接通信，私聊群，桌面通知，媒体嵌入，链接预览，文件上传，语音/视频 聊天，截图等等。
##### [wwwhatsnew.com](http://wwwhatsnew.com/2015/05/30/rocket-chat-para-los-programadores-que-quieran-ofrecer-un-chat-en-su-web/)
> Para los programadores que quieran ofrecer un chat en su web
......@@ -115,7 +179,7 @@ It is a great solution for communities and companies wanting to privately host t
- Sandstorm.io instant Rocket.Chat server [Now on Sandstorm App Store](https://apps.sandstorm.io/app/vfnwptfn02ty21w715snyyczw0nqxkv3jvawcah10c6z7hj1hnu0)
### Roadmap
## Roadmap
#### In Progress
- Support multiple teams on the same instance / same VPS infrastructure: [Issue #658](https://github.com/RocketChat/Rocket.Chat/issues/658), [Issue #630](https://github.com/RocketChat/Rocket.Chat/issues/630)
......@@ -136,11 +200,11 @@ It is a great solution for communities and companies wanting to privately host t
- File Sharing via P2P and Scalable Multicast: [Issue #369](https://github.com/RocketChat/Rocket.Chat/issues/369), [Issue #370](https://github.com/RocketChat/Rocket.Chat/issues/370)
- Anti-virus checking on file uploads: [Issue #757](https://github.com/RocketChat/Rocket.Chat/issues/757)
### Issues
## Issues
[Github Issues](https://github.com/RocketChat/Rocket.Chat/issues) are used to track todos, bugs, feature requests, and more.
### Integrations
## Integrations
#### Hubot
......@@ -159,54 +223,18 @@ Integrate your application with fly-in panels today! Early access is available
We are developing the APIs based on the competition, so stay tuned and you will see a lot happening here.
### Documentation
## Documentation
Checkout [Github Wiki](https://github.com/RocketChat/Rocket.Chat/wiki)
## Production Deployment
### Ubuntu VPS or server
Follow these [deployment instructions](https://github.com/RocketChat/Rocket.Chat/wiki/Deploy-Rocket.Chat-without-docker).
### FreeBSD
Solid five-nines deployment with industry workhorse FreeBSD (coming soon).
![FreeBSD Daemon](https://raw.githubusercontent.com/Sing-Li/bbug/master/images/freebsd.png)
### Ubuntu Software Center
Easy one click install right from your Ubuntu Desktop (coming soon).
[![Ubuntu Software Center](https://raw.githubusercontent.com/Sing-Li/bbug/master/images/ubuntusoft.png)]()
### Docker
Use the automated build at our [Official Docker Registry](https://hub.docker.com/r/rocketchat/rocket.chat/)
[![Rocket.Chat logo](https://d207aa93qlcgug.cloudfront.net/1.95.5.qa/img/nav/docker-logo-loggedout.png)](https://hub.docker.com/r/rocketchat/rocket.chat/)
```
docker pull rocketchat/rocket.chat
```
### sloppy.io
Host your docker container at [sloppy.io](http://sloppy.io). Get an account and use the [quickstarter](https://github.com/sloppyio/quickstarters/tree/master/rocketchat)
### Heroku
Host your own Rocket.Chat server for **FREE** with [One-Click Deploy](https://heroku.com/deploy?template=https://github.com/RocketChat/Rocket.Chat/tree/master)
[![Deploy](https://www.herokucdn.com/deploy/button.png)](https://heroku.com/deploy?template=https://github.com/RocketChat/Rocket.Chat/tree/master)
## License
Note that Rocket.Chat is distributed under the [MIT License](http://opensource.org/licenses/MIT).
## Development Installation
# Development
## Installation
Prerequisites:
* [Git](http://git-scm.com/book/en/v2/Getting-Started-Installing-Git)
......@@ -228,7 +256,30 @@ cd Rocket.Chat
docker run -it -p 3000:3000 -v "$(pwd)":/app danieldent/meteor
```
## Credits
## Branching Model
See [Branches and Releases](https://github.com/RocketChat/Rocket.Chat/wiki/Branches-and-Releases).
It is based on [Gitflow Workflow](http://nvie.com/posts/a-successful-git-branching-model/), reference section below is derived from Vincent Driessen at nvie.
See also this [Git Workflows Comparison](https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow) for more details.
## Translations
We are experimenting [Lingohub](https://translate.lingohub.com/engelgabriel/rocket-dot-chat/dashboard).
If you want to help, send an email to support at rocket.chat to be invited to the translation project.
## Community
Join the conversation at [Twitter](https://twitter.com/RocketChatApp), [Facebook](https://www.facebook.com/RocketChatApp) or [Google Plus](https://plus.google.com/+RocketChatApp)
## How to Contribute
Already a JavaScript developer? Familiar with Meteor? [Pick an issue](https://github.com/RocketChat/Rocket.Chat/labels/contrib%3A%20easy), push a PR and instantly become a member of Rocket.Chat's international contributors community.
A lot of work has already gone into Rocket.Chat, but we have much bigger plans for it!
# Credits
Thanks to
[Aaron Ogle](https://github.com/geekgonecrazy),
......@@ -245,34 +296,8 @@ Emoji provided free by [Emoji One](http://emojione.com)
Performance monitoring provided by [Kadira](https://kadira.io)
### Contributions
#### We Need Your Help!
A lot of work has already gone into Rocket.Chat, but we have much bigger plans for it!
So if you'd like to be part of the project, please check out the [roadmap](https://github.com/RocketChat/Rocket.Chat/milestones) and [issues](https://github.com/RocketChat/Rocket.Chat/issues) to see if there's anything you can help with.
### Branching Model
The [Gitflow Workflow](http://nvie.com/posts/a-successful-git-branching-model/) section below is derived from Vincent Driessen at nvie.
See also this [Git Workflows Comparison](https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow) for more details.
### Translations
We are experimenting [Lingohub](https://translate.lingohub.com/engelgabriel/rocket-dot-chat/dashboard).
If you want to help, send an email to support at rocket.chat to be invited to the translation project.
### Community
Join the conversation at [Twitter](https://twitter.com/RocketChatApp), [Facebook](https://www.facebook.com/RocketChatApp) or [Google Plus](https://plus.google.com/+RocketChatApp)
### License
Note that Rocket.Chat is distributed under the [MIT License](http://opensource.org/licenses/MIT).
### Donate
# Donate
Rocket.Chat will be free forever, but you can help us speed-up the development!
......
app.json
+ 1
− 2
View file @ ff141e44
......@@ -8,8 +8,7 @@
"env": {
"BUILDPACK_URL": "https://github.com/RocketChat/heroku-buildpack-meteor.git",
"ROOT_URL": {
"description": "IMPORTANT! Please replace <App Name> with the value provided on the top. This will be the full URL of your Rocket.Chat app.",
"value": "https://<App Name>.herokuapp.com"
"description": "IMPORTANT! Must be 'https://<App Name>.herokuapp.com' Replace <App Name> with the value you provided at the top. This will be the full URL of your Rocket.Chat."
}
},
"addons": [
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment