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

Uses json-message extension in Chatroom.js #770

Merged
merged 4 commits into from Jul 17, 2018

Conversation

Projects
None yet
4 participants
@pvgupta24
Contributor

pvgupta24 commented Jun 21, 2018

@jitsi-jenkins

This comment has been minimized.

Show comment
Hide comment
@jitsi-jenkins

jitsi-jenkins Jun 21, 2018

Hi, thanks for your contribution!
If you haven't already done so, could you please make sure you sign our CLA (https://jitsi.org/icla for individuals and https://jitsi.org/ccla for corporations)? We would unfortunately be unable to merge your patch unless we have that piece :(.

jitsi-jenkins commented Jun 21, 2018

Hi, thanks for your contribution!
If you haven't already done so, could you please make sure you sign our CLA (https://jitsi.org/icla for individuals and https://jitsi.org/ccla for corporations)? We would unfortunately be unable to merge your patch unless we have that piece :(.

Show outdated Hide outdated modules/xmpp/ChatRoom.js
Show outdated Hide outdated modules/xmpp/ChatRoom.js
Show outdated Hide outdated modules/xmpp/ChatRoom.js
Show outdated Hide outdated modules/xmpp/ChatRoom.js
}
logger.debug('parsing valid json but does not have correct '
+ 'structure', 'topic: ', topic, 'payload: ', payload);

This comment has been minimized.

@nikvaessen

nikvaessen Jun 21, 2018

Contributor

whitespace change?

@nikvaessen

nikvaessen Jun 21, 2018

Contributor

whitespace change?

@pvgupta24

This comment has been minimized.

Show comment
Hide comment
@pvgupta24

pvgupta24 Jun 26, 2018

Contributor

@nikvaessen, please review.

Contributor

pvgupta24 commented Jun 26, 2018

@nikvaessen, please review.

@nikvaessen

This comment has been minimized.

Show comment
Hide comment
@nikvaessen

nikvaessen Jul 4, 2018

Contributor

Tested changes and transcription works with these changes.

Contributor

nikvaessen commented Jul 4, 2018

Tested changes and transcription works with these changes.

Show outdated Hide outdated JitsiConference.js
Show outdated Hide outdated JitsiConference.js
// We emit this event if the message is a valid json, and is not
// delivered after a delay, i.e. stamp is undefined.
// e.g. - subtitles should not be displayed if delayed.
if (parsedJson && stamp === undefined) {

This comment has been minimized.

@pvgupta24

pvgupta24 Jul 9, 2018

Contributor

@bgrozev , can you confirm if any other reasons are there for checking if stamp is undefined ?

@pvgupta24

pvgupta24 Jul 9, 2018

Contributor

@bgrozev , can you confirm if any other reasons are there for checking if stamp is undefined ?

@bgrozev

This comment has been minimized.

Show comment
Hide comment
@bgrozev

bgrozev Jul 10, 2018

Member

Jenkins add to whitelist

Member

bgrozev commented Jul 10, 2018

Jenkins add to whitelist

@bgrozev

This comment has been minimized.

Show comment
Hide comment
@bgrozev

bgrozev Jul 11, 2018

Member

Jenkins test this again please

Member

bgrozev commented Jul 11, 2018

Jenkins test this again please

@bgrozev

This comment has been minimized.

Show comment
Hide comment
@bgrozev

bgrozev Jul 11, 2018

Member

Merged master because the tests were failing due to a stale version of flow

Jenkins test this please

Member

bgrozev commented Jul 11, 2018

Merged master because the tests were failing due to a stale version of flow

Jenkins test this please

@bgrozev bgrozev merged commit 9207f1f into jitsi:master Jul 17, 2018

1 check passed

default 771 tests run, 630 skipped, 0 failed.
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment