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

13062 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jfederico
d29dd62801 bbb-lti: Removed non-used plugins 2016-08-22 17:23:45 -04:00
jfederico
6e4ea31268 bbb-lti: Parameters not required for the integration are not send to BBB 2016-08-22 17:22:00 -04:00
jfederico
e1b9ff3ed6 bbb-lti: Fixed issue with a g tag in main.gsp 2016-08-22 16:26:33 -04:00
jfederico
8e95d4498f bbb-lti: CC descriptor now gives a URL for accessing icon as an asset 2016-08-22 16:20:33 -04:00
jfederico
fb5cb27457 bbb-icon: Replaced old icons with new multi-size icon 2016-08-22 16:15:59 -04:00
jfederico
e7d710bf39 bbb-tool: Restored icon.ico 2016-08-22 16:00:37 -04:00
jfederico
4e08fd26ec bbb-tool: Changed the way the assets are rendered 2016-08-22 15:44:24 -04:00
jfederico
3b47072448 bbb-lti: Relocated assets 2016-08-22 15:17:57 -04:00
jfederico
0c697d06c8 bbb-lti: Updated grails to 2.5.2 2016-08-19 17:08:05 -04:00
Richard Alam
65605ee3f9 Merge pull request #3296 from ritzalam/start-pause-stop-screen-sharing-with-webrtc 
Stop JWS when flash client dies.
 2016-08-19 11:23:56 -04:00
Richard Alam
a82fcd7f7c - end jws when exception occurs 2016-08-19 15:20:04 +00:00
Richard Alam
8e6d7a0274 - remove dialog when jws stops 2016-08-19 15:19:32 +00:00
Richard Alam
46a7723f68 - remove commented out code. 2016-08-19 15:19:09 +00:00
Richard Alam
f42af1565a - stop jws when client crashes. 2016-08-19 15:05:57 +00:00
Richard Alam
c02170f377 - handle timeout when querying screen sharing session. 2016-08-18 21:34:57 +00:00
Richard Alam
b591106aaa - try to detect if the flash client and the jws app are still alive. If one of them 
if dead, end screen sharing.
 2016-08-18 19:49:32 +00:00
Richard Alam
86062ddd4d Merge pull request #3295 from capilkey/cc-message-check 
More closed captioning improvements
 2016-08-18 12:52:44 -04:00
Chad Pilkey
8707a1e44a comment out excessive cc logging 2016-08-18 09:46:04 -07:00
Chad Pilkey
bf7934eb60 fix bug with private chat opening key press detection 2016-08-18 09:43:36 -07:00
Chad Pilkey
602ce706c2 change cc language select from combobox to list 2016-08-18 09:42:58 -07:00
Chad Pilkey
a958739216 switch cc transcript len checks to internal UITextField 2016-08-18 09:41:07 -07:00
Richard Alam
34d8e2fbb3 Merge pull request #3294 from riadvice/breakout-room-logout-fix 
Fix for breakout room logout issue
 2016-08-18 11:55:58 -04:00
Ghazi Triki
6b93bd3130 Block user from joining any breakout room until all of them are created. 2016-08-18 15:12:57 +01:00
Ghazi Triki
9e32890d1b Postpone sending breakout rooms invitations to after all breakout rooms are successfully created. 2016-08-18 08:03:34 +01:00
Richard Alam
10c10ba455 Merge pull request #3293 from ritzalam/start-pause-stop-screen-sharing-with-webrtc 
Allow pausing and resuming of screen sharing
 2016-08-17 18:16:44 -04:00
Richard Alam
8103162d61 - try to handle getting disconnected. 2016-08-17 21:51:35 +00:00
Richard Alam
76e7e6d568 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into start-pause-stop-screen-sharing-with-webrtc 2016-08-17 18:44:49 +00:00
Richard Alam
1da50feb5e - cleanup 2016-08-17 18:44:08 +00:00
Richard Alam
6aab83589a Merge branch 'screenshare-1.1' of https://github.com/antobinary/bigbluebutton into antobinary-screenshare-1.1 
Conflicts:
	bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/ScreenShareApplication.scala
	bbb-screenshare/app/src/main/scala/org/bigbluebutton/app/screenshare/server/sessions/Screenshare.scala
	bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/services/MessageReceiver.as
 2016-08-17 18:40:28 +00:00
