Skip to content

Commit f412e7d

Browse files
rodrigokrodrigok
committed
Merge remote-tracking branch 'origin/develop' into join-i18n
# Conflicts: # i18n/pt.i18n.json
2 parents e0d3b75 + 56c2a2c commit f412e7d

File tree

150 files changed

+1481
-1248
lines changed

Some content is hidden

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

150 files changed

+1481
-1248
lines changed

‎.editorconfig‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@
33
root = true
44

55
[*]
6-
indent_style = tab
76
end_of_line = lf
87
charset = utf-8
98
trim_trailing_whitespace = true
109
insert_final_newline = true
1110

11+
[*.{js,coffee,html}]
12+
indent_style = tab
13+
1214
[*.md]
1315
trim_trailing_whitespace = false

‎.eslintignore‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
public/recorderWorker.js
2+
lib/ua-parser.min.js
3+
private/moment-locales/
4+
packages/autoupdate/
5+
packages/meteor-streams/
6+
packages/rocketchat-migrations/
7+
packages/rocketchat-katex/client/lib/katex.min.js
8+
packages/rocketchat-favico/favico.js
9+
packages/rocketchat-theme/client/minicolors/jquery.minicolors.js
10+
packages/rocketchat-emojione/generateEmojiIndex.js
11+
packages/rocketchat-ui/lib/Modernizr.js
12+
packages/rocketchat-ui/lib/clipboardjs/clipboard.js
13+
packages/rocketchat-ui/lib/jquery.swipebox.min.js
14+
packages/rocketchat-ui/lib/particles.js
15+
packages/rocketchat-ui/lib/recorderjs/recorder.js
16+
packages/rocketchat-ui/lib/textarea-autogrow.js
17+
packages/rocketchat-ui/lib/customEventPolyfill.js
18+
packages/rocketchat-ui/lib/constallation.js
19+
packages/rocketchat-livechat/client/lib/ua-parser.js
20+
packages/rocketchat-livechat/public/livechat.js

‎.eslintrc.js‎

