Unverified Commit eba2d0ab authored 4 years ago by Anton Georgiev Committed by GitHub 4 years ago

Merge pull request #11535 from pedrobmarin/etherpad-patch

Rework padIds and turn bbb-web pad aware

parents 98486727 09b39a8d

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala 4 additions, 0 deletions

...ton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala 6 additions, 0 deletions

...n/scala/org/bigbluebutton/core/running/MeetingActor.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/pads/AddCaptionsPadsSysMsgHdlr.scala 21 additions, 0 deletions

...re2/message/handlers/pads/AddCaptionsPadsSysMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/pads/AddPadSysMsgHdlr.scala 22 additions, 0 deletions

...button/core2/message/handlers/pads/AddPadSysMsgHdlr.scala
akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/senders/MsgBuilder.scala 20 additions, 0 deletions

.../org/bigbluebutton/core2/message/senders/MsgBuilder.scala
bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/SystemMsgs.scala 16 additions, 0 deletions

...ain/scala/org/bigbluebutton/common2/msgs/SystemMsgs.scala
bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java 36 additions, 0 deletions

...b/src/main/java/org/bigbluebutton/api/MeetingService.java
bbb-common-web/src/main/java/org/bigbluebutton/api/domain/Meeting.java 20 additions, 0 deletions

...b/src/main/java/org/bigbluebutton/api/domain/Meeting.java
bbb-common-web/src/main/java/org/bigbluebutton/api/messaging/messages/AddCaptionsPads.java 11 additions, 0 deletions

...bigbluebutton/api/messaging/messages/AddCaptionsPads.java
bbb-common-web/src/main/java/org/bigbluebutton/api/messaging/messages/AddPad.java 13 additions, 0 deletions

...java/org/bigbluebutton/api/messaging/messages/AddPad.java
bbb-common-web/src/main/java/org/bigbluebutton/api/util/ParamsUtil.java 16 additions, 0 deletions

.../src/main/java/org/bigbluebutton/api/util/ParamsUtil.java
bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/ReceivedJsonMsgHdlrActor.scala 4 additions, 0 deletions

...org/bigbluebutton/api2/bus/ReceivedJsonMsgHdlrActor.scala
bbb-common-web/src/main/scala/org/bigbluebutton/api2/meeting/OldMeetingMsgHdlrActor.scala 10 additions, 0 deletions

...g/bigbluebutton/api2/meeting/OldMeetingMsgHdlrActor.scala
bigbluebutton-html5/imports/api/captions/server/helpers.js 7 additions, 8 deletions

bigbluebutton-html5/imports/api/captions/server/helpers.js
bigbluebutton-html5/imports/api/captions/server/methods/addCaptionsPads.js 19 additions, 0 deletions

...l5/imports/api/captions/server/methods/addCaptionsPads.js
bigbluebutton-html5/imports/api/captions/server/methods/addPad.js 32 additions, 0 deletions

...utton-html5/imports/api/captions/server/methods/addPad.js
bigbluebutton-html5/imports/api/captions/server/methods/appendText.js 3 additions, 2 deletions

...n-html5/imports/api/captions/server/methods/appendText.js
bigbluebutton-html5/imports/api/captions/server/methods/createCaptions.js 5 additions, 0 deletions

...ml5/imports/api/captions/server/methods/createCaptions.js
bigbluebutton-html5/imports/api/captions/server/methods/editCaptions.js 0 additions, 1 deletion

...html5/imports/api/captions/server/methods/editCaptions.js
bigbluebutton-html5/imports/api/captions/server/methods/fetchReadOnlyPadId.js 6 additions, 0 deletions

...imports/api/captions/server/methods/fetchReadOnlyPadId.js

with 271 additions and 11 deletions

Please register or to comment