Commit Graph

13548 Commits

Author SHA1 Message Date
Richard Alam
ece6edcb12 - fix check for breakout room
- insert breakout metadata into events.xml
 - delete breakout metadata from redis
2016-10-21 19:05:30 +00:00
Oswaldo Acauan
8874c15e9f Rename meteor method on the client 2016-10-21 18:47:33 +00:00
Oswaldo Acauan
8e27e35e07 Rever wrong changes on chat handler parameters 2016-10-21 17:10:27 +00:00
Oswaldo Acauan
d1786d61a6 Revert wrong changes on chat handler name 2016-10-21 17:08:43 +00:00
Oswaldo Acauan
c590f3ffd9 Merge branch 'rewrite-queue-handler' into refactor-meetings-api
* rewrite-queue-handler:
  Remove left over debug
  Fix chat being always inserted when the server start
  Add debug message when handler is completed with errors
2016-10-21 16:57:01 +00:00
Oswaldo Acauan
85a1a44cc9 Remove left over debug 2016-10-21 16:55:54 +00:00
Oswaldo Acauan
e67c127e8f Fix chat being always inserted when the server start 2016-10-21 16:54:17 +00:00
Oswaldo Acauan
3923cf4073 Add debug message when handler is completed with errors 2016-10-21 16:29:22 +00:00
Oswaldo Acauan
c7b62a209c Refactor Meeting API 2016-10-21 16:27:47 +00:00
Oswaldo Acauan
6676feb933 Fix bug on the clearChats and addChat modifiers 2016-10-21 11:56:03 +00:00
Richard Alam
d0e76ae64b Merge branch 'unique-meeting-id-breakout-rooms' of https://github.com/riadvice/bigbluebutton into riadvice-unique-meeting-id-breakout-rooms 2016-10-20 21:14:49 +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
Richard Alam
c143e7cc31 Minor cleanup
Remove debug log.
2016-10-20 19:04:23 +00:00
Richard Alam
5ba3405941 - remove defunct connection when client auto-reconnects. 2016-10-20 15:08:58 +00:00
Oswaldo Acauan
b04e071389 Revert Meteor version to stable release 2016-10-19 17:54:09 +00:00
Oswaldo Acauan
077cf8471c Change filenames based on slack feedback 2016-10-19 17:49:38 +00:00
Oswaldo Acauan
1d30281cf2 Refactor server Chat API 2016-10-19 12:18:47 +00:00
Anton Georgiev
5b2b0ed2db Merge pull request #3415 from JaeeunCho/actions_dropdown
HTML5 - actions_dropdown component
2016-10-18 10:55:53 -04:00
Anton Georgiev
56bb32da98 Merge pull request #3414 from Lajellu/FixFullscreenToggle
HTML5 - fixes fullscreen toggle to un-fullscreen
2016-10-18 10:55:09 -04:00
Oswaldo Acauan
79cdf636eb Rewrite Redis related classes 2016-10-18 12:03:51 +00:00
JaeeunCho
6d1823f2c7 HTML5 - fixed linebreak with lint 2016-10-17 14:29:00 -07:00
Lajellu
373dd9535b HTML5 - fixes fullscreen toggle to un-fullscreen 2016-10-17 14:14:12 -07:00
Ghazi Triki
1c78eb1af5 Format line in bbb-conf using spaces. 2016-10-17 11:18:34 +01:00
Ghazi Triki
a477fc2442 bbb-conf stops and starts redis server & checks video and freeswitch recordings directories 2016-10-17 11:12:34 +01:00
Ghazi Triki
2b7c7d84e4 Monitoring for number of user is not triggered for breakout rooms. 2016-10-17 10:15:02 +01:00
Ghazi Triki
265216a33c Updated bbb-record rules to detect recording directories. 2016-10-17 09:08:29 +01:00
Ghazi Triki
415e34fb28 Added new property redirectOnJoin to CreateBreakoutRoomsRequest. 2016-10-14 21:28:44 +01:00
Ghazi Triki
c694f632ea Added redirect property to RequestBreakoutJoinURL. 2016-10-14 20:46:34 +01:00
Anton Georgiev
5e11b70380 Merge pull request #3410 from oswaldoacauan/fix-html5-frozen-queue
[HTML5] Fix handler for 'get_whiteboard_shapes_reply'
2016-10-14 13:40:41 -04:00
Oswaldo Acauan
f055771abd Fix handler for 'get_whiteboard_shapes_reply' not calling the cb 2016-10-14 16:18:54 +00:00
Ghazi Triki
638b6d0433 Store breakout meeting info in redis under "meeting:breakout" key instead of "meeting:info" 2016-10-14 16:59:22 +01:00
Ghazi Triki
e187634c2a Using blank-presentation.pdf as default breakout room presentation when no current presentation is set to the parent room. 2016-10-14 16:33:17 +01:00
Anton Georgiev
3ca807150f Merge pull request #3409 from KDSBrowne/Localization-update
fixed console log error
2016-10-13 17:10:47 -04:00
KDSBrowne
b217a87e9d fixed console log error 2016-10-13 11:19:53 -07:00
Ghazi Triki
8e8fee7826 Re-enable recording option for breakout rooms. 2016-10-13 17:43:53 +01:00
Ghazi Triki
b078628ad9 Store breakout room externalMeetingID to be used for generating join URL. 2016-10-13 17:17:47 +01:00
Richard Alam
80dfca37c4 Merge pull request #3408 from capilkey/cleanup-deskshare
Remove old deskshare module and out-dated Java checks
2016-10-13 11:04:43 -04:00
Anton Georgiev
e47c63f84f Merge pull request #3407 from JaeeunCho/userlist_dot
HTML5 - Userlist Switcher
2016-10-13 10:54:37 -04:00
Anton Georgiev
11f0c2da03 Merge pull request #3401 from KDSBrowne/Localization-update
Localization update #1
2016-10-13 10:44:13 -04:00
Richard Alam
d6a181f095 Merge pull request #3406 from ffdixon/remove-java-reference
Remove reference to deployJava.js
2016-10-13 10:29:44 -04:00
Richard Alam
44e3d5b728 Merge pull request #3404 from ritzalam/record-sender-id-in-chat
- add senderId when recording publish chat message
2016-10-13 10:29:10 -04:00
Ghazi Triki
5e002d845e Store breakout room sequence in akka-apps and bbb-web. 2016-10-13 12:53:53 +01:00
Ghazi Triki
054037c6d6 Revert replacing the deprecated shaHex DigestUtils by sha1Hex and updated API controller. 2016-10-13 09:04:41 +01:00
KDSBrowne
6a580e9e0c Replaced Ajax with fetch() 2016-10-12 18:16:34 -07:00
Chad Pilkey
fef5acace6 remove old deskshare module and out-dated Java checks 2016-10-12 18:13:02 -04:00
Matthew Marangoni
28af2439d1 Renamed a few props to be more consistent with component names and for readability 2016-10-12 13:09:47 -07:00
Matthew Marangoni
5c386ceba3 Reworked modal to dynamically change content 2016-10-12 12:55:02 -07:00
Ghazi Triki
bf5de153a0 Deleted unused imports from bigbluebutton-apps and bigbluebutton-web 2016-10-12 20:24:51 +01:00
Ghazi Triki
a80b6d9c45 Replace the deprecated shaHex DigestUtils by sha1Hex. 2016-10-12 20:20:37 +01:00
Ghazi Triki
ff9bc17c15 Send sequence number when creating breakout rooms and correctly generate a unique externalMeetingId for breakout rooms. 2016-10-12 19:55:20 +01:00