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

16691 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Richard Alam
11609d840b - display users list 2017-06-21 13:47:10 -07:00
Richard Alam
c41b9b9a7a - display users list 2017-06-21 13:32:37 -07:00
Richard Alam
281108b1ab - send waitForApproval for guest on validate token 2017-06-21 10:49:08 -07:00
Klaus
692de9f417 Handle a few new messages 2017-06-21 13:54:04 -03:00
Richard Alam
30bafd7983 - try using new user data instead of BBBUser 2017-06-21 09:41:59 -07:00
Richard Alam
582cdf07ec - fix compile issue due to breaking of messages 2017-06-21 08:05:49 -07:00
Richard Alam
28b115d742 - break down messages 2017-06-20 19:15:38 -07:00
Richard Alam
63574cd8bd - split messages 2017-06-20 18:57:10 -07:00
Richard Alam
f4a5097289 - add run script for bbb-web 2017-06-20 14:27:54 -07:00
Richard Alam
5a560514f2 - handle webcam in flash client 2017-06-20 14:08:36 -07:00
Richard Alam
71d8b26ec1 - fake user generator so we can populate meeting with fake users for development 2017-06-20 13:44:26 -07:00
Anton Georgiev
13193e1d12 Merge pull request #4009 from KDSBrowne/x0-userlistitem-missing-chevron-fix 
[HTML5] - Missing dropdown menu chevron fix
 2017-06-20 15:40:54 -04:00
Anton Georgiev
42393e21b7 Merge pull request #4015 from JaeeunCho/setPreseter_err_html5 
HTML5 - fixed setPresenter error through HTML5
 2017-06-20 15:39:42 -04:00
Anton Georgiev
2f53f79873 Merge pull request #4024 from Klauswk/SplitRedis 
HTML5 - Split redis messages from 1.x and 2.x
 2017-06-20 13:54:54 -04:00
Klaus
3998139e72 Split redis and api for version migration 2017-06-20 14:17:37 -03:00
Klaus
0c596c304d Merge remote-tracking branch 'upstream/bbb-2x-mconf' into SplitRedis 2017-06-20 14:16:16 -03:00
Klaus
b3865ef90d Merge remote-tracking branch 'origin/Refactor2x' into SplitRedis 2017-06-20 14:11:19 -03:00
Ghazi Triki
2649533bd8 Handle layout messages for V2. 2017-06-20 17:15:03 +01:00
Ghazi Triki
46556a8405 Add Layout server messages for V2. 2017-06-20 17:14:46 +01:00
Anton Georgiev
e4534ef728 Merge pull request #4021 from antobinary/html5-login-via-sessionToken 
Html5 clients now log in via sessionToken
 2017-06-19 17:30:41 -04:00
Richard Alam
efef48fcf9 Merge pull request #4022 from ritzalam/refactor-client 
Change in client and sending messages
 2017-06-19 17:23:17 -04:00
Richard Alam
e8e83b85b8 - fix assigning of role properly 2017-06-19 14:19:54 -07:00
Richard Alam
bd46c386fc Merge branch 'bbb-2x-mconf' into refactor-client 2017-06-19 13:28:51 -07:00
Richard Alam
d0343b40d2 - delay processing of pre-uploaded presentation to make sure that meeting has been created before 
presentation conversion has completed.
 2017-06-19 13:04:07 -07:00
Richard Alam
65d91bf392 Merge branch 'riadvice-breakout-rooms-2x-messages' into bbb-2x-mconf 2017-06-19 12:36:21 -07:00
Richard Alam
bb8944570b - fix validate auth token race condition where the validate auto token is sent to the meeting before 
the meeting has been created
 2017-06-19 12:34:53 -07:00
Richard Alam
cb7219ee38 Merge branch 'breakout-rooms-2x-messages' of https://github.com/riadvice/bigbluebutton into riadvice-breakout-rooms-2x-messages 2017-06-19 11:41:54 -07:00
Richard Alam
2f9109d0a7 - fix some client initialization issues 2017-06-19 11:41:03 -07:00
Richard Alam
4f2fd83851 - client project properties 2017-06-19 11:25:27 -07:00
Richard Alam
6021bb93c9 - send users, voice users, webcams on validate auth token 2017-06-19 11:21:51 -07:00
Anton Georgiev
367b905ec5 use enter api to get meetingId, authToken, etc 2017-06-19 14:03:12 -04:00
Anton Georgiev
a50d3d7895 demohtml5 create meeting unless existing 2017-06-19 14:01:43 -04:00
Anton Georgiev
8e16114c3f html5client login now redirect=true to url+sessionToken 2017-06-19 14:01:24 -04:00
Anton Georgiev
9bae75375b pass sessionToken to html5 client 2017-06-19 13:59:48 -04:00
Ghazi Triki
5fc84b50f0 Merge remote-tracking branch 'bigbluebutton/bbb-2x-mconf' into breakout-rooms-2x-messages 
# Conflicts:
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/RunningMeeting.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/message/handlers/UserJoinMeetingReqMsgHdlr.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/endpoint/redis/RedisRecorderActor.scala
#	bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/MessageBody.scala
#	bbb-common-message/src/main/scala/org/bigbluebutton/common2/messages/Messages.scala
#	bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
#	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
 2017-06-19 17:46:46 +01:00
KDSBrowne
8df4c0a174 suggested change 2017-06-19 09:29:32 -07:00
Ghazi Triki
c7c39989a3 Added all breakout rooms events handlers in akka-bbb-apps project. 2017-06-19 16:57:36 +01:00
Richard Alam
4f4c11b10a - fix some client initialization issues 2017-06-19 07:40:40 -07:00
Klaus Klein
ca09b69555 Merge branch 'Acl' into Refactor2x 
* Acl:
  Add check to undefined role
  Lint to eslint
  Missing merge file
  Fix lint problems
  Change Acl lookup
  Change ACL to be more extensible
  Fix a few review comments
  Acl refactor working
  Mostly working, still problems with user subs
  Code refactored
 2017-06-19 11:28:17 -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
Richard Alam
b22b5ce73e - minor changes to client 2017-06-18 17:39:24 -07:00
Richard Alam
957213f47b Merge pull request #4019 from ritzalam/add-new-users-collection-instead-of-in-conference 
Modified client to consolidate where we store meeting state
 2017-06-18 08:43:39 -04:00
Richard Alam
e80a3de440 - put message into it's own sender 2017-06-17 19:28:43 -07:00
Richard Alam
e7ffcbfbe7 - merging latest bbb-2x-mconf 2017-06-16 18:12:29 -07:00
Richard Alam
480438b3be Merge branch 'antobinary-2.0-Polls' into bbb-2x-mconf 2017-06-16 17:38:41 -07:00
Richard Alam
5c76f413bb Merge branch '2.0-Polls' of https://github.com/antobinary/bigbluebutton into antobinary-2.0-Polls 2017-06-16 17:38:06 -07:00
Richard Alam
92d80d7066 Merge branch 'capilkey-move-whiteboard-messages-2x' into bbb-2x-mconf 2017-06-16 17:19:20 -07:00
Richard Alam
dc1c1e8b9e Merge branch 'move-whiteboard-messages-2x' of https://github.com/capilkey/bigbluebutton into capilkey-move-whiteboard-messages-2x 2017-06-16 17:18:50 -07:00
Chad Pilkey
f3ab70f060 convert whiteboard messages to the 2.0 method and remove old 2017-06-16 18:09:25 -04:00