Skip to content

Commit

Permalink
Merge pull request RocketChat#266 from assistify/0.62
Browse files Browse the repository at this point in the history
Merge Rocket.Chat 0.62
Pair-merged with @ThomasRoehl => merge as admin
  • Loading branch information
mrsimpson authored Apr 17, 2018
2 parents 692b380 + dd48e66 commit c2071eb
Show file tree
Hide file tree
Showing 511 changed files with 16,697 additions and 5,098 deletions.
2 changes: 1 addition & 1 deletion .docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM rocketchat/base:8

ENV RC_VERSION 0.61.1
ENV RC_VERSION 0.62.2

MAINTAINER [email protected]

Expand Down
1 change: 1 addition & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@
"AccountBox" : false,
"Accounts" : false,
"AgentUsers" : false,
"Apps" : false,
"Assets" : false,
"Blaze" : false,
"BlazeLayout" : false,
Expand Down
11 changes: 6 additions & 5 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,13 @@ If you are experiencing a bug please search our issues to be sure it is not alre

### Server Setup Information:

* Version of Rocket.Chat Server:
* Operating System:
* Deployment Method(snap/docker/tar/etc):
* Version of Rocket.Chat Server:
* Operating System:
* Deployment Method(snap/docker/tar/etc):
* Number of Running Instances:
* DB Replicaset Oplog:
* Node Version:
* DB Replicaset Oplog:
* Node Version:
* mongoDB Version:

### Steps to Reproduce:

Expand Down
2 changes: 2 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,6 @@
<!-- INSTRUCTION: Inform the issue number that this PR closes, or remove the line below -->
Closes #ISSUE_NUMBER

<!-- INSTRUCTION: Link to a https://github.com/RocketChat/docs PR with added/updated documentation or an update to the missing/outdated documentation list, see https://rocket.chat/docs/contributing/documentation/ -->

<!-- INSTRUCTION: Tell us more about your PR with screen shots if you can -->
1 change: 1 addition & 0 deletions .github/bot-config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ whitelist:
users:
- TwizzyDizzy
- theorenck
- JSzaszvari
labels:
- duplicate
- enhancement
Expand Down
43 changes: 26 additions & 17 deletions .meteor/packages
Original file line number Diff line number Diff line change
Expand Up @@ -5,41 +5,42 @@

rocketchat:cors

[email protected].0
[email protected].0
[email protected].0
[email protected].0
[email protected].1
[email protected].1
[email protected].1
[email protected].1
[email protected]
[email protected].0
[email protected].1
blaze-html-templates
check@1.2.5
check@1.3.0
[email protected]
ddp-common@1.3.0
dynamic-import@0.2.0
ecmascript@0.9.0
ddp-common@1.4.0
dynamic-import@0.3.0
ecmascript@0.10.0
[email protected]
[email protected]
[email protected]
http@1.3.0
http@1.4.0
[email protected]
[email protected]
meteor-base@1.2.0
meteor-base@1.3.0
[email protected]
mongo@1.3.1
random@1.0.10
mongo@1.4.2
random@1.1.0
[email protected]
[email protected]
[email protected]
reload@1.1.11
reload@1.2.0
[email protected]
[email protected]
[email protected].0
[email protected].1
spacebars
standard-minifier-js@2.2.0
standard-minifier-js@2.3.1
[email protected]

rocketchat:2fa
rocketchat:action-links
rocketchat:accounts
rocketchat:analytics
rocketchat:api
rocketchat:assets
Expand Down Expand Up @@ -67,6 +68,11 @@ rocketchat:github-enterprise
rocketchat:gitlab
#rocketchat:google-natural-language
rocketchat:google-vision
rocketchat:grant
rocketchat:grant-facebook
rocketchat:grant-github
rocketchat:grant-google
rocketchat:graphql
rocketchat:highlight-words
rocketchat:iframe-login
rocketchat:importer
Expand All @@ -83,6 +89,7 @@ rocketchat:katex
rocketchat:ldap
rocketchat:lib
rocketchat:livechat
rocketchat:livestream
rocketchat:logger
rocketchat:login-token
rocketchat:mailer
Expand All @@ -103,6 +110,7 @@ rocketchat:otr
rocketchat:postcss
rocketchat:push-notifications
rocketchat:reactions
rocketchat:apps
rocketchat:sandstorm
rocketchat:slackbridge
rocketchat:slashcommands-archive
Expand Down Expand Up @@ -142,12 +150,12 @@ rocketchat:version
rocketchat:videobridge
rocketchat:webrtc
rocketchat:wordpress
rocketchat:nrr

konecty:change-case
konecty:delayed-task
konecty:mongo-counter
konecty:multiple-instances-status
konecty:nrr
konecty:user-presence

deepwell:bootstrap-datepicker2
Expand Down Expand Up @@ -180,4 +188,5 @@ assistify:help-request
assistify:ai
assistify:defaults
chatpal:search
rocketchat:version-check
meteorhacks:aggregate
2 changes: 1 addition & 1 deletion .meteor/release
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[email protected].0.1
[email protected]
91 changes: 53 additions & 38 deletions .meteor/versions
Original file line number Diff line number Diff line change
Expand Up @@ -11,42 +11,44 @@ [email protected]
assistify:[email protected]
assistify:[email protected]
assistify:[email protected]
[email protected]
[email protected]
[email protected]
[email protected]

