BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,818 Commits 13 Branches 260 Tags 1.1 GiB
68034fa6d8
Commit Graph

16818 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Richard Alam
68034fa6d8 Merge branch 'antobinary-implement-bbb-web-msgs' into bbb-2x-mconf 2017-07-11 08:13:07 -07:00
Richard Alam
02d9c6717b Merge branch 'implement-bbb-web-msgs' of https://github.com/antobinary/bigbluebutton into antobinary-implement-bbb-web-msgs 2017-07-11 08:12:18 -07:00
Richard Alam
0b21c6d047 Merge branch 'capilkey-add-deskshare-handlers' into bbb-2x-mconf 2017-07-10 19:21:44 -07:00
Richard Alam
40d00282f5 - send deskshare messages from fsesl 2017-07-10 19:17:51 -07:00
Richard Alam
e425c657c6 Merge branch 'add-deskshare-handlers' of https://github.com/capilkey/bigbluebutton into capilkey-add-deskshare-handlers 2017-07-10 17:21:51 -07:00
Chad Pilkey
f6d92e5a50 add deskshare msg handlers to akka-apps 2017-07-10 18:12:06 -04:00
Richard Alam
38d2803dcc Merge pull request #4065 from ritzalam/update-commons-msg-version 
- update dependency to bbb-commons-message 0.19-SNAPSHOT
 2017-07-10 17:38:17 -04:00
Richard Alam
4eafa2d014 - update dependency to bbb-commons-message 0.19-SNAPSHOT 2017-07-10 14:36:59 -07:00
Anton Georgiev
797b2904aa handle eject user from meeting (a.k.a. kick) 2017-07-10 15:36:26 -04:00
Richard Alam
72f274434a Merge pull request #4063 from perroned/webrtc-utils 
Webrtc 2.0
 2017-07-10 13:33:44 -04:00
perroned
c13cb35c2b Cleans up 2017-07-10 12:03:01 -04:00
Richard Alam
2cf5679e3e Merge pull request #4062 from ritzalam/implement-emoji-message 
- start implementing lock settings
 2017-07-10 10:34:57 -04:00
Richard Alam
7a7712d986 - start implementing lock settings 2017-07-09 15:00:13 -07:00
perroned
03a97fef46 Cleans up -> StringUtils 2017-07-09 14:43:20 -04:00
perroned
020df250a6 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into webrtc-utils 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/WebRTCDeskshareManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/maps/ScreenshareEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/maps/WebRTCDeskshareEventMap.mxml
 2017-07-09 14:39:57 -04:00
Anton Georgiev
0e9dcee399 Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into implement-bbb-web-msgs 2017-07-09 11:09:23 -04:00
Richard Alam
2e3d9e1bda Merge pull request #4061 from ritzalam/implement-emoji-message 
- implement emoji status message
 2017-07-09 10:56:03 -04:00
Richard Alam
8d91ef8132 - convert several old client messages to new ones 2017-07-09 07:44:29 -07:00
Anton Georgiev
35b87ee069 Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into implement-bbb-web-msgs 2017-07-09 10:37:34 -04:00
Anton Georgiev
900518fb1b cleanup 2017-07-09 10:26:55 -04:00
Richard Alam
5dbb8d5515 - implement emoji status message 2017-07-08 13:39:41 -07:00
Richard Alam
6588e6e89a Merge pull request #4052 from capilkey/improve-shell-resize 
Skip layout change when dimensions are invalid
 2017-07-08 15:11:45 -04:00
Richard Alam
366e2033c5 Merge pull request #4060 from perroned/fix-ss-2x 
Restores 1.1 JWS Screensharing on 2.0
 2017-07-08 15:11:24 -04:00
Richard Alam
4248d7e4f9 Merge branch 'capilkey-move-chat-messages-2x' into bbb-2x-mconf 2017-07-08 08:41:58 -07:00
Richard Alam
77de38e2f3 Merge branch 'move-chat-messages-2x' of https://github.com/capilkey/bigbluebutton into capilkey-move-chat-messages-2x 2017-07-08 08:41:20 -07:00
perroned
f77b29bad3 Restores 1.1 ss 2017-07-08 11:29:13 -04:00
Richard Alam
c442554cd7 Merge pull request #4059 from ritzalam/implement-meeting-status 
Removing old messages
 2017-07-08 11:07:59 -04:00
Richard Alam
0cf4227273 Merge branch 'implement-bbb-web-msgs' into implement-meeting-status 2017-07-08 08:04:13 -07:00
Richard Alam
2212d95a28 Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into implement-meeting-status 2017-07-08 07:23:30 -07:00
Richard Alam
1320988a95 - handle register user properly 2017-07-08 07:22:45 -07:00
Chad Pilkey
e30ba20323 avoid exception when cursor user isn't found 2017-07-07 20:16:43 -04:00
Chad Pilkey
bf9f6df9b1 remove all 1.1 chat messaging code 2017-07-07 20:16:14 -04:00
Chad Pilkey
550b880db7 convert chat messages to 2x 2017-07-07 19:14:00 -04:00
Richard Alam
507cc69939 - fix compile issues 2017-07-07 14:51:25 -07:00
Fred Dixon
853984f535 Merge pull request #4057 from capilkey/remove-ss-from-presentation-2x 
Remove screenshare from presentation
 2017-07-07 17:42:36 -04:00
perroned
1b92aba481 Hangup and reconnect safely 2017-07-07 17:27:28 -04:00
Richard Alam
70c7ebc1a1 - continue removing old messages in akka-apps 2017-07-07 14:23:56 -07:00
perroned
f5650b1d16 Makes utility for webrtc capabilities 2017-07-07 17:06:52 -04:00
perroned
c08f9d4d7b Changes handler to WebRTC status class 2017-07-07 17:02:07 -04:00
perroned
cc497136e8 Add screenshare fallbacks 2017-07-07 17:01:53 -04:00
perroned
f92be502cc Moves constraints to initialization 2017-07-07 17:01:33 -04:00
Chad Pilkey
fc3d7a05aa remove the screenshare code from the presentation module 2017-07-07 17:01:27 -04:00
Anton Georgiev
a0f90f181d assign proper userId for assignedBy 2017-07-07 11:25:48 -04:00
Anton Georgiev
dd38cebe58 trigger UI changes if we are the presenter 2017-07-07 10:51:11 -04:00
Anton Georgiev
0ec660c8d3 handle assign presenter in flash client and akka apps 2017-07-07 10:32:38 -04:00
Richard Alam
a0ed7685ce - continue removing old code 2017-07-06 18:48:26 -07:00
Richard Alam
2945c0e6fc - continue removing old messages 2017-07-06 14:50:34 -07:00
Anton Georgiev
3237f9a653 Merge pull request #4055 from Klauswk/html5-2x-getAll-messages 
[Html5 2.0] Move Sync and Presentations Messages to 2.0
 2017-07-06 15:57:52 -04: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