Lines changed: 238 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,238 @@
1+
module.exports = {
2+
'env': {
3+
'browser': true,
4+
'commonjs': true,
5+
'es6': true,
6+
'node': true,
7+
'jquery': true
8+
},
9+
'rules': {
10+
// 'no-alert': 0,
11+
// 'no-array-constructor': 0,
12+
// 'no-bitwise': 0,
13+
// 'no-caller': 0,
14+
// 'no-catch-shadow': 0,
15+
// 'no-continue': 0,
16+
// 'no-div-regex': 0,
17+
// 'no-else-return': 0,
18+
// 'no-eq-null': 0,
19+
// 'no-extra-bind': 0,
20+
// 'no-extra-parens': 0,
21+
// 'no-floating-decimal': 0,
22+
// 'no-implied-eval': 0,
23+
// 'no-inline-comments': 0,
24+
// 'no-iterator': 0,
25+
// 'no-label-var': 0,
26+
// 'no-labels': 0,
27+
// 'no-lone-blocks': 0,
28+
// 'no-lonely-if': 0,
29+
// 'no-loop-func': 0,
30+
// 'no-mixed-requires': [0, false],
31+
// 'no-multi-spaces': 0,
32+
// 'no-multiple-empty-lines': [0, {'max': 2}],
33+
// 'no-native-reassign': 0,
34+
// 'no-nested-ternary': 0,
35+
// 'no-new': 0,
36+
// 'no-new-func': 0,
37+
// 'no-new-object': 0,
38+
// 'no-new-require': 0,
39+
// 'no-new-wrappers': 0,
40+
// 'no-octal-escape': 0,
41+
// 'no-param-reassign': 0,
42+
// 'no-path-concat': 0,
43+
// 'no-plusplus': 0,
44+
// 'no-process-env': 0,
45+
// 'no-process-exit': 0,
46+
// 'no-proto': 0,
47+
// 'no-restricted-modules': 0,
48+
// 'no-return-assign': 0,
49+
// 'no-script-url': 0,
50+
// 'no-self-compare': 0,
51+
// 'no-sequences': 0,
52+
// 'no-shadow': 0,
53+
// 'no-shadow-restricted-names': 0,
54+
// 'no-spaced-func': 0,
55+
// 'no-sync': 0,
56+
// 'no-ternary': 0,
57+
// 'no-trailing-spaces': 0,
58+
// 'no-this-before-super': 0,
59+
// 'no-throw-literal': 0,
60+
// 'no-undef-init': 0,
61+
// 'no-undefined': 0,
62+
// 'no-unexpected-multiline': 0,
63+
// 'no-underscore-dangle': 0,
64+
// 'no-unneeded-ternary': 0,
65+
// 'no-unused-expressions': 0,
66+
// 'no-useless-call': 0,
67+
// 'no-void': 0,
68+
// 'no-var': 0,
69+
// 'no-warning-comments': [0, { 'terms': ['todo', 'fixme', 'xxx'], 'location': 'start' }],
70+
// 'no-with': 0,
71+
// 'no-console': 0, // disallow use of console
72+
'no-eval': 2, // disallow use of eval()
73+
'no-extend-native': 2, // disallow adding to native types
74+
'no-multi-str': 2, // disallow use of multiline strings
75+
'no-use-before-define': 2, // disallow use of variables before they are defined
76+
'no-const-assign': 2, // disallow modifying variables that are declared using const
77+
'no-cond-assign': 2, // disallow assignment in conditional expressions
78+
'no-constant-condition': 2, // disallow use of constant expressions in conditions
79+
'no-control-regex': 2, // disallow control characters in regular expressions
80+
'no-debugger': 2, // disallow use of debugger
81+
'no-delete-var': 2, // disallow deletion of variables
82+
'no-dupe-keys': 2, // disallow duplicate keys when creating object literals
83+
'no-dupe-args': 2, // disallow duplicate arguments in functions
84+
'no-duplicate-case': 2, // disallow a duplicate case label
85+
'no-empty': 2, // disallow empty block statements
86+
'no-empty-character-class': 2, // disallow the use of empty character classes in regular expressions
87+
'no-ex-assign': 2, // disallow assigning to the exception in a catch block
88+
'no-extra-boolean-cast': 2, // disallow double-negation boolean casts in a boolean context
89+
'no-extra-semi': 2, // disallow unnecessary semicolons
90+
'no-fallthrough': 2, // disallow fallthrough of case statements
91+
'no-func-assign': 2, // disallow overwriting functions written as function declarations
92+
'no-inner-declarations': [2, 'functions'], // disallow function or variable declarations in nested blocks
93+
'no-invalid-regexp': 2, // disallow invalid regular expression strings in the RegExp constructor
94+
'no-irregular-whitespace': 2, // disallow irregular whitespace outside of strings and comments
95+
'no-mixed-spaces-and-tabs': [2, false], // disallow mixed spaces and tabs for indentation
96+
'no-sparse-arrays': 2, // disallow sparse arrays
97+
'no-negated-in-lhs': 2, // disallow negation of the left operand of an in expression
98+
'no-obj-calls': 2, // disallow the use of object properties of the global object (Math and JSON) as functions
99+
'no-octal': 2, // disallow use of octal literals
100+
'no-redeclare': 2, // disallow declaring the same variable more than once
101+
'no-regex-spaces': 2, // disallow multiple spaces in a regular expression literal
102+
'no-undef': 2, // disallow use of undeclared variables unless mentioned in a /*global */ block
103+
'no-unreachable': 2, // disallow unreachable statements after a return, throw, continue, or break statement
104+
'no-unused-vars': [2, { // disallow declaration of variables that are not used in the code
105+
'vars': 'all',
106+
'args': 'after-used'
107+
}],
108+
109+
// 'array-bracket-spacing': [0, 'never'],
110+
// 'arrow-parens': 0,
111+
// 'arrow-spacing': 0,
112+
// 'accessor-pairs': 0,
113+
// 'brace-style': [0, '1tbs'],
114+
// 'callback-return': 0,
115+
// 'camelcase': 0,
116+
// 'comma-spacing': 0,
117+
// 'comma-style': 0,
118+
// 'complexity': [0, 11],
119+
// 'computed-property-spacing': [0, 'never'],
120+
// 'consistent-return': 0,
121+
// 'consistent-this': [0, 'that'],
122+
// 'constructor-super': 0,
123+
// 'default-case': 0,
124+
// 'dot-location': 0,
125+
// 'dot-notation': [0, { 'allowKeywords': true }],
126+
// 'eol-last': 0,
127+
// 'func-names': 0,
128+
// 'func-style': [0, 'declaration'],
129+
// 'generator-star-spacing': 0,
130+
// 'guard-for-in': 0,
131+
// 'handle-callback-err': 0,
132+
// 'indent': 0,
133+
// 'init-declarations': 0,
134+
// 'key-spacing': [0, { 'beforeColon': false, 'afterColon': true }],
135+
// 'lines-around-comment': 0,
136+
// 'max-depth': [0, 4],
137+
// 'max-nested-callbacks': [0, 2],
138+
// 'max-params': [0, 3],
139+
// 'max-statements': [0, 10],
140+
// 'new-parens': 0,
141+
// 'newline-after-var': 0,
142+
// 'object-curly-spacing': [0, 'never'],
143+
// 'object-shorthand': 0,
144+
// 'one-var': 0,
145+
// 'operator-assignment': [0, 'always'],
146+
// 'operator-linebreak': 0,
147+
// 'padded-blocks': 0,
148+
// 'prefer-const': 0,
149+
// 'prefer-spread': 0,
150+
// 'quote-props': 0,
151+
// 'radix': 0,
152+
// 'require-yield': 0,
153+
// 'semi-spacing': [0, {'before': false, 'after': true}],
154+
// 'sort-vars': 0,
155+
// 'space-before-blocks': [0, 'always'],
156+
// 'space-before-function-paren': [0, 'always'],
157+
// 'space-in-parens': [0, 'never'],
158+
// 'space-infix-ops': 0,
159+
// 'space-unary-ops': [0, { 'words': true, 'nonwords': false }],
160+
// 'spaced-comment': 0,
161+
// 'strict': 0,
162+
// 'valid-jsdoc': 0,
163+
// 'vars-on-top': 0,
164+
// 'wrap-regex': 0,
165+
// 'yoda': [0, 'never'],
166+
// 'max-len': [0, 80, 4],
167+
// 'indent': [2, 'tab', {'SwitchCase': 1}], //specify tab or space width for your code
168+
// 'comma-dangle': [2, 'never'], // disallow or enforce trailing commas
169+
'wrap-iife': 2, // wrap-iife
170+
'block-scoped-var': 2, // treat var statements as if they were block scoped
171+
'curly': [2, 'all'], // specify curly brace conventions for all control statements
172+
'eqeqeq': [2, 'allow-null'], // require use of === and !==
173+
'new-cap': 2, // require a capital letter for constructors
174+
'use-isnan': 2, // disallow comparisons with the value NaN
175+
'valid-typeof': 2, // ensure results of typeof are compared against a valid string
176+
'linebreak-style': [2, 'unix'], // enforce linebreak style
177+
'quotes': [2, 'single'], // specify whether backticks, double or single quotes should be used
178+
'semi': [2, 'always'] // require or disallow use of semicolons instead of ASI
179+
},
180+
'globals': {
181+
'_' : false,
182+
'__meteor_runtime_config__' : false,
183+
'AccountBox' : false,
184+
'Accounts' : false,
185+
'AgentUsers' : false,
186+
'Assets' : false,
187+
'Blaze' : false,
188+
'BlazeLayout' : false,
189+
'ChatMessage' : false,
190+
'ChatMessages' : false,
191+
'ChatRoom' : false,
192+
'ChatSubscription' : false,
193+
'check' : false,
194+
'Department' : false,
195+
'EJSON' : false,
196+
'Email' : false,
197+
'FlowRouter' : false,
198+
'getNextAgent' : false,
199+
'LivechatDepartment' : false,
200+
'LivechatDepartmentAgents' : false,
201+
'livechatManagerRoutes' : true,
202+
'LivechatPageVisited' : false,
203+
'LivechatTrigger' : false,
204+
'Logger' : false,
205+
'Match' : false,
206+
'Meteor' : false,
207+
'moment' : false,
208+
'Mongo' : false,
209+
'Npm' : false,
210+
'Package' : false,
211+
'parentCall' : false,
212+
'Promise' : false, // Avoid 'redefinition of Promise' warning
213+
'Random' : false,
214+
'ReactiveVar' : false,
215+
'RocketChat' : true,
216+
'RocketChatFile' : false,
217+
'RocketChatFileAvatarInstance': false,
218+
'RoomHistoryManager' : false,
219+
's' : false,
220+
'ServiceConfiguration' : false,
221+
'Session' : false,
222+
'Settings' : false,
223+
'SHA256' : false,
224+
'SideNav' : false,
225+
'swal' : false,
226+
't' : false,
227+
'TAPi18n' : false,
228+
'Template' : false,
229+
'TimeSync' : false,
230+
'toastr' : false,
231+
'Tracker' : false,
232+
'Trigger' : false,
233+
'Triggers' : false,
234+
'UAParser' : false,
235+
'visitor' : false,
236+
'WebApp' : false
237+
}
238+
};

‎.jshintrc‎

Lines changed: 0 additions & 107 deletions
This file was deleted.

0 commit comments

Comments
 (0)