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.

Sign up for GitHub

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

Jump to bottom

[FIX] Reorder hljs #17854

Merged
merged 6 commits into from
Jun 10, 2020
Merged

[FIX] Reorder hljs #17854

merged 6 commits into from
Jun 10, 2020

Conversation

MartinSchoeler
Copy link
Contributor

This stops the markdown code highlighter from using lesser-known languages instead of the most used E.G. Rendering Angelscript instead of Javascript

@tassoevan tassoevan requested a review from a team June 8, 2020 23:33
@tassoevan tassoevan added this to the 3.4.0 milestone Jun 8, 2020
@ggazzo ggazzo merged commit 3c647a8 into develop Jun 10, 2020
@ggazzo ggazzo deleted the reorder-hljs branch June 10, 2020 01:25
ggazzo added a commit that referenced this pull request Jun 10, 2020
@ggazzo
Merge branch 'feat/new-threads' of github.com:RocketChat/Rocket.Chat …
01d47a9 
…into feat/new-threads

* 'feat/new-threads' of github.com:RocketChat/Rocket.Chat:
  [FIX] Reorder hljs (#17854)
  [FIX] SAML LogoutRequest sending wrong NameID (#17860)
  [FIX] Apps room events losing data (#17827)
ggazzo added a commit that referenced this pull request Jun 17, 2020
@ggazzo
Merge branch 'threads-alpha' of github.com:RocketChat/Rocket.Chat int…
6693157 
…o threads-alpha

* 'threads-alpha' of github.com:RocketChat/Rocket.Chat: (23 commits)
  [IMPROVE][Performance] Add new database indexes to improve data query performance (#17839)
  [FIX] Undesirable message updates after user saving profile (#17930)
  Remove unused accounts-js integration (#17921)
  [IMPROVE] Don't send emails to online users and remove delay when away/idle (#17907)
  [IMPROVE] Split NOTIFICATIONS_SCHEDULE_DELAY into three separate variables (#17669)
  correct outdated dev start info
  [IMPROVE] Rewrite Federation Dashboard (#17900)
  [FIX] Duplicated placeholderaceholder  (#17898)
  Wrap components with React.memo (#17899)
  [FIX] Some Login Buttons disappear after refreshing OAuth Services (#17808)
  Change some components' location (#17893)
  [IMPROVE] Rewrite admin sidebar in React (#17801)
  Always initialize CIRCLE_BRANCH env var on CI (#17874)
  [NEW] Blocked Media Types setting (#17617)
  [FIX] Reorder hljs (#17854)
  [FIX] SAML LogoutRequest sending wrong NameID (#17860)
  [FIX] Apps room events losing data (#17827)
  [FIX] Importers progress sending too much update events to clients (#17857)
  [FIX] Omnichannel message link is broken in email notifications (#17843)
  [FIX] Logic for room type was inverted in edit panel (#17851) (#17853)
  ...
@sampaiodiego sampaiodiego mentioned this pull request Jun 30, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gabriellsh gabriellsh gabriellsh approved these changes

Assignees
No one assigned
Labels
type: bug ui/ux
Projects
None yet
Milestone
3.4.0
Development

Successfully merging this pull request may close these issues.
4 participants
@MartinSchoeler @gabriellsh @tassoevan @ggazzo