Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

Rocket.Chat
- Activity
- Members
- Terraform modules

Snippets Groups Projects

f9806dee

Commit f9806dee authored 8 years ago by Alex Brazier

Downloads
- Plain Diff

Merge branch 'develop' into feature/name-as-avatar

parents d32c6eed 8e15592f

No related branches found

No related tags found

No related merge requests found

Changes 648

Hide whitespace changes

Inline Side-by-side

Showing

.editorconfig 1 addition, 1 deletion

.editorconfig
.eslintignore 1 addition, 0 deletions

.eslintignore
.gitignore 3 additions, 0 deletions

.gitignore
.meteor/packages 1 addition, 1 deletion

.meteor/packages
.meteor/versions 6 additions, 7 deletions

.meteor/versions
.sandstorm/sandstorm-pkgdef.capnp 2 additions, 2 deletions

.sandstorm/sandstorm-pkgdef.capnp
.scripts/start-xvfb.sh 6 additions, 0 deletions

.scripts/start-xvfb.sh
.scripts/start.js 88 additions, 0 deletions

.scripts/start.js
.snapcraft/edge/snapcraft.yaml 3 additions, 3 deletions

.snapcraft/edge/snapcraft.yaml
.snapcraft/stable/snapcraft.yaml 3 additions, 3 deletions

.snapcraft/stable/snapcraft.yaml
.stylelintignore 2 additions, 0 deletions

.stylelintignore
.stylelintrc 115 additions, 0 deletions

.stylelintrc
.travis.yml 30 additions, 1 deletion

.travis.yml
FEATURES.md 2 additions, 0 deletions

FEATURES.md
HISTORY.md 203 additions, 45 deletions

HISTORY.md
README.md 1 addition, 0 deletions

README.md
README.nitrous.md 0 additions, 16 deletions

README.nitrous.md
app.json 1 addition, 1 deletion

app.json
client/helpers/log.coffee 0 additions, 2 deletions

client/helpers/log.coffee
client/helpers/log.js 3 additions, 0 deletions

client/helpers/log.js

with 471 additions and 82 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment