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

13476 Commits

This Branch
This Branch
All Branches
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
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
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
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
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
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
KDSBrowne
993dc70525 Cleaned up code 2016-10-12 10:03:10 -07:00
Ghazi Triki
f8beb9e4e7 Breakout rooms are now sorted by their sequence number. 2016-10-12 12:41:57 +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
JaeeunCho
d214eff554 added css for red dot and fixed code 2016-10-11 10:36:28 -07:00
JaeeunCho
fd38b2eb24 Merge remote-tracking branch 'upstream/master' into userlist_dot 2016-10-11 10:24:27 -07:00
Anton Georgiev
a147009c74 Merge pull request #3392 from Lajellu/EmojiReworked 
Emoji reworked
 2016-10-11 10:56:40 -04:00
Fred Dixon
53583d5a8f Remove reference to deployJava.js 2016-10-09 21:27:26 -05:00
Fred Dixon
05a3c704f8 Merge pull request #3405 from ffdixon/minor-fix-bbb-conf 
fix sed for bbb-conf --check
 2016-10-09 22:14:13 -04:00
Fred Dixon
06c879db37 fix sed for bbb-conf --check 2016-10-09 21:13:30 -05:00
Richard Alam
403665feb6 - add senderId when recording publish chat message 2016-10-07 21:45:56 +00:00
KDSBrowne
7e718d0a75 changed functions to start with lowercase 2016-10-07 10:12:18 -07:00
KDSBrowne
720c16f3ac Moved over the previous solution to the server side and cleaned up the code 2016-10-07 09:36:27 -07:00
Lajellu
1f114eb908 Merge remote-tracking branch 'origin/EmojiReworked' into EmojiReworked 2016-10-06 13:44:03 -07:00
Lajellu
63c9f94b54 HTML5 - changes status names, and user list sorting logic to match flash client 2016-10-06 13:42:37 -07:00
Laily Ajellu
498d2f040c Merge pull request #1 from antobinary/merge-pr 
Resolve conflicts with master + fix hiredis warning
 2016-10-06 12:15:28 -04:00
Ghazi Triki
b10237ebad Upgrade commons-codec dependency version to 1.10 2016-10-05 17:29:37 +01:00
JaeeunCho
04e9d1818c HTML 5 - added to display the state of unreaded messages right next to the user icon 2016-10-04 12:23:43 -07:00
Fred Dixon
a1407c71d1 Merge pull request #3402 from riadvice/breakout-rooms-slide-conversion 
Handle non PDF slide conversion for breakout rooms
 2016-10-03 13:22:31 -04:00
Ghazi Triki
27fd992294 Handle non PDF slide conversion for breakout rooms. 2016-10-03 17:39:02 +01:00