Skip to content

Conversation

@gabriellsh
Copy link
Member

Closes #5281

Will only show if the user has the proper permission.

image

@ashwaniYDV
Copy link
Contributor

ashwaniYDV commented Jan 14, 2020

Hello @gabriellsh. I have a question. Please help :)
What convention to be used for translation in templates {{_ "variable"}} or {{{_ "variable"}}} ? I have checked that both are working fine.
Also correct me if it is okay to ask doubts here? I am a GSoC 20 aspirant. 😅

@ggazzo
Copy link
Member

ggazzo commented Jan 15, 2020

actually @ashwaniYDV {{variable}} only expand as text and {{{ you can expand html...

usually we should not use {{{ to avoid html and js injections

@ashwaniYDV
Copy link
Contributor

actually @ashwaniYDV {{variable}} only expand as text and {{{ you can expand html...

usually we should not use {{{ to avoid html and js injections

Thanks @ggazzo :)

…/custom-emoji-tip

* 'develop' of github.com:RocketChat/Rocket.Chat:
  [FIX] The "click to load" text is hard-coded and not translated. (#16142)
  [FIX] Integrations list without pagination and outgoing integration creation (#16233)
  [FIX] Setup Wizard inputs and Admin Settings (#16147)
@CLAassistant
Copy link

CLA assistant check
All committers have signed the CLA.

@ggazzo ggazzo added this to the 3.3.0 milestone May 13, 2020
Copy link
Member

@MartinSchoeler MartinSchoeler left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks Good to Me!

@ggazzo ggazzo merged commit 06e5b86 into develop May 15, 2020
@ggazzo ggazzo deleted the feat/custom-emoji-tip branch May 15, 2020 03:36
ggazzo added a commit that referenced this pull request May 15, 2020
…to new/oauth_page

* 'admin-refactor' of github.com:RocketChat/Rocket.Chat:
  [FIX] Directory search user placeholder (#17652)
  [NEW] Added "Add custom emoji" link to emoji picker (#16250)
  [FIX] Marketplace tiered pricing plan wording (#17644)
  [FIX] Secret Registration not properly validating Invite Token (#17618)
  Improve: New PR Template (#16968)
  Add engine versions for houston with templates (#17403)
  Use Users.findOneByAppId instead of querying directly (#16480)
  Remove unnecessary setting redefinition (#17587)
  Deprecate compatibility cordova setting (#17586)
ggazzo added a commit that referenced this pull request May 15, 2020
…/new-threads

* 'develop' of github.com:RocketChat/Rocket.Chat:
  Regression: Pressing enter on search reloads the page - admin pages (#17663)
  [NEW] Admin refactor  Second phase (#17551)
  [IMPROVE] Unused styles (#17554)
  [FIX] Directory search user placeholder (#17652)
  [NEW] Added "Add custom emoji" link to emoji picker (#16250)
  [FIX] Marketplace tiered pricing plan wording (#17644)
  [FIX] Secret Registration not properly validating Invite Token (#17618)
  Improve: New PR Template (#16968)
  Add engine versions for houston with templates (#17403)
  Use Users.findOneByAppId instead of querying directly (#16480)
  Remove unnecessary setting redefinition (#17587)
  Deprecate compatibility cordova setting (#17586)
ggazzo added a commit that referenced this pull request May 16, 2020
* 'develop' of github.com:RocketChat/Rocket.Chat: (25 commits)
  [FIX] Not redirecting to `First Channel After Login` on register (#17664)
  Regression: Pressing enter on search reloads the page - admin pages (#17663)
  [NEW] Admin refactor  Second phase (#17551)
  [IMPROVE] Unused styles (#17554)
  [FIX] Directory search user placeholder (#17652)
  [NEW] Added "Add custom emoji" link to emoji picker (#16250)
  [FIX] Marketplace tiered pricing plan wording (#17644)
  [FIX] Secret Registration not properly validating Invite Token (#17618)
  Improve: New PR Template (#16968)
  Add engine versions for houston with templates (#17403)
  Use Users.findOneByAppId instead of querying directly (#16480)
  Remove unnecessary setting redefinition (#17587)
  Deprecate compatibility cordova setting (#17586)
  Hyper.sh went out of business in early 2019 (#17622)
  [NEW] Add Permissions to deal with Omnichannel visitor past chats history (#17580)
  [NEW] Add permissions to deal with Omnichannel custom fields (#17567)
  [FIX] Livechat iframe allow microphone and camera (#9956)
  [FIX] Do not allow passwords on private channels (#15642)
  [FIX] Mail Messages > Cannot mail own user. (#17625)
  [FIX] remove multiple options from dontAskMeAgain (#17514)
  ...
This was referenced May 28, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Turn emoji tabs into a single scrolling list

6 participants