Skip to content

Conversation

@ostjen
Copy link
Contributor

@ostjen ostjen commented Jul 10, 2021

Proposed changes (including videos or screenshots)

Issue(s)

Steps to test or reproduce

Further comments

@ostjen ostjen requested a review from pierre-lehnen-rc July 12, 2021 11:30
@ostjen ostjen merged commit df30020 into develop Jul 19, 2021
@ostjen ostjen deleted the paginationMessageSearch branch July 19, 2021 17:34
gabriellsh added a commit that referenced this pull request Jul 20, 2021
…improve/discussion-listimprove/discussion-listimprove/discussion-listimprove/discussion-listimprove/discussion-listimprove/discussion-listimprove/discussion-listimprove/discussion-listimprove/discussion-listimprove/discussion-listimprove/discussion-listimprove/discussion-listimprove/discussion-listimprove/discussion-listimprove/discussion-listimprove/discussion-listimprove/discussion-listimprove/discussion-listMerge branch 'develop' of github.com:RocketChat/Rocket.Chat into fix/attachment_emoji

* 'develop' of github.com:RocketChat/Rocket.Chat: (119 commits)
  [IMPROVE] Configuration for indices in Apps-Engine models (#22705)
  [FIX] Use room's last message time when visitor did not send any message (#22695)
  F room doesnt exists error when uploading file as first message (#22590)
  [IMPROVE] Refactor `livechat.registerGuest` function (#22684)
  change livechat_enabled default value to true (#22697)
  Chore: added pagination to search msg endpoint (#22632)
  Fixed crush in the getChannelHistory method (#22667)
  Regression: Fix ee microservices build (#22656)
  [IMPROVE] Rewrite sidebar footer as React Component (#22687)
  [FIX] Livechat config endpoint is not returning all settings (#22686)
  [FIX] Info page - Instances card modal table width #22627
  Bump version to 3.16.3
  fixed - room still listed after delete (#22613)
  Chore: Use projection instead of fields to avoid error log (#22629)
  [FIX] VisitorClientInfo not showing (#22593)
  Create README.md (#22615)
  [NEW] REST endpoint to remove User from Role (#20485)
  Bump version to 3.16.2
  Regression: Change the name of called methods in Users model (#22620)
  [FIX] Markdown for UiKit blocks (#22619)
  ...
gabriellsh added a commit that referenced this pull request Jul 20, 2021
…status-message

* 'develop' of github.com:RocketChat/Rocket.Chat: (114 commits)
  [FIX] Remove team's related actions inside of discussion #22470
  [IMPROVE] Configuration for indices in Apps-Engine models (#22705)
  [FIX] Use room's last message time when visitor did not send any message (#22695)
  F room doesnt exists error when uploading file as first message (#22590)
  [IMPROVE] Refactor `livechat.registerGuest` function (#22684)
  change livechat_enabled default value to true (#22697)
  Chore: added pagination to search msg endpoint (#22632)
  Fixed crush in the getChannelHistory method (#22667)
  Regression: Fix ee microservices build (#22656)
  [IMPROVE] Rewrite sidebar footer as React Component (#22687)
  [FIX] Livechat config endpoint is not returning all settings (#22686)
  [FIX] Info page - Instances card modal table width #22627
  Bump version to 3.16.3
  fixed - room still listed after delete (#22613)
  Chore: Use projection instead of fields to avoid error log (#22629)
  [FIX] VisitorClientInfo not showing (#22593)
  Create README.md (#22615)
  [NEW] REST endpoint to remove User from Role (#20485)
  Bump version to 3.16.2
  Regression: Change the name of called methods in Users model (#22620)
  ...
KevLehman added a commit that referenced this pull request Jul 20, 2021
…extual Bar (#22715)

* [IMPROVE][Enterprise] Create and Update CannedResponse API endpoints (#22151)

* createdBy query fix

* fix the canned-responses filter (#22207)

* fix Thread tslint error

* create .d.ts file to VerticalBar component

* rewrite Canned Responses contextual-bar components

* update fuselage version

* types for room.js

* create hooks for canned options and departments

* adjustments in cannedResponse contextual-bar

* adjustments in cannedResponse modal

* adjust in endpoints types

* adjust canned list

* adjust omnichanel canned response type definition

* add some new translations

* remove old stuff of cannedResponses

* [NEW] New components TextEditor and MarkdownTextEditor (#22173)

* Include Insert_Placeholder key

* change emojiPicker z-index

* create TextEditor component

* create MarkdownTextEditor component

* update fuselage dev version

* update fuselage and react-types version

* finish MardownTextEditorComponent

* update fuselage package

* modal with MarkdownTextEditor component

* reload component when edited

* fix form handle error

* add key prop

* create preview for MarkdownTextEditor

* remove canned-response contextual-bar from departments settings

* Use permissions instead of roles to check for canned responses

* Chore: added pagination to search msg endpoint (#22632)

* added pagination to search endpoint

* readded tests

* change livechat_enabled default value to true (#22697)

Co-authored-by: Leonardo Ostjen Couto <[email protected]>

* Add New and Edit with Data

* Use permissions instead of roles to check for canned responses

* New and edit pages

* Lint and removal of unused files

* fix lint

* FIX departments not working

* remove duplicate i18n key

* Misc improvements to canned responses endpoints

* Ts fixes

* more ts fixes

* use permission instead role

* Fix shortcut validation

* Fix shortcut validation

* Fix department & validation issues

* fix

Co-authored-by: Rafael Ferreira <[email protected]>
Co-authored-by: Rafael Ferreira <[email protected]>
Co-authored-by: Tiago Evangelista Pinto <[email protected]>
Co-authored-by: Kevin Aleman <[email protected]>
Co-authored-by: Leonardo Ostjen Couto <[email protected]>
KevLehman added a commit that referenced this pull request Jul 20, 2021
…extual Bar (#22715)

* [IMPROVE][Enterprise] Create and Update CannedResponse API endpoints (#22151)

* createdBy query fix

* fix the canned-responses filter (#22207)

* fix Thread tslint error

* create .d.ts file to VerticalBar component

* rewrite Canned Responses contextual-bar components

* update fuselage version

* types for room.js

* create hooks for canned options and departments

* adjustments in cannedResponse contextual-bar

* adjustments in cannedResponse modal

* adjust in endpoints types

* adjust canned list

* adjust omnichanel canned response type definition

* add some new translations

* remove old stuff of cannedResponses

* [NEW] New components TextEditor and MarkdownTextEditor (#22173)

* Include Insert_Placeholder key

* change emojiPicker z-index

* create TextEditor component

* create MarkdownTextEditor component

* update fuselage dev version

* update fuselage and react-types version

* finish MardownTextEditorComponent

* update fuselage package

* modal with MarkdownTextEditor component

* reload component when edited

* fix form handle error

* add key prop

* create preview for MarkdownTextEditor

* remove canned-response contextual-bar from departments settings

* Use permissions instead of roles to check for canned responses

* Chore: added pagination to search msg endpoint (#22632)

* added pagination to search endpoint

* readded tests

* change livechat_enabled default value to true (#22697)

Co-authored-by: Leonardo Ostjen Couto <[email protected]>

* Add New and Edit with Data

* Use permissions instead of roles to check for canned responses

* New and edit pages

* Lint and removal of unused files

* fix lint

* FIX departments not working

* remove duplicate i18n key

* Misc improvements to canned responses endpoints

* Ts fixes

* more ts fixes

* use permission instead role

* Fix shortcut validation

* Fix shortcut validation

* Fix department & validation issues

* fix

Co-authored-by: Rafael Ferreira <[email protected]>
Co-authored-by: Rafael Ferreira <[email protected]>
Co-authored-by: Tiago Evangelista Pinto <[email protected]>
Co-authored-by: Kevin Aleman <[email protected]>
Co-authored-by: Leonardo Ostjen Couto <[email protected]>
KevLehman added a commit that referenced this pull request Jul 21, 2021
* [IMPROVE][Enterprise] Create and Update CannedResponse API endpoints (#22151)

* [NEW] New components TextEditor and MarkdownTextEditor (#22173)

* Include Insert_Placeholder key

* change emojiPicker z-index

* create TextEditor component

* create MarkdownTextEditor component

* update fuselage dev version

* update fuselage and react-types version

* finish MardownTextEditorComponent

* update fuselage package

* [NEW][ENTERPRISE] Canned responses Overview Page (#22623)

* [IMPROVE] No results component for canned responses table with no data (#22190)

* no results components to table with no data

* [IMPROVE][Enterprise] Create and Update CannedResponse API endpoints (#22151)

* createdBy query fix

* fix the canned-responses filter (#22207)

* [NEW] New components TextEditor and MarkdownTextEditor (#22173)

* Include Insert_Placeholder key

* change emojiPicker z-index

* create TextEditor component

* create MarkdownTextEditor component

* update fuselage dev version

* update fuselage and react-types version

* finish MardownTextEditorComponent

* update fuselage package

* [NEW][ENTERPRISE] Canned responses Overview Page (#22623)

* [NEW] Empty page for Canned Responses Table

* FIX LGTM

* stop showing the empty page on loading

Co-authored-by: Rafael Ferreira <[email protected]>
Co-authored-by: Tiago Evangelista Pinto <[email protected]>
Co-authored-by: Martin <[email protected]>

* [NEW] NEW and EDIT pages for canned responses + Canned Responses Contextual Bar (#22715)

* [IMPROVE][Enterprise] Create and Update CannedResponse API endpoints (#22151)

* createdBy query fix

* fix the canned-responses filter (#22207)

* fix Thread tslint error

* create .d.ts file to VerticalBar component

* rewrite Canned Responses contextual-bar components

* update fuselage version

* types for room.js

* create hooks for canned options and departments

* adjustments in cannedResponse contextual-bar

* adjustments in cannedResponse modal

* adjust in endpoints types

* adjust canned list

* adjust omnichanel canned response type definition

* add some new translations

* remove old stuff of cannedResponses

* [NEW] New components TextEditor and MarkdownTextEditor (#22173)

* Include Insert_Placeholder key

* change emojiPicker z-index

* create TextEditor component

* create MarkdownTextEditor component

* update fuselage dev version

* update fuselage and react-types version

* finish MardownTextEditorComponent

* update fuselage package

* modal with MarkdownTextEditor component

* reload component when edited

* fix form handle error

* add key prop

* create preview for MarkdownTextEditor

* remove canned-response contextual-bar from departments settings

* Use permissions instead of roles to check for canned responses

* Chore: added pagination to search msg endpoint (#22632)

* added pagination to search endpoint

* readded tests

* change livechat_enabled default value to true (#22697)

Co-authored-by: Leonardo Ostjen Couto <[email protected]>

* Add New and Edit with Data

* Use permissions instead of roles to check for canned responses

* New and edit pages

* Lint and removal of unused files

* fix lint

* FIX departments not working

* remove duplicate i18n key

* Misc improvements to canned responses endpoints

* Ts fixes

* more ts fixes

* use permission instead role

* Fix shortcut validation

* Fix shortcut validation

* Fix department & validation issues

* fix

Co-authored-by: Rafael Ferreira <[email protected]>
Co-authored-by: Rafael Ferreira <[email protected]>
Co-authored-by: Tiago Evangelista Pinto <[email protected]>
Co-authored-by: Kevin Aleman <[email protected]>
Co-authored-by: Leonardo Ostjen Couto <[email protected]>

Co-authored-by: Rafael Ferreira <[email protected]>
Co-authored-by: Tiago Evangelista Pinto <[email protected]>
Co-authored-by: Rafael Ferreira <[email protected]>
Co-authored-by: Kevin Aleman <[email protected]>
Co-authored-by: Leonardo Ostjen Couto <[email protected]>
@ggazzo ggazzo mentioned this pull request Jul 31, 2021
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.

3 participants