BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17,187 Commits 13 Branches 260 Tags 1.1 GiB
b7d6427e63
Commit Graph

17187 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anton Georgiev
f6ef0ddf75 Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into implement-bbb-web-msgs 2017-07-11 15:35:17 -04:00
JaeeunCho
fbdea71f8d changed to divide meeting check 2017-07-11 12:26:07 -07:00
Anton Georgiev
199af1773b send userLeave on user eject 2017-07-11 15:25:51 -04:00
JaeeunCho
9938ee6575 added space under User check 2017-07-11 12:20:47 -07:00
JaeeunCho
b5852c8f45 changed code that Meeting is not existed 2017-07-11 12:19:02 -07:00
Anton Georgiev
c5ca6a2fcc red5 closes connection when user is ejected 2017-07-11 14:56:35 -04:00
JaeeunCho
7fe20bb1f6 moved check logic into userLeaving 2017-07-11 10:43:33 -07:00
Klaus
55a9c0673e Handling chat messages 2017-07-11 13:57:54 -03:00
perroned
ecbc290436 Adds FF SS support 2017-07-11 12:24:50 -04:00
KDSBrowne
c8b783e526 improve contrast for hover states in join audio modal 2017-07-11 08:15:19 -07:00
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
perroned
a1554c0176 Updates verto lib 2017-07-11 10:59:32 -04:00
Ghazi Triki
25997d34c1 Implemented new style for user video. 2017-07-11 15:58:55 +01:00
KDSBrowne
efd933bf28 change $color-white to #fff 2017-07-11 07:08:49 -07:00
Ghazi Triki
2944cfd35a Move MuteMeButton component to phone module and updates styles for phone module buttons. 2017-07-11 10:34:49 +01: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
c810c2cf73 Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into implement-bbb-web-msgs 2017-07-10 17:26:04 -04:00
prlanzarin
b50cf7b23a Added kurento-screenshare ConnetionManager and media-controller modules 2017-07-10 20:56:00 +00:00
prlanzarin
1395893397 Fixed ending methods for kurento-extension 2017-07-10 20:51:37 +00:00
prlanzarin
02a6373c96 Refactored kurento-screenshare server to decouple it from kurento 
Theres still some work to do on that regarding ICE handling
 2017-07-10 20:51:06 +00:00
Anton Georgiev
23afd3fa95 Merge branch 'bbb-apps-sysmsg-routing' of github.com:capilkey/bigbluebutton into implement-bbb-web-msgs 2017-07-10 16:50:51 -04:00
Chad Pilkey
bc82b0bc9a add system message routing to bbb-apps-common 2017-07-10 16:41:01 -04: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
Ghazi Triki
fae4a1de2c Implemented new skin for PopUpButton. 2017-07-10 15:23:01 +01: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
Ghazi Triki
7b228f58d2 Added new programmatic skin for Panel based component. 2017-07-08 20:38:28 +01: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