Skip to content

Commit

Permalink
Merge branch 'develop' into max-msg-size-emoji
Browse files Browse the repository at this point in the history
  • Loading branch information
c0dzilla committed Jun 5, 2018
1 parent 67b68ca commit 1f3bd47
Show file tree
Hide file tree
Showing 73 changed files with 2,762 additions and 3,777 deletions.
12 changes: 11 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -152,10 +152,12 @@ jobs:
- run:
name: Install dependencies
command: |
wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 0C49F3730359A14518585931BC711F9BA15703C6
echo "deb [ arch=amd64 ] http://dl.google.com/linux/chrome/deb/ stable main" | sudo tee /etc/apt/sources.list.d/google.list
echo "deb [ arch=amd64 ] http://repo.mongodb.org/apt/ubuntu trusty/mongodb-org/3.4 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-3.4.list
sudo apt-get update
sudo apt-get install -y mongodb-org-shell
sudo apt-get install -y mongodb-org-shell google-chrome-stable
- run:
name: Configure Replica Set
Expand Down Expand Up @@ -192,6 +194,14 @@ jobs:

- checkout

- run:
name: Install dependencies
command: |
wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
echo "deb [ arch=amd64 ] http://dl.google.com/linux/chrome/deb/ stable main" | sudo tee /etc/apt/sources.list.d/google.list
sudo apt-get update
sudo apt-get install -y google-chrome-stable
- run:
name: NPM install
command: |
Expand Down
48 changes: 48 additions & 0 deletions .github/history.json
Original file line number Diff line number Diff line change
Expand Up @@ -14697,5 +14697,53 @@
"geekgonecrazy"
]
}
],
"0.65.1": [
{
"pr": "10940",
"title": "[FIX] Livechat not loading",
"userLogin": "sampaiodiego",
"milestone": "0.65.1",
"contributors": [
"sampaiodiego",
"rodrigok"
]
},
{
"pr": "10934",
"title": "[FIX] Application crashing on startup when trying to log errors to `exceptions` channel",
"userLogin": "sampaiodiego",
"milestone": "0.65.1",
"contributors": [
"sampaiodiego"
]
},
{
"pr": "10928",
"title": "[FIX] Incomplete email notification link",
"userLogin": "sampaiodiego",
"milestone": "0.65.1",
"contributors": [
"sampaiodiego"
]
},
{
"pr": "10904",
"title": "[FIX] Image lazy load was breaking attachments",
"userLogin": "ggazzo",
"milestone": "0.65.1",
"contributors": [
"ggazzo"
]
},
{
"pr": "10851",
"title": "[FIX] Leave room wasn't working as expected",
"userLogin": "ggazzo",
"milestone": "0.65.1",
"contributors": [
"ggazzo"
]
}
]
}
8 changes: 4 additions & 4 deletions .meteor/versions
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ blaze@2.3.2
blaze-html-templates@1.1.2
blaze-tools@1.0.10
boilerplate-generator@1.4.0
caching-compiler@1.1.11
caching-compiler@1.1.12
caching-html-compiler@1.1.2
callback-hook@1.1.0
cfs:http-methods@0.0.32
Expand Down Expand Up @@ -85,7 +85,7 @@ meteorhacks:inject-initial@1.0.4
meteorhacks:meteorx@1.4.1
meteorspark:util@0.2.0
minifier-css@1.3.1
minifier-js@2.3.4
minifier-js@2.3.5
minimongo@1.4.4
mizzao:autocomplete@0.5.1
mizzao:timesync@0.3.4
Expand Down Expand Up @@ -246,7 +246,7 @@ rocketchat:videobridge@0.2.0
rocketchat:webrtc@0.0.1
rocketchat:wordpress@0.0.1
routepolicy@1.0.13
server-render@0.3.0
server-render@0.3.1
service-configuration@1.0.11
session@1.1.7
sha@1.0.9
Expand All @@ -257,7 +257,7 @@ socket-stream-client@0.1.0
spacebars@1.0.15
spacebars-compiler@1.1.3
srp@1.0.10
standard-minifier-js@2.3.3
standard-minifier-js@2.3.4
steffo:meteor-accounts-saml@0.0.1
swydo:graphql@0.0.3
tap:i18n@1.8.2
Expand Down
2 changes: 1 addition & 1 deletion .snapcraft/resources/preparecaddy
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#! /bin/bash

caddy_version="v0.10.12"
caddy_version="v0.11.0"

caddy_bin="caddy"
caddy_dl_ext=".tar.gz"
Expand Down
2 changes: 1 addition & 1 deletion .snapcraft/snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ apps:
parts:
node:
plugin: dump
prepare: wget https://nodejs.org/dist/v8.9.4/node-v8.9.4-linux-x64.tar.xz; tar xvf node-v8.9.4-linux-x64.tar.xz --strip 1;
prepare: wget https://nodejs.org/dist/v8.11.2/node-v8.11.2-linux-x64.tar.xz; tar xvf node-v8.11.2-linux-x64.tar.xz --strip 1;
build-packages:
# For fibers
- python
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
![Rocket.Chat logo](https://rocket.chat/images/logo/logo-dark.svg?v3)
![Rocket.Chat logo](https://upload.wikimedia.org/wikipedia/commons/1/12/Rocket.Chat_Logo.svg)

# The Ultimate Open Source WebChat Platform

Expand Down Expand Up @@ -129,7 +129,7 @@ Host your own Rocket.Chat server in a few seconds.

Easiest way to install a ready-to-run Rocket.Chat server on a Linux machine, VM, or VPS.

[![DP deploy](https://raw.githubusercontent.com/DFabric/DPlatform-ShellCore/gh-pages/img/deploy.png)](https://dfabric.github.io/DPlatform-ShellCore)
[![DP deploy](https://raw.githubusercontent.com/DFabric/DPlatform-ShellCore/images/logo.png)](https://dfabric.github.io/DPlatform-ShellCore)

## IndieHosters
Get your Rocket.Chat instance hosted in a "as a Service" style. You register and we manage it for you! (updates, backup...).
Expand Down
Loading

0 comments on commit 1f3bd47

Please sign in to comment.