Commit Graph

134 Commits

Author SHA1 Message Date
Maxim Khlobystov
5f79db2554 Fixed the issue with the Bulgarian locale always displaying as a default one in the Settings modal. 2017-10-06 16:29:52 +00:00
Oleksandr Zhurbenko
c9552247b2 Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x 2017-09-18 12:08:14 -07:00
KDSBrowne
cd5da84984 make handlePublishError static 2017-09-13 15:57:52 -07:00
KDSBrowne
c7328a5bb7 fix: Expected 'this' to be used by class method 'handlerPublishError' 2017-09-13 13:50:04 -07:00
KDSBrowne
e3ed9aa84d remove need for wrapper function 2017-09-13 12:47:52 -07:00
KDSBrowne
27dbe42189 pass this.pub as a parameter to _publish 2017-09-13 10:01:47 -07:00
KDSBrowne
91718abfba add underscore to indicate private function 2017-09-13 09:10:28 -07:00
KDSBrowne
41b629b232 make publish function private to RedisPubSub2x class 2017-09-13 08:29:23 -07:00
KDSBrowne
571c3763dd add publishVoiceMessage 2017-09-12 10:58:06 -07:00
KDSBrowne
090b3e91c2 add comment to publish 2017-09-12 10:25:41 -07:00
KDSBrowne
c987ef6635 add publishSystemMessage 2017-09-12 09:11:08 -07:00
KDSBrowne
39bd590329 rework header creation 2017-09-12 08:52:02 -07:00
Oleksandr Zhurbenko
43b3b89c6a Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x 2017-09-11 12:11:03 -07:00
KDSBrowne
89de2f771b change parameter name to header 2017-09-11 10:19:06 -07:00
KDSBrowne
bc8718e263 fix line endidngs 2017-09-07 09:47:20 -07:00
KDSBrowne
21c5ffee8f remove need for separate headerBuilder function 2017-09-07 09:37:13 -07:00
Oleksandr Zhurbenko
251bd22738 PR review fixes 2017-09-06 12:36:52 -07:00
KDSBrowne
67ab2d5379 alternate solution test 2017-09-06 07:17:46 -07:00
KDSBrowne
f31a2df133 implement suggested changes 2017-08-30 09:31:08 -07:00
KDSBrowne
14696a3cff fix lint issue 2017-08-30 08:03:19 -07:00
KDSBrowne
a8137c3054 switch to one function to create headers 2017-08-30 07:58:46 -07:00
KDSBrowne
82de509c55 fix typo 2017-08-29 07:00:41 -07:00
KDSBrowne
92c9af6d96 add functions to create headers 2017-08-28 07:29:26 -07:00
Oleksandr Zhurbenko
5d2b215591 Added timers for the pencil and shape draw listeners and fixed a bug with clearing the Annotations collection 2017-08-27 01:12:27 -07:00
Klaus
e996bea1e9 Handling separate redis channel 2017-08-14 15:55:17 -03:00
Klaus
12f1254624 Fix missing merge in redis2x 2017-07-13 17:23:20 -03:00
Klaus
963248163d Merge branch 'bbb-2x-mconf' into html5-breakout-messages 2017-07-13 17:14:02 -03:00
Klaus
1dfb054323 A few hotfixes to make the html5 client join again 2017-07-12 15:51:29 -03:00
Klaus
3d091e7a26 Change if 2017-07-06 15:07:52 -03:00
Klaus
9b32a4db2d Remove 'nodeJSapp' stuff, is deprecated 2017-07-06 15:01:05 -03:00
Klaus
dfa13b30f6 Add comment to change in the redis2x 2017-07-06 09:56:39 -03:00
Klaus
2058e14ae7 Fix lint problems 2017-07-06 09:29:17 -03:00
Klaus
cc38576f79 Add missing events 2017-07-06 08:58:38 -03:00
Klaus
86d3e27d47 Merged info with anton's branch 2017-07-03 12:05:35 -03:00
Anton Georgiev
83e14e8206 handle slides messages 2017-06-30 15:16:00 -04:00
Anton Georgiev
19d89c6f92 trigger syncing with state from akka-apps 2017-06-30 10:58:49 -04:00
Anton Georgiev
c9b877c465 Merge branch 'handle-messages' into presentation-and-slides 2017-06-29 10:39:00 -04:00
Klaus
1c62543715 Remove check from meetingId 2017-06-29 10:27:59 -03:00
Klaus
27a92698cc Moved the meetingId to be last param 2017-06-29 10:09:11 -03:00
Anton Georgiev
3ab794cbdb obtain meetingId outside handler 2017-06-28 16:04:41 -04:00
Anton Georgiev
7e798b96dd clearing some linting issues 2017-06-28 15:24:19 -04:00
Anton Georgiev
56da45f071 handle adding presentation, slide 2.0 2017-06-28 15:05:50 -04:00
Anton Georgiev
e0a5fa48f4 add default webcam_stream and adjust emoji 2017-06-28 11:33:03 -04:00
Anton Georgiev
724e21a0d6 we do not have 1.0 user messages coming from bbb so use 2.0 only 2017-06-27 18:14:53 -04:00
Anton Georgiev
91cfc02d13 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into handle-messages 2017-06-26 17:21:42 -04:00
Klaus
c491d28b78 Handle most of the breakout messages 2017-06-26 15:00:28 -03:00
Klaus
692de9f417 Handle a few new messages 2017-06-21 13:54:04 -03:00
Klaus
3998139e72 Split redis and api for version migration 2017-06-20 14:17:37 -03:00
Klaus Klein
d88d4fb0bc Add stuff from 2.x 2017-06-19 10:13:35 -03:00
Klaus Klein
c627deca36 Move api to api/1.1 2017-06-19 08:57:32 -03:00