Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[NEW] Custom emoji refactor #17499

Merged
merged 11 commits into from
May 5, 2020
Merged

[NEW] Custom emoji refactor #17499

merged 11 commits into from
May 5, 2020

Conversation

dudizilla
Copy link
Contributor

@dudizilla dudizilla commented Apr 30, 2020

image

@MartinSchoeler MartinSchoeler changed the base branch from develop to admin-refactor April 30, 2020 19:06

const uploadCustomEmoji = useMethod('uploadCustomEmoji');

const saveEmoji = useMethod('insertOrUpdateUserStatus');
Copy link
Contributor

Choose a reason for hiding this comment

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

wrong method here

Copy link
Contributor

Choose a reason for hiding this comment

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

insertOrUpdateEmoji

return soundEmoji;
};

const saveAction = async (newData) => {
Copy link
Contributor

Choose a reason for hiding this comment

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

This method has variables that need to be renamed

client/admin/customEmoji/AddCustomEmoji.js Outdated Show resolved Hide resolved
@dudizilla dudizilla changed the title Custom emoji [WIP] Custom emoji refactor Apr 30, 2020
dudizilla and others added 6 commits May 4, 2020 11:35
….Chat into custom-emoji

* 'admin-refactor' of https://github.com/RocketChat/Rocket.Chat:
  LingoHub based on develop (#17520)
  RegExp improvements suggested by LGTM (#17500)
  [FIX] Replace obsolete X-FRAME-OPTIONS header on Livechat route (#17419)
  [FIX] LDAP login error on Enterprise version (#17497)
  [IMPROVE] [Apps-Engine] App user as the default notifier (#17050)
  [NEW] [Apps-Engine] New Livechat event handlers (#17033)
  [FIX] Change email verification label (#17450)
  fix: Admin Users Actions (#17469)
  Fix bad component reference
  [IMPROVE] Depart from /app/ui-admin (#17464)
  Priority system messages were always created (#17479)
  Bump version to 3.3.0-develop
  Bump version to 3.2.0
  Bump version to 3.2.0-rc.2
  Bump version to 3.2.0-rc.1
  Bump version to 3.2.0-rc.0
@gabriellsh gabriellsh changed the title [WIP] Custom emoji refactor [NEW] Custom emoji refactor May 4, 2020
@gabriellsh gabriellsh marked this pull request as ready for review May 4, 2020 23:08
@gabriellsh gabriellsh dismissed MartinSchoeler’s stale review May 4, 2020 23:14

No relevant anymore

@ggazzo ggazzo merged commit c9c6e9b into admin-refactor May 5, 2020
@ggazzo ggazzo deleted the custom-emoji branch May 5, 2020 01:26
ggazzo added a commit that referenced this pull request May 5, 2020
* admin-refactor:
  Regression: Removed old user and room files from admin (#17528)
  [IMPROVE] Custom emoji refactor (#17499)
  Fix storybook
  LingoHub based on develop (#17520)
  RegExp improvements suggested by LGTM (#17500)
gabriellsh added a commit that referenced this pull request May 6, 2020
…to integrations

* 'admin-refactor' of github.com:RocketChat/Rocket.Chat:
  Regression: Removed old user and room files from admin (#17528)
  [IMPROVE] Custom emoji refactor (#17499)
  Fix storybook
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.

4 participants