Richard Alam
dd774fabeb - add some comments. 2016-08-17 14:55:51 +00:00
Richard Alam
cc80f1c2ff - trigger starting of screen capture from the server side. 2016-08-16 21:01:41 +00:00
Richard Alam
080a3557c3 - stop jws when user that's sharing gets disconnected 2016-08-16 20:21:29 +00:00
Richard Alam
59d192ee62 - make sure there is only one screen sharing in a meeting. 2016-08-16 17:18:21 +00:00
Richard Alam
12a383cb9d - close jws app when sharing is cancelled (not started) 2016-08-15 21:50:38 +00:00
Richard Alam
9945cb7c5b - stop sharing from the screen share toolbar button. 2016-08-15 20:56:29 +00:00
Anton Georgiev
4f4f2a71ef Merge pull request #3290 from oswaldoacauan/fix-3277 
Change operation order when switching slides. Fix #3277
 2016-08-15 16:25:05 -04:00
Oswaldo Acauan
5489090672 Merge branch 'master' into fix-3277 
* master:
  Archive more logs with zip option and show more applications with status using "bbb-conf"
  When is user is logged out from the breakout room conference the window is closed.
  RoomActionsRenderer listenBtn style is correctly updated when the leaves audio conference then joins it again.
  Don't appy recording marks twice to audio
  RnP: Use correct directory when loading captions.json
  Minor playback.js cleanups
  Various updates to the rnp edl handling
  Make shape rendering in presentation recordings closer to live BBB
  hide the randomAssign button (temporarily)
  server side changes for switching recordType:String to record:Boolean
  breakout rooms:change record to checkbox + boolean
  Ensure invalid CC messages aren't sent to the server after owner change
  bbb-web: Set defaultMaxUsers=0 in bigbluebutton.properties
  RnP: Generate blank video when the recording has captions
 2016-08-15 19:26:33 +00:00
Oswaldo Acauan
e5c29a9bec Change operations order to prevent currentSlide being undefined 2016-08-15 19:25:36 +00:00
Richard Alam
9c7759dc73 - display screen share stream 2016-08-15 18:25:56 +00:00
Richard Alam
c3a3bd89bf - generate new streamId from server side when restarting screen sharing. 2016-08-15 17:56:49 +00:00
Fred Dixon
938e6a0313 Merge pull request #3285 from riadvice/breakout-room-logout 
Close browser window in breakout rooms logout
 2016-08-15 11:01:32 -04:00
Fred Dixon
0a65d564c3 Merge pull request #3276 from capilkey/cc-message-check 
Ensure invalid CC messages aren't sent to the server after owner change
 2016-08-15 10:57:54 -04:00
Fred Dixon
27861597fa Merge pull request #3288 from riadvice/improve-bbb-conf 
Updated zip and status option for bbb-conf to handle 1.1-dev applications
 2016-08-15 10:57:04 -04:00
Ghazi Triki
f04798405a Archive more logs with zip option and show more applications with status using "bbb-conf" 2016-08-15 11:41:02 +01:00
Ghazi Triki
f0a6223dcc When is user is logged out from the breakout room conference the window is closed. 2016-08-13 20:02:50 +01:00
Fred Dixon
a4af989e45 Merge pull request #3284 from riadvice/fix-breakout-room-audio-transfer 
RoomActionsRenderer listenBtn style is correctly updated
 2016-08-13 11:32:10 -04:00
Ghazi Triki
0fc895b8f7 RoomActionsRenderer listenBtn style is correctly updated when the leaves audio conference then joins it again. 2016-08-13 16:28:54 +01:00
Fred Dixon
8f5173710d Merge pull request #3283 from kepstin/recording-cleanups 
Recording cleanups
 2016-08-12 16:19:39 -04:00
Calvin Walton
ab0dac1192 Don't appy recording marks twice to audio 2016-08-12 15:53:56 -04:00
Fred Dixon
f46e4d7ca6 Merge pull request #3282 from kepstin/recording-captions 
RnP: Use correct directory when loading captions.json
 2016-08-12 15:43:29 -04:00