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

13197 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oleksandr Zhurbenko
ab975cd9b7 Changed update to upsert for the cursor updates 2016-08-20 20:30:38 -07:00
Oleksandr Zhurbenko
576a8b287f Added a check for cursor data 
Since it is undefined sometimes
 2016-08-20 19:59:32 -07:00
Oleksandr Zhurbenko
da70d2cd89 Changed CC's split limit to 1,000 characters 2016-08-20 19:57:28 -07:00
Oleksandr Zhurbenko
d9ddbfbda6 Cleanup, linting, fixed css modules' imports 2016-08-20 18:14:12 -07:00
Oleksandr Zhurbenko
f64ed1fd4a Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into closed-captioning 2016-08-20 16:37:11 -07:00
Oleksandr Zhurbenko
ad5121106f Meteor 1.4.1 2016-08-20 16:28:03 -07:00
Richard Alam
8f110c74a4 - try to fix issue where sharing doesn't stop when paused and jws crashes 2016-08-20 21:42:32 +00:00
Richard Alam
82f943b783 Merge pull request #3301 from ritzalam/start-pause-stop-screen-sharing-with-webrtc 
- make late joiner view screen share stream
 2016-08-20 15:18:56 -04:00
Richard Alam
5ccdbb085b - make late joiner view screen share stream 2016-08-20 19:17:54 +00:00
Richard Alam
caac6ea672 Merge pull request #3300 from ritzalam/start-pause-stop-screen-sharing-with-webrtc 
- start, pause, stop screen sharing properly
 2016-08-20 13:58:29 -04:00
Richard Alam
050ecee572 - start, pause, stop screen sharing properly 2016-08-20 17:56:01 +00:00
Oleksandr Zhurbenko
993b7d2ca2 Added handling for edit_caption_history_message 2016-08-19 21:25:43 -07:00
Oleksandr Zhurbenko
df9b79e52d Fixed a bug with collapsing whitespaces 2016-08-19 21:23:46 -07:00
Fred Dixon
47be7707e3 Merge pull request #3297 from jfederico/bbb-lti_update-grails 
bbb-lti: Updated grails to 2.5.2
 2016-08-19 17:24:25 -04:00
Jaeeun Cho
47f1447bc4 Dropdown with dropdown_v2 branch 2016-08-19 17:20:17 -04:00
Lajellu
19ff007adb Changes logger to NPM package. Makes RedisPubSub and logger run after Meteor.startup 2016-08-19 14:08:46 -07:00
jfederico
0c697d06c8 bbb-lti: Updated grails to 2.5.2 2016-08-19 17:08:05 -04:00
Lajellu
dedaa4e7aa Merge remote-tracking branch 'upstream/master' into config-organization 2016-08-19 13:50:14 -07: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
Jaeeun Cho
8a32f61f2f Dropdown with dropdown_v2 branch 2016-08-17 16:03:22 -04: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
Lajellu
8e7b1d6317 HTML5 - Changes config organization and all files dependant on config files 2016-08-17 08:48:03 -07: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
Jaeeun Cho
7ac2a83575 Dropdown with dropdown_v2 branch 2016-08-15 15:44:20 -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