forked from RocketChat/Rocket.Chat
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat i…
…nto develop * 'develop' of https://github.com/RocketChat/Rocket.Chat: (210 commits) Save room topic escaped Update references from ES2016 to ECMAScript 2015 REST API Add all users to room (RocketChat#3569) Use .eslintc file instead of .eslintrc.js Update settings.js Restore watermark Add eslint and ES2016 to contributing guide Fix eslint errors Fix Ubuntu link closes 3575 Update more links to current documentation Fixes RocketChat#3571: sort slash commands before filtering Rename settings group Lingohub (RocketChat#3562) Remove unused method User findOneByEmailAddress case insensitive fixes language_version on catalan translation fixes language_version on spanish translation version bump to 0.34.0 Add "How it all started" Fix issue with updateTimeout using rid out of context ... # Conflicts: # packages/rocketchat-theme/assets/stylesheets/base.less # packages/rocketchat-ui-login/login/form.coffee # packages/rocketchat-ui-sidenav/side-nav/sideNav.html
- Loading branch information
Showing
313 changed files
with
13,282 additions
and
2,855 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,136 @@ | ||
{ | ||
"env": { | ||
"browser": true, | ||
"commonjs": true, | ||
"es6": true, | ||
"node": true, | ||
"jquery": true | ||
}, | ||
"rules": { | ||
"no-multi-spaces": 2, | ||
"no-eval": 2, | ||
"no-extend-native": 2, | ||
"no-multi-str": 2, | ||
"no-use-before-define": 2, | ||
"no-const-assign": 2, | ||
"no-cond-assign": 2, | ||
"no-constant-condition": 2, | ||
"no-control-regex": 2, | ||
"no-debugger": 2, | ||
"no-delete-var": 2, | ||
"no-dupe-keys": 2, | ||
"no-dupe-args": 2, | ||
"no-duplicate-case": 2, | ||
"no-empty": 2, | ||
"no-empty-character-class": 2, | ||
"no-ex-assign": 2, | ||
"no-extra-boolean-cast": 2, | ||
"no-extra-semi": 2, | ||
"no-fallthrough": 2, | ||
"no-func-assign": 2, | ||
"no-inner-declarations": [2, "functions"], | ||
"no-invalid-regexp": 2, | ||
"no-irregular-whitespace": 2, | ||
"no-mixed-spaces-and-tabs": 2, | ||
"no-sparse-arrays": 2, | ||
"no-negated-in-lhs": 2, | ||
"no-obj-calls": 2, | ||
"no-octal": 2, | ||
"no-redeclare": 2, | ||
"no-regex-spaces": 2, | ||
"no-undef": 2, | ||
"no-unreachable": 2, | ||
"no-unused-vars": [2, { | ||
"vars": "all", | ||
"args": "after-used" | ||
}], | ||
"no-lonely-if": 2, | ||
"no-trailing-spaces": 2, | ||
"complexity": [1, 11], | ||
"space-in-parens": [2, "never"], | ||
"space-before-function-paren": [2, "never"], | ||
"space-before-blocks": [2, "always"], | ||
"indent": [2, "tab", {"SwitchCase": 1}], | ||
"comma-dangle": [2, "never"], | ||
"keyword-spacing": 2, | ||
"block-spacing": 2, | ||
"brace-style": [2, "1tbs", { "allowSingleLine": true }], | ||
"computed-property-spacing": 2, | ||
"comma-spacing": 2, | ||
"comma-style": 2, | ||
"guard-for-in": 2, | ||
"wrap-iife": 2, | ||
"block-scoped-var": 2, | ||
"curly": [2, "all"], | ||
"eqeqeq": [2, "allow-null"], | ||
"new-cap": 2, | ||
"use-isnan": 2, | ||
"valid-typeof": 2, | ||
"linebreak-style": [2, "unix"], | ||
"quotes": [2, "single"], | ||
"semi": [2, "always"] | ||
}, | ||
"globals": { | ||
"_" : false, | ||
"__meteor_runtime_config__" : false, | ||
"AccountBox" : false, | ||
"Accounts" : false, | ||
"AgentUsers" : false, | ||
"Assets" : false, | ||
"Blaze" : false, | ||
"BlazeLayout" : false, | ||
"ChatMessage" : false, | ||
"ChatMessages" : false, | ||
"ChatRoom" : false, | ||
"ChatSubscription" : false, | ||
"check" : false, | ||
"CryptoJS" : false, | ||
"Department" : false, | ||
"EJSON" : false, | ||
"Email" : false, | ||
"FlowRouter" : false, | ||
"HTTP" : false, | ||
"getNextAgent" : false, | ||
"handleError" : false, | ||
"getAvatarUrlFromUsername" : false, | ||
"LivechatCustomField" : false, | ||
"LivechatDepartment" : false, | ||
"LivechatDepartmentAgents" : false, | ||
"livechatManagerRoutes" : true, | ||
"LivechatPageVisited" : false, | ||
"LivechatTrigger" : false, | ||
"Logger" : false, | ||
"Match" : false, | ||
"Meteor" : false, | ||
"moment" : false, | ||
"Mongo" : false, | ||
"Npm" : false, | ||
"Package" : false, | ||
"parentCall" : false, | ||
"Promise" : false, | ||
"Random" : false, | ||
"ReactiveVar" : false, | ||
"RocketChat" : true, | ||
"RocketChatFile" : false, | ||
"RocketChatFileAvatarInstance": false, | ||
"RoomHistoryManager" : false, | ||
"s" : false, | ||
"ServiceConfiguration" : false, | ||
"Session" : false, | ||
"Settings" : false, | ||
"SHA256" : false, | ||
"SideNav" : false, | ||
"swal" : false, | ||
"t" : false, | ||
"TAPi18n" : false, | ||
"Template" : false, | ||
"TimeSync" : false, | ||
"toastr" : false, | ||
"Tracker" : false, | ||
"Trigger" : false, | ||
"Triggers" : false, | ||
"UAParser" : false, | ||
"visitor" : false, | ||
"WebApp" : false | ||
} | ||
} |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.