Commit Graph

63 Commits

Author SHA1 Message Date
Oswaldo Acauan
a0de0545b4 Fix welcomeMessage from meeting object 2017-07-18 10:31:00 -03:00
Oswaldo Acauan
c6f517b3cb Fix selector and get welcomeMessage from meeting object 2017-07-18 10:25:11 -03:00
Oswaldo Acauan
04b6b753fe Fix missing prop on meeting object 2017-07-18 10:23:16 -03:00
Anton Georgiev
07ca5f5794 Merge pull request #4086 from oswaldoacauan/guest-policy
[HTML5] Guest Policy
2017-07-14 15:32:18 -04:00
Oswaldo Acauan
8c99b7e4bb Fix cb pattern 2017-07-14 16:25:04 -03:00
Klaus
baf36d9d5f Fix the html5 2.0 user logout 2017-07-14 13:59:02 -03:00
Anton Georgiev
a00410847c Merge pull request #4083 from Klauswk/html5-breakout-messages
[HTML5 2.0] Move breakout messages to 2.0
2017-07-14 10:39:38 -04:00
Anton Georgiev
586c51fcac Merge pull request #4080 from Klauswk/bbb-2x-emoji-messages
[HTML5 2.0]  Move emoji messages to 2.0
2017-07-14 10:39:16 -04:00
Oswaldo Acauan
fe9ca6b0c8 Fix welcome message for guest users 2017-07-14 11:23:12 -03:00
Oswaldo Acauan
2e6ee550d2 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into guest-policy 2017-07-14 11:18:40 -03:00
Oswaldo Acauan
5353a3a80d Add guest policy to html5 2017-07-14 11:18:07 -03:00
Klauswk
38087a1669 Merge branch 'bbb-2x-mconf' into html5-breakout-messages 2017-07-13 17:38:54 -03:00
Klaus
82f383f4ae Fix typo in createBreakout 2017-07-13 17:35:40 -03:00
Klaus
6c602ba56f Add missing import and add FIX ME 2017-07-13 17:28:35 -03:00
Klaus
858076924c Fix import problems 2017-07-13 17:21:27 -03:00
Klaus
963248163d Merge branch 'bbb-2x-mconf' into html5-breakout-messages 2017-07-13 17:14:02 -03:00
Klaus
c97ad780b5 Fix properties incorrect name 2017-07-13 13:55:05 -03:00
Klaus
05e1951ac1 Use flat object instead of long properties 2017-07-13 10:56:28 -03:00
Klaus
54234cecac Handling emoji messages 2017-07-13 10:15:42 -03:00
Klaus
111ad9171b Remove strings and add constants 2017-07-12 17:15:50 -03:00
Klaus
e1004b64d3 Filtering correct the messages 2017-07-12 10:54:54 -03:00
Klaus
898f7c97e3 Sending private message 2017-07-12 10:18:26 -03:00
Klaus
73f49bb46a Sending public message 2017-07-12 09:42:16 -03:00
Klaus
188aff42df Sending message, need to fix the property names 2017-07-11 17:44:07 -03:00
Klaus
55a9c0673e Handling chat messages 2017-07-11 13:57:54 -03:00
Klaus
9b32a4db2d Remove 'nodeJSapp' stuff, is deprecated 2017-07-06 15:01:05 -03:00
Klaus
94da6f636f Merge branch 'html5-2x-getAll-messages' of https://github.com/Klauswk/bigbluebutton into html5-2x-getAll-messages 2017-07-06 09:32:14 -03:00
Klaus
cc38576f79 Add missing events 2017-07-06 08:58:38 -03:00
Klauswk
ebb3984828 Merge branch 'bbb-2x-mconf' into html5-2x-getAll-messages 2017-07-05 15:28:35 -03:00
Klaus
3f445bc92e Change log 2017-07-05 14:26:22 -03:00
Anton Georgiev
23f4521954 Merge pull request #4038 from oswaldoacauan/flat-add-meeting
[HTML5 2.0] Add flat package and implement on addMeeting modifier
2017-07-05 11:13:23 -04: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
c9b877c465 Merge branch 'handle-messages' into presentation-and-slides 2017-06-29 10:39:00 -04:00
Klaus
27a92698cc Moved the meetingId to be last param 2017-06-29 10:09:11 -03:00
Oswaldo Acauan
ace3afeb70 Remove console.log 2017-06-29 09:01:10 -03:00
Oswaldo Acauan
63522c6a95 Use flat package on mongo upsert 2017-06-29 08:54:19 -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
Klaus
4a24769f20 Change var name 2017-06-28 15:34:22 -03:00
Klaus
0e1d81ceb5 Change var name 2017-06-28 15:33:06 -03:00
Klaus
aab51bdaed Change import and remove console.err 2017-06-28 15:14:29 -03:00
Klaus
d3a50416cc Merge remote-tracking branch 'anton/handle-messages' into html5-whiteboard-messages 2017-06-28 13:56:33 -03:00
Klaus
894fd70e68 Fix presenter assigned message handle 2017-06-28 13:44:11 -03:00
Anton Georgiev
d899a573a6 Merge branch 'html5-whiteboard-messages' of github.com:Klauswk/bigbluebutton into handle-messages 2017-06-28 11:37:54 -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
Klaus
83cbb47195 Fix pencil update, thanks to @capilkey 2017-06-27 14:36:37 -03:00
Klaus
6f3aeb7a8d Fix imports 2017-06-27 09:45:08 -03:00