Skip to content

Commit 79e53f9

Browse files
sampaiodiegosampaiodiego
authored
Merge pull request RocketChat#11881 from RocketChat/release-0.69.0
Release 0.69.0
2 parents e412d01 + 0428ec7 commit 79e53f9

1,523 files changed

Lines changed: 21200 additions & 17375 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.docker-mongo/entrypoint.sh‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,35 @@
11
#!/bin/bash
22

3+
echo """
4+

5+
 
6+
 
7+
 
8+
   
9+
      
10+
        
11+
           
12+
           
13+
           
14+
         
15+
         
16+
          
17+
          
18+
          
19+
       
20+
             
21+
           
22+
        
23+
        
24+
    
25+
       
26+
  
27+
28+
29+
30+

31+
"""
32+
333
echo """
434
██████╗ ██████╗ ██████╗██╗ ██╗███████╗████████╗ ██████╗██╗ ██╗ █████╗ ████████╗ ██████╗ ██████╗ ███████╗██╗ ██╗██╗███████╗██╗ ██╗
535
██╔══██╗██╔═══██╗██╔════╝██║ ██╔╝██╔════╝╚══██╔══╝██╔════╝██║ ██║██╔══██╗╚══██╔══╝ ██╔══██╗██╔══██╗██╔════╝██║ ██║██║██╔════╝██║ ██║

‎.docker/Dockerfile.rhel‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM registry.access.redhat.com/rhscl/nodejs-8-rhel7
22

3-
ENV RC_VERSION 0.68.5
3+
ENV RC_VERSION 0.69.0
44

55
MAINTAINER buildmaster@rocket.chat
66

‎.eslintignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ packages/rocketchat-emoji-emojione/generateEmojiIndex.js
66
packages/rocketchat-favico/favico.js
77
packages/rocketchat-katex/client/katex/katex.min.js
88
packages/rocketchat-livechat/.app/node_modules
9+
packages/rocketchat-livechat/.app/.meteor
910
packages/rocketchat-livechat/assets/rocketchat-livechat.min.js
1011
packages/rocketchat-livechat/assets/rocket-livechat.js
1112
packages/rocketchat-theme/client/minicolors/jquery.minicolors.js
1213
packages/rocketchat-ui/client/lib/customEventPolyfill.js
1314
packages/rocketchat-ui/client/lib/Modernizr.js
1415
packages/rocketchat-ui/client/lib/recorderjs/recorder.js
15-
packages/rocketchat-ui/client/lib/textarea-autogrow.js
1616
packages/rocketchat-videobridge/client/public/external_api.js
1717
packages/rocketchat-theme/client/vendor/
1818
packages/tap-i18n/lib/tap_i18next/tap_i18next-1.7.3.js
@@ -21,3 +21,4 @@ public/livechat/
2121
public/mp3-realtime-worker.js
2222
public/lame.min.js
2323
!.scripts
24+
!packages/rocketchat-livechat/.app

‎.eslintrc‎

Lines changed: 48 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,24 @@
3939
"no-inner-declarations": [2, "functions"],
4040
"no-invalid-regexp": 2,
4141
"no-irregular-whitespace": 2,
42+
"no-mixed-operators": [2, {
43+
"groups": [
44+
["%", "**"],
45+
["%", "+"],
46+
["%", "-"],
47+
["%", "*"],
48+
["%", "/"],
49+
["**", "+"],
50+
["**", "-"],
51+
["**", "*"],
52+
["**", "/"],
53+
["&", "|", "^", "~", "<<", ">>", ">>>"],
54+
["==", "!=", "===", "!==", ">", ">=", "<", "<="],
55+
["&&", "||"],
56+
["in", "instanceof"]
57+
],
58+
"allowSamePrecedence": false
59+
}],
4260
"no-mixed-spaces-and-tabs": 2,
4361
"no-sparse-arrays": 2,
4462
"no-negated-in-lhs": 2,
@@ -54,6 +72,35 @@
5472
}],
5573
"no-void": 2,
5674
"no-var": 2,
75+
"no-multiple-empty-lines": [2, { "max": 2 }],
76+
"no-nested-ternary": 2,
77+
"prefer-rest-params": 2,
78+
"array-callback-return": 2,
79+
"prefer-destructuring": [2, {
80+
"VariableDeclarator": {
81+
"array": false,
82+
"object": true
83+
},
84+
"AssignmentExpression": {
85+
"array": false,
86+
"object": false
87+
}
88+
}, {
89+
"enforceForRenamedProperties": false
90+
}],
91+
"no-duplicate-imports": 2,
92+
"arrow-parens": [2, "always"],
93+
"quote-props": [2, "as-needed"],
94+
"no-array-constructor": 2,
95+
"arrow-spacing": 2,
96+
"arrow-body-style": [2, "as-needed"],
97+
"no-confusing-arrow": [2, { "allowParens": true }],
98+
"dot-notation": 2,
99+
"no-unneeded-ternary": 2,
100+
"spaced-comment": 2,
101+
"space-infix-ops": 2,
102+
"array-bracket-spacing": [2, "never"],
103+
"object-curly-spacing": [2, "always"],
57104
"one-var": [2, "never"],
58105
"no-lonely-if": 2,
59106
"no-trailing-spaces": 2,
@@ -63,7 +110,7 @@
63110
"space-before-blocks": [2, "always"],
64111
"indent": [2, "tab", {"SwitchCase": 1}],
65112
"eol-last": [2, "always"],
66-
"comma-dangle": [2, "never"],
113+
"comma-dangle": [2, "always-multiline"],
67114
"keyword-spacing": 2,
68115
"block-spacing": 2,
69116
"brace-style": [2, "1tbs", { "allowSingleLine": true }],

0 commit comments

Comments
 (0)