Skip to content

Commit

Permalink
Merge pull request #11881 from RocketChat/release-0.69.0
Browse files Browse the repository at this point in the history
Release 0.69.0
  • Loading branch information
sampaiodiego committed Aug 28, 2018
2 parents e412d01 + 0428ec7 commit 79e53f9
Show file tree
Hide file tree
Showing 1,523 changed files with 21,200 additions and 17,375 deletions.
30 changes: 30 additions & 0 deletions .docker-mongo/entrypoint.sh
@@ -1,5 +1,35 @@
#!/bin/bash

echo """

 
 
 
   
      
        
           
           
           
         
         
          
          
          
       
             
           
        
        
    
       
  

"""

echo """
██████╗ ██████╗ ██████╗██╗ ██╗███████╗████████╗ ██████╗██╗ ██╗ █████╗ ████████╗ ██████╗ ██████╗ ███████╗██╗ ██╗██╗███████╗██╗ ██╗
██╔══██╗██╔═══██╗██╔════╝██║ ██╔╝██╔════╝╚══██╔══╝██╔════╝██║ ██║██╔══██╗╚══██╔══╝ ██╔══██╗██╔══██╗██╔════╝██║ ██║██║██╔════╝██║ ██║
Expand Down
2 changes: 1 addition & 1 deletion .docker/Dockerfile.rhel
@@ -1,6 +1,6 @@
FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7

ENV RC_VERSION 0.68.5
ENV RC_VERSION 0.69.0

MAINTAINER buildmaster@rocket.chat

Expand Down
3 changes: 2 additions & 1 deletion .eslintignore
Expand Up @@ -6,13 +6,13 @@ packages/rocketchat-emoji-emojione/generateEmojiIndex.js
packages/rocketchat-favico/favico.js
packages/rocketchat-katex/client/katex/katex.min.js
packages/rocketchat-livechat/.app/node_modules
packages/rocketchat-livechat/.app/.meteor
packages/rocketchat-livechat/assets/rocketchat-livechat.min.js
packages/rocketchat-livechat/assets/rocket-livechat.js
packages/rocketchat-theme/client/minicolors/jquery.minicolors.js
packages/rocketchat-ui/client/lib/customEventPolyfill.js
packages/rocketchat-ui/client/lib/Modernizr.js
packages/rocketchat-ui/client/lib/recorderjs/recorder.js
packages/rocketchat-ui/client/lib/textarea-autogrow.js
packages/rocketchat-videobridge/client/public/external_api.js
packages/rocketchat-theme/client/vendor/
packages/tap-i18n/lib/tap_i18next/tap_i18next-1.7.3.js
Expand All @@ -21,3 +21,4 @@ public/livechat/
public/mp3-realtime-worker.js
public/lame.min.js
!.scripts
!packages/rocketchat-livechat/.app
49 changes: 48 additions & 1 deletion .eslintrc
Expand Up @@ -39,6 +39,24 @@
"no-inner-declarations": [2, "functions"],
"no-invalid-regexp": 2,
"no-irregular-whitespace": 2,
"no-mixed-operators": [2, {
"groups": [
["%", "**"],
["%", "+"],
["%", "-"],
["%", "*"],
["%", "/"],
["**", "+"],
["**", "-"],
["**", "*"],
["**", "/"],
["&", "|", "^", "~", "<<", ">>", ">>>"],
["==", "!=", "===", "!==", ">", ">=", "<", "<="],
["&&", "||"],
["in", "instanceof"]
],
"allowSamePrecedence": false
}],
"no-mixed-spaces-and-tabs": 2,
"no-sparse-arrays": 2,
"no-negated-in-lhs": 2,
Expand All @@ -54,6 +72,35 @@
}],
"no-void": 2,
"no-var": 2,
"no-multiple-empty-lines": [2, { "max": 2 }],
"no-nested-ternary": 2,
"prefer-rest-params": 2,
"array-callback-return": 2,
"prefer-destructuring": [2, {
"VariableDeclarator": {
"array": false,
"object": true
},
"AssignmentExpression": {
"array": false,
"object": false
}
}, {
"enforceForRenamedProperties": false
}],
"no-duplicate-imports": 2,
"arrow-parens": [2, "always"],
"quote-props": [2, "as-needed"],
"no-array-constructor": 2,
"arrow-spacing": 2,
"arrow-body-style": [2, "as-needed"],
"no-confusing-arrow": [2, { "allowParens": true }],
"dot-notation": 2,
"no-unneeded-ternary": 2,
"spaced-comment": 2,
"space-infix-ops": 2,
"array-bracket-spacing": [2, "never"],
"object-curly-spacing": [2, "always"],
"one-var": [2, "never"],
"no-lonely-if": 2,
"no-trailing-spaces": 2,
Expand All @@ -63,7 +110,7 @@
"space-before-blocks": [2, "always"],
"indent": [2, "tab", {"SwitchCase": 1}],
"eol-last": [2, "always"],
"comma-dangle": [2, "never"],
"comma-dangle": [2, "always-multiline"],
"keyword-spacing": 2,
"block-spacing": 2,
"brace-style": [2, "1tbs", { "allowSingleLine": true }],
Expand Down

0 comments on commit 79e53f9

Please sign in to comment.