[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
boilerplate-generator@1.3.1
[email protected].9
boilerplate-generator@1.4.0
[email protected].11
[email protected]
callback-hook@1.0.10
callback-hook@1.1.0
cfs:[email protected]
chatpal:[email protected]
[email protected]
coffeescript@1.12.7_3
coffeescript-compiler@1.12.7_3

check@1.3.0
coffeescript@1.0.17
dandv:[email protected]
[email protected]
ddp-client@2.2.0
ddp-common@1.3.0
ddp-client@2.3.1
ddp-common@1.4.0
[email protected]
[email protected].1
[email protected].2
deepwell:[email protected]
[email protected]
diff-sequence@1.0.7
diff-sequence@1.1.0
dispatch:[email protected]
dynamic-import@0.2.1
ecmascript@0.9.0
dynamic-import@0.3.0
ecmascript@0.10.4
[email protected]
ecmascript-runtime-client@0.5.0
ecmascript-runtime-client@0.6.2
[email protected]
edgee:[email protected]
[email protected]
[email protected]
emojione:[email protected]
[email protected]
[email protected]
[email protected]
francocatena:[email protected]
Expand All @@ -56,15 +58,15 @@ [email protected]
[email protected]
[email protected]
[email protected]
http@1.3.0
id-map@1.0.9
http@1.4.0
id-map@1.1.0
jalik:[email protected]_1
jalik:[email protected]
jalik:[email protected]
jparker:[email protected]
jparker:[email protected]
jparker:[email protected]
[email protected].10
[email protected].11
kadira:[email protected]
kadira:[email protected]
keepnox:[email protected]
Expand All @@ -73,33 +75,32 @@ konecty:[email protected]
konecty:[email protected]
konecty:[email protected]_3
konecty:[email protected]
konecty:[email protected]
konecty:[email protected]
[email protected]
[email protected].11
[email protected].12
[email protected]
[email protected]
[email protected]
matb33:[email protected]
mdg:[email protected]
[email protected]
meteor-base@1.2.0
meteor-base@1.3.0
[email protected]
meteorhacks:[email protected]
meteorhacks:[email protected]
meteorhacks:[email protected]
meteorhacks:[email protected]
meteorspark:[email protected]
minifier-css@1.2.16
minifier-js@2.2.2
minifier-css@1.3.1
minifier-js@2.3.2
[email protected]
mizzao:[email protected]
mizzao:[email protected]
[email protected]
[email protected]
[email protected].2
[email protected].1
mongo@1.3.1
[email protected].4
[email protected].2
mongo@1.4.3
[email protected]
[email protected]
[email protected]
Expand All @@ -108,32 +109,34 @@ mystor:[email protected]
nimble:[email protected]
nooitaf:[email protected]_1
[email protected]
[email protected].33
[email protected].34
[email protected]
[email protected]
[email protected]
[email protected]
ordered-dict@1.0.9
ordered-dict@1.1.0
ostrio:[email protected]
pauli:[email protected]
pauli:[email protected]
percolate:[email protected]
[email protected].1
[email protected].2
raix:[email protected]
raix:[email protected]
raix:[email protected]
raix:[email protected]
raix:[email protected]
random@1.0.10
[email protected].8
random@1.1.0
[email protected].9
[email protected]
[email protected]
reload@1.1.11
retry@1.0.9
reload@1.2.0
retry@1.1.0
rocketchat:[email protected]
rocketchat:[email protected]
rocketchat:[email protected]
rocketchat:[email protected]
rocketchat:[email protected]
rocketchat:[email protected]
rocketchat:[email protected]
rocketchat:[email protected]
rocketchat:[email protected]
Expand All @@ -159,6 +162,11 @@ rocketchat:[email protected]
rocketchat:[email protected]
rocketchat:[email protected]
rocketchat:[email protected]
rocketchat:[email protected]
rocketchat:[email protected]
rocketchat:[email protected]
rocketchat:[email protected]
rocketchat:[email protected]
rocketchat:[email protected]
rocketchat:[email protected]
rocketchat:[email protected]
Expand All @@ -176,6 +184,7 @@ rocketchat:[email protected]
rocketchat:[email protected]
rocketchat:[email protected]
rocketchat:[email protected]
rocketchat:[email protected]
rocketchat:[email protected]
rocketchat:[email protected]
rocketchat:[email protected]
Expand All @@ -190,6 +199,7 @@ rocketchat:[email protected]
rocketchat:[email protected]
rocketchat:[email protected]
rocketchat:[email protected]_3
rocketchat:[email protected]
rocketchat:[email protected]
rocketchat:[email protected]
rocketchat:[email protected]
Expand Down Expand Up @@ -234,20 +244,25 @@ rocketchat:[email protected]
rocketchat:[email protected]
rocketchat:[email protected]
rocketchat:[email protected]
rocketchat:[email protected]
rocketchat:[email protected]
rocketchat:[email protected]
rocketchat:[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
simple:[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
standard-minifier-js@2.2.3
standard-minifier-js@2.3.2
steffo:[email protected]
swydo:[email protected]
tap:[email protected]
[email protected]
[email protected]
Expand All @@ -258,8 +273,8 @@ [email protected]
[email protected]
[email protected]
[email protected]
url@1.1.0
webapp@1.4.0
url@1.2.0
webapp@1.5.0
[email protected]
yasaricli:[email protected]
yasinuslu:[email protected]
Loading

0 comments on commit c2071eb

Please sign in to comment.