Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

Rocket.Chat
- Activity
- Members
- Terraform modules

Snippets Groups Projects

3582d3f6

Commit 3582d3f6 authored 8 years ago by Gabriel Engel Committed by GitHub 8 years ago

Downloads
- Plain Diff

Merge pull request #6036 from RocketChat/livechat-add-overwrite-option-to-customfields

Add option to not overwrite livechat custom fields

parents 14d429cf 5d575e71

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

packages/rocketchat-livechat/app/client/lib/CustomFields.js 4 additions, 4 deletions

packages/rocketchat-livechat/app/client/lib/CustomFields.js
packages/rocketchat-livechat/app/client/lib/hooks.js 2 additions, 2 deletions

packages/rocketchat-livechat/app/client/lib/hooks.js
packages/rocketchat-livechat/assets/rocket-livechat.js 5 additions, 2 deletions

packages/rocketchat-livechat/assets/rocket-livechat.js
packages/rocketchat-livechat/server/methods/setCustomField.js 3 additions, 3 deletions

...ages/rocketchat-livechat/server/methods/setCustomField.js
packages/rocketchat-livechat/server/models/Rooms.js 8 additions, 1 deletion

packages/rocketchat-livechat/server/models/Rooms.js
packages/rocketchat-livechat/server/models/Users.js 8 additions, 1 deletion

packages/rocketchat-livechat/server/models/Users.js

with 30 additions and 13 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment