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] Add markdown parser "marked" #7852

Merged
merged 28 commits into from
Aug 24, 2017
Merged
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
4079139
Add new markdown parser `marked`.
Feb 24, 2017
54bcb9d
Do not use token for inline code
Feb 24, 2017
8c2613b
revert roomName code
Feb 24, 2017
9e16354
fix codacy issue
Feb 24, 2017
e819e57
Merge remote-tracking branch 'upstream/develop' into add-marked
Mar 3, 2017
e67f73d
var to const
Mar 3, 2017
67e3ce6
Merge remote-tracking branch 'upstream/develop' into add-marked
Mar 4, 2017
4467384
Delay the option setting for the rendering phase
Mar 5, 2017
2d20cda
Merge branch develop into add-marked
Mar 6, 2017
acdbadd
Merge branch develop into add-marked
Mar 14, 2017
073a93d
Port comments
Mar 14, 2017
e358eac
remove markdowncode.coffee (move parser dir)
Mar 15, 2017
133b135
Merge upstream/develop into add-marked
Mar 18, 2017
887a3d4
Merge upstream/develop into add-marked
Mar 25, 2017
6d64060
fix codacy issues
Mar 25, 2017
40bab20
Merge upstream/develop into add-marked
Apr 6, 2017
d0b9667
Merge and resolve conflicts upstream/develop into add-marked
Apr 22, 2017
f3fd15a
Merge remote-tracking branch 'upstream/develop' into add-marked
May 8, 2017
05dd0db
Merge branch upstream/develop into add-marked
May 19, 2017
92899fd
resolve conflict
May 26, 2017
d2867c3
Merge remote-tracking branch 'upstream/develop' into add-marked
May 26, 2017
0e88ac2
Port markdown code from develop
May 27, 2017
01931cb
Merge remote-tracking branch 'upstream/develop' into add-marked
May 27, 2017
3e467cb
Resolve conflict
Jun 1, 2017
1d051dd
Resolve conflicts
Aug 22, 2017
6e813d6
Fix code style
Aug 22, 2017
2251e9c
Try force travis build
rodrigok Aug 23, 2017
9aad03a
Filter markdown shortcuts
sampaiodiego Aug 23, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Filter markdown shortcuts
  • Loading branch information
sampaiodiego committed Aug 23, 2017
commit 9aad03a7b67e38191f202331ed49bfd795266443
2 changes: 1 addition & 1 deletion packages/rocketchat-ui-message/client/messageBox.js
Original file line number Diff line number Diff line change
@@ -410,7 +410,7 @@ Template.messageBox.events({
},
'keydown .js-input-message': firefoxPasteUpload(function(event, t) {
if ((navigator.platform.indexOf('Mac') !== -1 && event.metaKey) || (navigator.platform.indexOf('Mac') === -1 && event.ctrlKey)) {
const action = markdownButtons.find(action => action.command === event.key.toLowerCase());
const action = markdownButtons.find(action => action.command === event.key.toLowerCase() && (!action.condition || action.condition()));
if (action) {
applyMd.apply(action, [event, t]);
}