Richard Alam
|
8ca0d6c9fe
|
- wire up new message path
|
2017-07-03 07:44:13 -07:00 |
|
Anton Georgiev
|
2e0f6d8610
|
trigger syncing with state from akka-apps
|
2017-06-30 11:19:11 -04:00 |
|
Richard Alam
|
3f9ac22a1c
|
Merge pull request #4041 from ritzalam/handle-guest-policy
Layout message and package reorg
|
2017-06-29 21:23:37 -04:00 |
|
Richard Alam
|
50acc517af
|
Merge branch 'fix-2.0-layout' of https://github.com/capilkey/bigbluebutton into capilkey-fix-2.0-layout
|
2017-06-29 18:20:40 -07:00 |
|
Chad Pilkey
|
4e5df30ac4
|
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into fix-2.0-layout
|
2017-06-29 16:57:28 -04:00 |
|
Richard Alam
|
fcf41c9f61
|
- move to different packages
|
2017-06-29 13:55:37 -07:00 |
|
Chad Pilkey
|
9f904e6267
|
reorganized the layout code in akka-apps and fixed layout broadcast
|
2017-06-29 16:55:25 -04:00 |
|
Richard Alam
|
2c0a6adca6
|
Merge pull request #4039 from ritzalam/handle-guest-policy
Guest policy
|
2017-06-29 14:36:00 -04:00 |
|
Richard Alam
|
a11c45fa02
|
- implement handlers for guest policy
|
2017-06-29 11:34:08 -07:00 |
|
Chad Pilkey
|
15c938e9cd
|
fixed layout message response and removed redundant props
|
2017-06-29 14:32:31 -04:00 |
|
Anton Georgiev
|
ec8cf493d8
|
Merge pull request #4028 from Klauswk/html5-whiteboard-messages
Html5 - whiteboard messages 2x
|
2017-06-29 10:32:17 -04:00 |
|
Richard Alam
|
29052e6f79
|
- send layout response to requester user instead of whole meeting
|
2017-06-29 07:31:23 -07: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 |
|
Richard Alam
|
0aed46c986
|
- add validate token handler tests
|
2017-06-28 14:56:35 -07:00 |
|
Anton Georgiev
|
3ab794cbdb
|
obtain meetingId outside handler
|
2017-06-28 16:04:41 -04:00 |
|
Anton Georgiev
|
5ca466c448
|
Merge branch 'html5-whiteboard-messages' of github.com:Klauswk/bigbluebutton into handle-messages
|
2017-06-28 15:24:46 -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 |
|
Anton Georgiev
|
f9f50cddec
|
Merge branch 'html5-whiteboard-messages' of github.com:Klauswk/bigbluebutton into handle-messages
|
2017-06-28 13:37:57 -04:00 |
|
Klaus
|
4fe5a074df
|
Userlist working correct
|
2017-06-28 14:16:04 -03:00 |
|
Klaus
|
d3a50416cc
|
Merge remote-tracking branch 'anton/handle-messages' into html5-whiteboard-messages
|
2017-06-28 13:56:33 -03:00 |
|
Anton Georgiev
|
858e541984
|
Merge branch 'bbb-2x-mconf' into handle-messages
|
2017-06-28 12:55:33 -04:00 |
|
Klaus
|
894fd70e68
|
Fix presenter assigned message handle
|
2017-06-28 13:44:11 -03:00 |
|
Richard Alam
|
f4bf6912d4
|
- add create meeting request test for BigBlueButtonActor
|
2017-06-28 09:01:45 -07: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 |
|
Richard Alam
|
e9b669349e
|
Merge pull request #4033 from ritzalam/refactor-client
Merging Anton's poll PR and fixes
|
2017-06-28 11:03:07 -04:00 |
|
Richard Alam
|
04e55a1dd4
|
Merge branch 'move-caption-messages-2x' of https://github.com/capilkey/bigbluebutton into capilkey-move-caption-messages-2x
|
2017-06-28 07:47:56 -07:00 |
|
Richard Alam
|
c2c6b19e95
|
- group messages into it's own file
|
2017-06-28 07:23:49 -07:00 |
|
Richard Alam
|
30827f680e
|
- move messages into different package
|
2017-06-27 19:44:47 -07: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 |
|
Richard Alam
|
a32193bd68
|
- reorganize messages
|
2017-06-27 15:01:42 -07:00 |
|
Richard Alam
|
03010eedb2
|
- put users messages in one file
- put guest policy into it's own class
|
2017-06-27 13:05:38 -07:00 |
|
Klaus
|
83cbb47195
|
Fix pencil update, thanks to @capilkey
|
2017-06-27 14:36:37 -03:00 |
|
Klaus
|
c90d94d5ac
|
Handle presenterAssigned and emojiStatus
|
2017-06-27 09:40:28 -03:00 |
|
Chad Pilkey
|
02e8c4f4cb
|
forgot a semi-colon
|
2017-06-26 18:29:21 -04:00 |
|
Chad Pilkey
|
4c66393dbd
|
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into move-caption-messages-2x
|
2017-06-26 18:09:56 -04:00 |
|
Richard Alam
|
f4bcb2421a
|
- send poll voting to client
|
2017-06-26 14:39:52 -07:00 |
|
Anton Georgiev
|
91cfc02d13
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into handle-messages
|
2017-06-26 17:21:42 -04:00 |
|
Anton Georgiev
|
ff01a66228
|
Merge branch 'html5-whiteboard-messages' of github.com:Klauswk/bigbluebutton into handle-messages
|
2017-06-26 17:11:57 -04:00 |
|
Richard Alam
|
4baf8369ff
|
- apply voice status to correct user
|
2017-06-26 14:01:25 -07:00 |
|
Richard Alam
|
00cee79501
|
- do not show when user joins listen-only
|
2017-06-26 14:00:51 -07:00 |
|
Richard Alam
|
2316e73c26
|
Merge branch '2.0-Polls' of https://github.com/antobinary/bigbluebutton into antobinary-2.0-Polls
|
2017-06-26 14:00:38 -07:00 |
|
Chad Pilkey
|
adfdd3c230
|
add try/catch block to client message receiver
|
2017-06-26 16:48:05 -04:00 |
|
Chad Pilkey
|
7c19972d24
|
remove pre-2.0 caption server code
|
2017-06-26 16:47:18 -04:00 |
|
Chad Pilkey
|
d690b49898
|
clear transcript owner when they leave the meeting
|
2017-06-26 16:46:09 -04:00 |
|
Anton Georgiev
|
a43a2c8eed
|
Merge pull request #3993 from oswaldoacauan/git-hooks-linter
[HTML5] Add a hook to run linters agains staged git files
|
2017-06-26 16:34:11 -04:00 |
|
Oswaldo Acauan
|
404598d735
|
Fix conflicts
|
2017-06-26 20:24:58 +00:00 |
|