commit
3ef36d0089
@ -1,111 +1,119 @@ |
|||||||
{ |
{ |
||||||
"name": "Rocket.Chat", |
"name": "Rocket.Chat", |
||||||
"description": "The Ultimate Open Source WebChat Platform", |
"description": "The Ultimate Open Source WebChat Platform", |
||||||
"version": "0.59.0-develop", |
"version": "0.59.0-develop", |
||||||
"author": { |
"author": { |
||||||
"name": "Rocket.Chat", |
"name": "Rocket.Chat", |
||||||
"url": "https://rocket.chat/" |
"url": "https://rocket.chat/" |
||||||
}, |
}, |
||||||
"contributors": [ |
"contributors": [ |
||||||
{ |
{ |
||||||
"name": "Aaron Ogle", |
"name": "Aaron Ogle", |
||||||
"email": "aaron.ogle@rocket.chat" |
"email": "aaron.ogle@rocket.chat" |
||||||
}, |
}, |
||||||
{ |
{ |
||||||
"name": "Bradley Hilton", |
"name": "Bradley Hilton", |
||||||
"email": "bradley.hilton@rocket.chat" |
"email": "bradley.hilton@rocket.chat" |
||||||
}, |
}, |
||||||
{ |
{ |
||||||
"name": "Diego Sampaio", |
"name": "Diego Sampaio", |
||||||
"email": "diego.sampaio@rocket.chat" |
"email": "diego.sampaio@rocket.chat" |
||||||
}, |
}, |
||||||
{ |
{ |
||||||
"name": "Gabriel Engel", |
"name": "Gabriel Engel", |
||||||
"email": "gabriel.engel@rocket.chat" |
"email": "gabriel.engel@rocket.chat" |
||||||
}, |
}, |
||||||
{ |
{ |
||||||
"name": "Marcelo Schmidt", |
"name": "Guilherme Gazzo", |
||||||
"email": "marcelo.schmidt@rocket.chat" |
"email": "guilherme.gazzo@rocket.chat" |
||||||
}, |
}, |
||||||
{ |
{ |
||||||
"name": "Rodrigo Nascimento", |
"name": "Karl Prieb", |
||||||
"email": "rodrigo.nascimento@rocket.chat" |
"email": "karl.priebk@rocket.chat" |
||||||
}, |
}, |
||||||
{ |
{ |
||||||
"name": "Sing Li", |
"name": "Marcelo Schmidt", |
||||||
"email": "sing.li@rocket.chat" |
"email": "marcelo.schmidt@rocket.chat" |
||||||
} |
}, |
||||||
], |
{ |
||||||
"mocha": { |
"name": "Rodrigo Nascimento", |
||||||
"tests": [ |
"email": "rodrigo.nascimento@rocket.chat" |
||||||
"packages/**/*.tests.js" |
}, |
||||||
], |
{ |
||||||
"files": [ |
"name": "Sing Li", |
||||||
"packages/**/*.js", |
"email": "sing.li@rocket.chat" |
||||||
"!packages/**/*.tests.js" |
} |
||||||
] |
], |
||||||
}, |
"mocha": { |
||||||
"keywords": [ |
"tests": [ |
||||||
"rocketchat", |
"packages/**/*.tests.js" |
||||||
"rocket", |
], |
||||||
"chat" |
"files": [ |
||||||
], |
"packages/**/*.js", |
||||||
"scripts": { |
"!packages/**/*.tests.js" |
||||||
"start": "meteor npm i && meteor", |
] |
||||||
"lint": "eslint .", |
}, |
||||||
"lint-fix": "eslint . --fix", |
"keywords": [ |
||||||
"stylelint": "stylelint packages/**/*.css", |
"rocketchat", |
||||||
"test": "node .scripts/start.js", |
"rocket", |
||||||
"deploy": "npm run build && pm2 startOrRestart pm2.json", |
"chat" |
||||||
"chimp-watch": "chimp --ddp=http://localhost:3000 --watch --mocha --path=tests/end-to-end", |
], |
||||||
"chimp-test": "chimp tests/chimp-config.js", |
"scripts": { |
||||||
"postinstall": "cd packages/rocketchat-katex && npm i", |
"start": "meteor npm i && meteor", |
||||||
"testunit-watch": "mocha --watch --opts ./mocha.opts \"`node -e \"console.log(require('./package.json').mocha.tests.join(' '))\"`\"", |
"lint": "eslint .", |
||||||
"coverage": "nyc -r html mocha --opts ./mocha.opts \"`node -e \"console.log(require('./package.json').mocha.tests.join(' '))\"`\"", |
"lint-fix": "eslint . --fix", |
||||||
"testunit": "mocha --opts ./mocha.opts \"`node -e \"console.log(require('./package.json').mocha.tests.join(' '))\"`\"", |
"stylelint": "stylelint packages/**/*.css", |
||||||
"version": "node .scripts/version.js", |
"test": "node .scripts/start.js", |
||||||
"set-version": "node .scripts/set-version.js", |
"deploy": "npm run build && pm2 startOrRestart pm2.json", |
||||||
"release": "npm run set-version --silent" |
"chimp-watch": "chimp --ddp=http://localhost:3000 --watch --mocha --path=tests/end-to-end", |
||||||
}, |
"chimp-test": "chimp tests/chimp-config.js", |
||||||
"license": "MIT", |
"postinstall": "cd packages/rocketchat-katex && npm i", |
||||||
"repository": { |
"testunit-watch": "mocha --watch --opts ./mocha.opts \"`node -e \"console.log(require('./package.json').mocha.tests.join(' '))\"`\"", |
||||||
"type": "git", |
"coverage": "nyc -r html mocha --opts ./mocha.opts \"`node -e \"console.log(require('./package.json').mocha.tests.join(' '))\"`\"", |
||||||
"url": "https://github.com/RocketChat/Rocket.Chat.git" |
"testunit": "mocha --opts ./mocha.opts \"`node -e \"console.log(require('./package.json').mocha.tests.join(' '))\"`\"", |
||||||
}, |
"version": "node .scripts/version.js", |
||||||
"bugs": { |
"set-version": "node .scripts/set-version.js", |
||||||
"url": "https://github.com/RocketChat/Rocket.Chat/issues", |
"release": "npm run set-version --silent" |
||||||
"email": "support@rocket.chat" |
}, |
||||||
}, |
"license": "MIT", |
||||||
"devDependencies": { |
"repository": { |
||||||
"babel-mocha-es6-compiler": "^0.1.0", |
"type": "git", |
||||||
"babel-plugin-array-includes": "^2.0.3", |
"url": "https://github.com/RocketChat/Rocket.Chat.git" |
||||||
"chimp": "^0.49.1", |
}, |
||||||
"conventional-changelog-cli": "^1.3.2", |
"bugs": { |
||||||
"eslint": "^4.2.0", |
"url": "https://github.com/RocketChat/Rocket.Chat/issues", |
||||||
"postcss-cssnext": "^2.11.0", |
"email": "support@rocket.chat" |
||||||
"postcss-smart-import": "^0.7.5", |
}, |
||||||
"simple-git": "^1.73.0", |
"devDependencies": { |
||||||
"stylelint": "^7.13.0", |
"babel-mocha-es6-compiler": "^0.1.0", |
||||||
"stylelint-order": "^0.6.0", |
"babel-plugin-array-includes": "^2.0.3", |
||||||
"supertest": "^3.0.0" |
"chimp": "^0.49.1", |
||||||
}, |
"conventional-changelog-cli": "^1.3.2", |
||||||
"dependencies": { |
"eslint": "^4.2.0", |
||||||
"@google-cloud/storage": "^1.2.0", |
"postcss-cssnext": "^2.11.0", |
||||||
"aws-sdk": "^2.86.0", |
"postcss-smart-import": "^0.7.5", |
||||||
"babel-runtime": "^6.23.0", |
"simple-git": "^1.73.0", |
||||||
"bcrypt": "^1.0.2", |
"stylelint": "^7.13.0", |
||||||
"codemirror": "^5.27.4", |
"stylelint-order": "^0.6.0", |
||||||
"file-type": "^5.2.0", |
"supertest": "^3.0.0" |
||||||
"highlight.js": "^9.12.0", |
}, |
||||||
"jquery": "^3.2.1", |
"dependencies": { |
||||||
"mime-db": "^1.29.0", |
"@google-cloud/storage": "^1.2.0", |
||||||
"mime-type": "^3.0.5", |
"aws-sdk": "^2.86.0", |
||||||
"moment": "^2.18.1", |
"babel-runtime": "^6.23.0", |
||||||
"moment-timezone": "^0.5.13", |
"bcrypt": "^1.0.2", |
||||||
"photoswipe": "^4.1.2", |
"codemirror": "^5.27.4", |
||||||
"prom-client": "^10.0.2", |
"file-type": "^5.2.0", |
||||||
"semver": "^5.3.0", |
"highlight.js": "^9.12.0", |
||||||
"toastr": "^2.1.2", |
"jquery": "^3.2.1", |
||||||
"wolfy87-eventemitter": "^5.1.0" |
"mime-db": "^1.29.0", |
||||||
} |
"mime-type": "^3.0.5", |
||||||
|
"moment": "^2.18.1", |
||||||
|
"moment-timezone": "^0.5.13", |
||||||
|
"photoswipe": "^4.1.2", |
||||||
|
"prom-client": "^10.0.2", |
||||||
|
"semver": "^5.3.0", |
||||||
|
"toastr": "^2.1.2", |
||||||
|
"wolfy87-eventemitter": "^5.1.0" |
||||||
|
} |
||||||
} |
} |
||||||
|
@ -1,9 +1,9 @@ |
|||||||
{ |
{ |
||||||
"dependencies": { |
"dependencies": { |
||||||
"csv-parse": { |
"csv-parse": { |
||||||
"version": "1.1.7", |
"version": "1.2.0", |
||||||
"resolved": "https://registry.npmjs.org/csv-parse/-/csv-parse-1.1.7.tgz", |
"resolved": "https://registry.npmjs.org/csv-parse/-/csv-parse-1.2.0.tgz", |
||||||
"from": "csv-parse@1.1.7" |
"from": "csv-parse@1.2.0" |
||||||
} |
} |
||||||
} |
} |
||||||
} |
} |
||||||
|
@ -1,53 +1,55 @@ |
|||||||
<template name="customFieldsForm"> |
<template name="customFieldsForm"> |
||||||
|
{{#if customFields}} |
||||||
<div class="rc-form-group rc-grid"> |
<div class="rc-form-group rc-grid"> |
||||||
{{#each customFields}} |
{{#each customFields}} |
||||||
<div class="rc-input rc-w50 padded"> |
<div class="rc-input rc-w50 padded"> |
||||||
{{#if $eq field.type 'select'}} |
{{#if $eq field.type 'select'}} |
||||||
{{# unless ../new}} |
{{# unless ../new}} |
||||||
<div class="input-line"> |
<div class="input-line"> |
||||||
<label for="{{fieldName}}">{{_ fieldName}}</label> |
<label for="{{fieldName}}">{{_ fieldName}}</label> |
||||||
<div> |
<div> |
||||||
<select name="{{fieldName}}" data-customfield="true"> |
<select name="{{fieldName}}" data-customfield="true"> |
||||||
{{#each field.options}} |
{{#each field.options}} |
||||||
<option value="{{.}}" selected="{{selectedField . ..}}">{{_ .}}</option> |
<option value="{{.}}" selected="{{selectedField . ..}}">{{_ .}}</option> |
||||||
{{/each}} |
{{/each}} |
||||||
</select> |
</select> |
||||||
<div class="input-error"></div> |
<div class="input-error"></div> |
||||||
</div> |
</div> |
||||||
</div> |
</div> |
||||||
{{else}} |
{{else}} |
||||||
<label class="rc-input__label"> |
<label class="rc-input__label"> |
||||||
<div class="rc-input__title">{{_ fieldName}}</div> |
<div class="rc-input__title">{{_ fieldName}}</div> |
||||||
<div class="rc-input__wrapper"> |
<div class="rc-input__wrapper"> |
||||||
<select name="{{fieldName}}" data-customfield="true" class="rc-input__element"> |
<select name="{{fieldName}}" data-customfield="true" class="rc-input__element"> |
||||||
<option></option> |
<option></option> |
||||||
{{#each field.options}} |
{{#each field.options}} |
||||||
<option value="{{.}}" selected="{{selectedField . ..}}">{{_ .}}</option> |
<option value="{{.}}" selected="{{selectedField . ..}}">{{_ .}}</option> |
||||||
{{/each}} |
{{/each}} |
||||||
</select> |
</select> |
||||||
</div> |
</div> |
||||||
</label> |
</label> |
||||||
{{/unless}} |
{{/unless}} |
||||||
{{/if}} |
{{/if}} |
||||||
{{#if $eq field.type 'text'}} |
{{#if $eq field.type 'text'}} |
||||||
{{# unless ../new}} |
{{# unless ../new}} |
||||||
<div class="input-line"> |
<div class="input-line"> |
||||||
<label for="{{fieldName}}">{{_ fieldName}}</label> |
<label for="{{fieldName}}">{{_ fieldName}}</label> |
||||||
<div> |
<div> |
||||||
<input type="text" name="{{fieldName}}" id="{{fieldName}}" data-customfield="true" value="{{fieldValue}}" maxlength="{{field.maxLength}}" /> |
<input type="text" name="{{fieldName}}" id="{{fieldName}}" data-customfield="true" value="{{fieldValue}}" maxlength="{{field.maxLength}}" /> |
||||||
<div class="input-error"></div> |
<div class="input-error"></div> |
||||||
</div> |
</div> |
||||||
</div> |
</div> |
||||||
{{else}} |
{{else}} |
||||||
<label class="rc-input__label"> |
<label class="rc-input__label"> |
||||||
<div class="rc-input__title">{{_ fieldName}}</div> |
<div class="rc-input__title">{{_ fieldName}}</div> |
||||||
<div class="rc-input__wrapper"> |
<div class="rc-input__wrapper"> |
||||||
<input type="text" class="rc-input__element" name="{{fieldName}}" id="{{fieldName}}" data-customfield="true" value="{{fieldValue}}" maxlength="{{field.maxLength}}"> |
<input type="text" class="rc-input__element" name="{{fieldName}}" id="{{fieldName}}" data-customfield="true" value="{{fieldValue}}" maxlength="{{field.maxLength}}"> |
||||||
</div> |
</div> |
||||||
</label> |
</label> |
||||||
{{/unless}} |
{{/unless}} |
||||||
{{/if}} |
{{/if}} |
||||||
|
</div> |
||||||
|
{{/each}} |
||||||
</div> |
</div> |
||||||
{{/each}} |
{{/if}} |
||||||
</div> |
|
||||||
</template> |
</template> |
||||||
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 12 KiB |
Loading…
Reference in new issue