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

12923 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Richard Alam
2148812e14 Merge pull request #3259 from capilkey/cc-combined-messages 
Make the CC updates smarter
 2016-08-05 10:01:23 -04:00
Richard Alam
871d9d64fa Merge pull request #3263 from ritzalam/transfer-user-to-breakout-room 
Joining voice conf of breakout room
 2016-08-05 10:00:56 -04:00
Richard Alam
8e9b16776c Joining voice conf of breakout room 
A moderator should be able to listen-in on the breakout room. During a previous merge, the
 handler of the transfer message in FSESL was accidentally removed. The user isn't able to
 the breakout room's voice conference anymore.
 2016-08-05 13:58:07 +00:00
Anton Georgiev
832bf2bba7 Merge pull request #3262 from Gcampes/patch-1 
Fixes login in html when flash is not supported
 2016-08-05 09:36:13 -04:00
Gabriel Carvalho de Campes
44c8ae4f59 Fixes login in html when flash is not supported 2016-08-05 10:34:07 -03:00
Chad Pilkey
8eed1b72d8 wait to process transcript updates until after the history has been loaded 2016-08-04 14:59:29 -07:00
Chad Pilkey
23790b4f98 remove empty function in CC OptionsTab 2016-08-04 14:58:52 -07:00
Chad Pilkey
45ff003941 enforce a maximum paste length in CC window 2016-08-04 11:52:55 -07:00
Chad Pilkey
1c6efa1945 add cc window to other layouts so it doesn't show up when not wanted 2016-08-04 10:30:17 -07:00
Chad Pilkey
35e8ab77a9 add extra logic around cc updates for less frequent updates 2016-08-04 10:29:27 -07:00
Chad Pilkey
82766adb6a fixed issue with the shortcut window not initializing properly 2016-08-04 10:28:16 -07:00
Richard Alam
bbc410d2dd Merge pull request #3258 from jfederico/bbb-web_fix-for-bugs 
bbb-web: Fix for issue #2960
 2016-08-03 17:33:04 -04:00
jfederico
b88328ea4e bbb-web: Removed debugging log used on development 2016-08-03 17:32:10 -04:00
Richard Alam
2f791cb436 Merge pull request #3257 from ritzalam/screenshare-help-page 
Screenshare help page
 2016-08-03 17:21:10 -04:00
Richard Alam
366c6673f6 Screenshare help page 
Help page with link to videos.
 2016-08-03 21:20:05 +00:00
Richard Alam
f1e2040062 Screenshare help page 
Add placeholder for screenshare help page.
 2016-08-03 20:33:56 +00:00
Richard Alam
bfd0e4a9a4 Merge pull request #3256 from ritzalam/fix-screenshare-autoreconnect 
Fix screenshare autoreconnect. Fixes issue #3252
 2016-08-03 16:19:34 -04:00
jfederico
a41646e4c4 bbb-web: Fix for issue #2960 2016-08-03 15:35:20 -04:00
Richard Alam
ed01cd7d28 Cleanup 
Format code properly by fixing indents and line endings.
 2016-08-03 19:14:25 +00:00
Richard Alam
ac6c225791 Screenshare Auto-Reconnect 
Handle auto-reconnect when user is sharing screen and when user is viewing screen.
 2016-08-03 18:50:39 +00:00
Richard Alam
ec608a37ff Cleanup 
Reformat code by running dos2unix.
 2016-08-03 18:49:30 +00:00
Richard Alam
3d0b1b1222 - remove userId attribute on defunct connection when user auto-reconnects. 2016-08-03 18:46:41 +00:00
Richard Alam
2449664001 Merge pull request #3254 from kepstin/bbb-record-core-systemd 
Update bbb-conf for new systemd bbb-record-core jobs
 2016-08-02 17:32:38 -04:00
Richard Alam
9752a0651f Merge pull request #3253 from kepstin/recording-captions 
Recording captions
 2016-08-02 17:32:12 -04:00
