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

1440 Commits

Author SHA1 Message Date
Richard Alam
e7ffcbfbe7 - merging latest bbb-2x-mconf 2017-06-16 18:12:29 -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
Richard Alam
d8bc6fc2db - put lock setting out of Conference 2017-06-16 10:08:31 -07:00
Richard Alam
5c84354715 - try to consolidate meeting state in one place 2017-06-15 19:09:32 -07:00
Richard Alam
55209b0685 - simplify deserializing of messages 2017-06-12 14:12:28 -07:00
Richard Alam
8beab449d5 - enable logging for bbb-apps 2017-06-02 07:17:01 -07:00
Richard Alam
2bbeba686d Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into move-java-classes-from-bbb-web-to-bbb-common-web 2017-06-01 10:03:27 -07:00
Richard Alam
240176ca32 Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into move-java-classes-from-bbb-web-to-bbb-common-web 2017-05-27 18:30:50 -07:00
Richard Alam
272df3c23d - send message to client 2017-05-26 20:00:33 -07:00
Chad Pilkey
3fe1103ea2 set a max text length of 1024 for text annotations 2017-05-26 18:52:46 -04:00
Chad Pilkey
09ec1e6151 first pass at multi whiteboard cursors 2017-05-25 23:45:27 -04:00
Richard Alam
467598ffd2 - turn off keep alive message 2017-05-23 17:36:05 -07:00
Richard Alam
4aedea9f5a - try new messages 2017-05-23 17:02:40 -07:00
Richard Alam
064128dbbc - wire bbb-apps 2017-05-23 15:34:08 -07:00
Richard Alam
82371a41de - try to start system 2017-05-19 19:27:09 -07:00
Richard Alam
7e257f1536 - load conf file 2017-05-15 14:32:49 -07:00
Richard Alam
ddde1b8a9f - do not use jedis for pubsub 2017-05-15 14:04:47 -07:00
Richard Alam
a1071ce7ba - try to wire spring for bbb-apps 2017-05-15 12:23:54 -07:00
Richard Alam
a6016c8bc3 - handle cleint message 2017-05-12 14:08:58 -07:00
Richard Alam
d88da415c6 - split bbb-apps into bbb-apps-common 2017-05-12 10:31:18 -07:00
Richard Alam
422ee08ea1 - setup tests 2017-05-09 11:47:44 -07:00
Richard Alam
6537e99981 Merge branch 'multiuser-whiteboard' of https://github.com/capilkey/bigbluebutton into merge-multi-user-whiteboard 2017-04-06 19:12:42 +00:00
Chad Pilkey
1a78091d01 multi-user whiteboard little bit of polish 2017-04-05 19:54:40 -04:00
Chad Pilkey
f7b9782ef3 multi-user whiteboard clear works 2017-04-04 16:43:15 -04:00
Pedro Beschorner Marin
f59e42bb02 Merge remote-tracking branch 'bigbluebutton/master' into merging-into-bbb-1.1 2017-04-04 20:42:15 +00:00
Chad Pilkey
cc2c461df3 first pass as multiuser whiteboard, can mutli draw 2017-03-29 20:12:15 -04:00
Pedro Beschorner Marin
c74cc682c4 Merge remote-tracking branch 'mconf/mconf' 2017-03-20 19:45:59 +00:00
Richard Alam
65dd914f52 Handle exception when sending message to client 
Handle exceptions properly when sending message to client. We were not handling the
 exception so when it occured, the thread stopped and we can't send messages from
 server to client anymore.
 2017-02-02 16:27:44 +00:00
Pedro Beschorner Marin
14b480c8ce Working on avoiding reconnection when ending a meeting by API call 2016-12-09 20:33:03 +00:00
Richard Alam
145c40a459 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into upgrade-red5-nov-22-2016-snapshot 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/BreakoutRoomApp.scala
 2016-11-24 23:00:56 +00:00
Richard Alam
8f6213b77d - upgrade to latest red5 2016-11-22 20:45:58 +00:00
Richard Alam
3ead2b449b - minor formatting from IDE 2016-11-22 15:59:05 +00:00
Ghazi Triki
59a0f4665d Updated RequestBreakoutJoinURL to return two join urls, the first with redirection enable and the second without redirection. 2016-11-21 18:01:22 +01:00
Anton Georgiev
b6cff88bfe change frequency of heap monitor to 60sec 2016-11-15 22:51:39 +00:00
Anton Georgiev
8726ec2914 add JVM Heap monitor updated every 5 sec 2016-11-15 22:42:10 +00:00
Richard Alam
3ff537cff6 - log client out when user is ejected from meeting. 2016-11-11 22:19:52 +00:00
Richard Alam
fa16d266b9 - add more logging to track issues 2016-11-10 22:35:06 +00:00
Pedro Beschorner Marin
5416d01dcc Syncing note if a problem is detected while patching 2016-10-26 17:25:49 +00:00
Richard Alam
1e8d7a5229 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into try-to-cleanup-connection 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/BreakoutRoomApp.scala
 2016-10-21 19:36:07 +00:00
Pedro Beschorner Marin
ddd1459d4c Refactored sharednotes UNDO operation and implemented REDO 2016-10-21 19:33:30 +00:00
Pedro Beschorner Marin
1eb1aea65e More sofisticated control of sharednotes undo button 2016-10-20 19:56:57 +00:00
Richard Alam
7ea0ab7037 Track user connection 
Need to track user connections to prevent removing the user when the defuncted connection gets
  cleaned up by Red5.
 2016-10-20 19:05:11 +00:00
Pedro Beschorner Marin
758adb3b8e First functional version of sharednotes undo operation 2016-10-20 17:52:37 +00:00
Richard Alam
5ba3405941 - remove defunct connection when client auto-reconnects. 2016-10-20 15:08:58 +00:00
Ghazi Triki
b078628ad9 Store breakout room externalMeetingID to be used for generating join URL. 2016-10-13 17:17:47 +01:00
Ghazi Triki
bf5de153a0 Deleted unused imports from bigbluebutton-apps and bigbluebutton-web 2016-10-12 20:24:51 +01:00
Ghazi Triki
c95d208da7 Added sequence property breakout room. 2016-10-11 22:13:22 +01:00
Ghazi Triki
f7be426305 Breakout rooms refactoring: generated uniques external ID and internal ID. 2016-10-11 20:50:51 +01:00
Richard Alam
e53124c20d Cast Exception when sending Number from client to Red5 
When responding to a poll, the client sends a Number type which gets encoded in Red5
 as a Double. However, we expect an Integer which results in an exception. Cast the
 received Number properly into an Integer.

 I notice too that EditCaptionHistory is sending a Number. In Red5, we should check if
 we received a Double and cast it to Integer properly.
 2016-09-17 07:13:52 -07:00