Calvin Walton
9e8015512b Update bbb-conf for new systemd bbb-record-core jobs 2016-08-02 17:27:33 -04:00
Calvin Walton
a280a0d0ef RnP: Hack acornmediaplayer to use browser captions 2016-08-02 16:32:11 -04:00
Calvin Walton
dfce828e93 RnP: Add <track> elements for available captions 2016-08-02 15:31:46 -04:00
Calvin Walton
d4380ce012 RnP: Check if the captions.json is available 2016-08-02 15:15:09 -04:00
Calvin Walton
6f1c96b3ff Merge pull request #3251 from bigbluebutton/antobinary-patch-1 
Remove reference to deleted file
 2016-08-02 14:56:13 -04:00
Anton Georgiev
1f23a9ea57 Remove reference to deleted file 2016-08-02 14:54:16 -04:00
Calvin Walton
b589c25831 Fix reference to deleted 'webrtc_deskshare_archiver' 2016-08-02 14:31:20 -04:00
Richard Alam
1081564997 Merge pull request #3249 from riadvice/improve-meeting-retrieval 
Improve meeting retrieval in MeetingService
 2016-08-02 13:28:21 -04:00
Richard Alam
9d21ef4ecf Merge branch 'improve-meeting-retrieval' of https://github.com/riadvice/bigbluebutton into riadvice-improve-meeting-retrieval 2016-08-02 16:59:28 +00:00
Ghazi Triki
962ef49302 Rewritter MeetingService "getMeeting" method to make the difference between normal and breakout rooms. 2016-08-02 17:15:39 +01:00
Ghazi Triki
984717e195 Minor logging improvement into BigBlueButtonActor.scala 2016-08-02 17:14:42 +01:00
Richard Alam
6a68f10a39 Merge branch 'jfederico-bbb-web_fix-configXML' 2016-08-02 15:23:52 +00:00
Richard Alam
8a57a7c75c Merge branch 'bbb-web_fix-configXML' of https://github.com/jfederico/bigbluebutton into jfederico-bbb-web_fix-configXML 2016-08-02 15:19:03 +00:00
Richard Alam
efe02bec62 Merge pull request #3248 from ritzalam/update-jws-jars 
Update jws jars
 2016-08-02 11:13:33 -04:00
Richard Alam
5906a0fc7b Cleanup 
Removed old jar files.
 2016-08-02 15:10:18 +00:00
Richard Alam
61c6a56d13 Update jws ffmpeg lib jars 
Updated ffmpeg lib jars, specifically linux jars as the old ones were broken.
 2016-08-02 15:00:51 +00:00
Calvin Walton
d4e7605f42 RnP: Fix use of deprecated IO#lines in logging functions 2016-08-02 10:58:42 -04:00
Calvin Walton
2b8d7a9858 Merge remote-tracking branch 'origin/master' into recording-captions 2016-08-02 10:49:05 -04:00
Anton Georgiev
bde7f5a313 Merge pull request #3247 from oswaldoacauan/user-kick 
[HTML5] Add handlers for when the current user is kicked
 2016-07-29 16:12:58 -04:00
Oswaldo Acauan
6f9c4219ad Fix typo 2016-07-28 19:57:42 +00:00
Oswaldo Acauan
afe1a66e02 Fix conflicts and merge master 2016-07-28 19:50:44 +00:00
Oswaldo Acauan
da70b92c9d Add missing files 2016-07-28 19:49:16 +00:00
Oswaldo Acauan
b8e4a2692c Add handlers for kick 2016-07-28 19:48:26 +00:00
jfederico
7c0b0a3856 bbb-web: Log error message on invalid 2016-07-28 15:46:44 -04:00
Fred Dixon
efdad7d4ed Merge pull request #3244 from ffdixon/update-bbb-conf 
Updated checks in bbb-conf for https
 2016-07-27 17:41:58 -03:00
Fred Dixon
8dd4810f29 Updated checks in bbb-conf for https 2016-07-27 16:39:31 -04:00