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

3774 Commits

Author SHA1 Message Date
Anton Georgiev
7e3c2f6eb0 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into meteor-ui-less 2014-12-15 20:11:49 +00:00
Chad Pilkey
8b7d0ddb24 font size in config, and two bugs with private chat squashed 2014-12-11 13:16:38 -08:00
Chad Pilkey
716d1f974b taking another shot at fixing the chat list stack overflow 2014-12-10 16:40:38 -08:00
Chad Pilkey
2b78ed2c09 reworked the layout pushing so that viewers don't get new rows 2014-12-10 11:17:33 -08:00
Chad Pilkey
0a1c74ce07 Merge remote-tracking branch 'upstream/master' into add-chat-fontsize-config 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/services/ChatMessageService.as
 2014-12-08 13:11:34 -08:00
Chad Pilkey
c96e78d829 chat scrolling should be more robust and not rely on events firing 2014-12-08 13:07:40 -08:00
Richard Alam
5667ea4156 - update locales from transifex 2014-12-05 11:05:42 -08:00
Richard Alam
3e4f2d930a Merge pull request #457 from SenecaCDOT-BigBlueButton/fix-chat-scrolling 
Rewrote chat scrolling so that it always scrolls as far down as possible
 2014-12-04 17:46:28 -05:00
Chad Pilkey
f12ac62a47 rewrote chat scrolling so that it always scrolls as far down as possible 2014-12-04 14:39:21 -08:00
Richard Alam
878c81d04b Merge pull request #456 from mconf/fix-client-warnings 
Handle mxmlc warnings
 2014-12-03 15:18:47 -05:00
Felipe Cecagno
afdf4d5f4f few tweaks to handle the warnings during the compilation of bigbluebutton-client 2014-12-03 16:57:39 -02:00
Richard Alam
0b1678cfd1 - fix issue https://code.google.com/p/bigbluebutton/issues/detail?id=1830 2014-12-02 10:54:21 -08:00
Richard Alam
d300b52fba Merge pull request #454 from SenecaCDOT-BigBlueButton/fix-presentation-mouseup 
Moved the whiteboard mouseup listener to the stage
 2014-12-01 18:25:18 -05:00
Chad Pilkey
5cdedb19b1 moved the whiteboard mouseup listener to the stage 2014-12-01 12:48:17 -08:00
Richard Alam
862bf0df0c Merge pull request #452 from SenecaCDOT-BigBlueButton/preload-slides 
Add the ability to preload slides
 2014-12-01 15:07:30 -05:00
Chad Pilkey
7774ac049d added a feature to pre-download the next 3 slides 2014-12-01 11:00:49 -08:00
Chad Pilkey
2bc0901ad9 added a missing variable type declaration 2014-12-01 10:59:09 -08:00
Richard Alam
630541abe2 Merge pull request #450 from mconf/fix1835 
Fix #1835
 2014-12-01 12:08:31 -05:00
Anton Georgiev
4172537f24 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into meteor-merge-with-m 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatMessageListener.java
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
	bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-voice-app.xml
 2014-11-28 20:33:11 +00:00
Richard Alam
681c4a045e - disallow desktop sharing on Macs when using Chrome 38 and earlier 2014-11-27 14:45:30 -08:00
Richard Alam
73172a8336 - allow desktop sharing on Mac when using at least Chrome 38 2014-11-27 14:34:03 -08:00
Felipe Cecagno
af74d36576 if phone.skipCheck and the browser doesn't support webrtc, we have to setup the default microphone in order to enable the user to share 2014-11-27 18:24:26 -02:00
Chad Pilkey
f5e6adcd9e Merge pull request #415 from mconf/fix-record-tooltip 
Fix the record button tooltip when the locale is changed
 2014-11-27 13:14:23 -05:00
Chad Pilkey
acde1ef3ed Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into remove-chat-translation 2014-11-26 09:14:18 -08:00
Richard Alam
864143253b Merge pull request #441 from mconf/record-notification-config 
Recording notification configurable by the config.xml
 2014-11-26 10:06:21 -05:00
Chad Pilkey
fe09c20911 fixed a null reference in WebRTCCallManager 2014-11-25 15:39:50 -08:00
Chad Pilkey
5cbb059aa6 removed all of the old google translate code in apps and client 2014-11-25 15:17:06 -08:00
Felipe Cecagno
93352a7ea4 make the recording notification alert configurable by the config.xml 
the notification shows up to remind the moderator to click the record button and start the recording
 2014-11-25 17:50:11 -02:00
Anton Georgiev
5b06e60d0f Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2014-11-17 21:36:27 +00:00
Felipe Cecagno
08e521ed9f improved the client check so now it uses sip.js and bbb_webrtc_bridge_sip.js from the bigbluebutton-client, so it's going to be easier to maintain; included some new callbacks on bigbluebutton-client related to the websockets; just after the webrtc test, the connection is closed 2014-11-16 19:53:37 -02:00
Lucas Zawacki
7d401dab53 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into merge-with-tests 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	bigbluebutton-web/grails-app/services/org/bigbluebutton/web/services/PresentationService.groovy
 2014-11-14 15:33:17 -02:00
Richard Alam
ee4e5f1a47 Merge branch 'master' into upgrade-to-red5-nov-4-2014 2014-11-14 03:49:14 -08:00
Chad Pilkey
f78b234d0a Updated defaultLayout to match the localized key 2014-11-12 15:17:16 -05:00
Richard Alam
c30604bb3f Merge branch 'investigate-ping-pong-timers' into upgrade-to-red5-nov-4-2014 2014-11-12 10:59:12 -08:00
Chad Pilkey
e2f71bec3a changed two of the layout names 2014-11-11 11:29:34 -08:00
Lucas Zawacki
a54348a908 Use hostname instead of host on javascript webrtc bridge client code 
This prevents it from appending the port number when a request is made from
the HTML5 client
 2014-11-11 16:42:45 -02:00
Chad Pilkey
a23cd2a7c9 added translation of the default layout definitions 2014-11-11 10:26:10 -08:00
Chad Pilkey
3b34e53efe Reenable the LayoutChangeEvent 2014-11-11 09:53:54 -08:00
Chad Pilkey
ffae6e2f20 added a SDP hack for Firefox to replace the 0.0.0.0 in the c line 2014-11-11 03:52:11 -08:00
Richard Alam
000ddbd9d7 - add more logging about the connection to red5 2014-11-07 22:09:49 +00:00
Chad Pilkey
65b820966d Changed the wording of the webrtc messages to make them easier to understand 2014-11-07 14:07:42 -08:00
Chad Pilkey
6f82dd9378 added a check to make sure that ICE negotiation has finished before showing that the call has been accepted in the UI 2014-11-06 10:35:03 -08:00
Felipe Cecagno
eb77644841 fix the record button tooltip when the locale is changed 2014-11-05 18:52:42 -02:00
Richard Alam
4f6362168c Merge pull request #414 from SenecaCDOT-BigBlueButton/additional-timeout-case 
Stop the webrtc timeout timer when 'connecting' is received
 2014-10-30 16:57:52 -04:00
Chad Pilkey
b84992c5a0 Stop the webrtc timeout timer when 'connecting' is received 2014-10-30 13:54:35 -07:00
Richard Alam
c82f467f0f Merge pull request #413 from SenecaCDOT-BigBlueButton/ice-failed-case 
added an additional fail case for the WebRTC audio
 2014-10-29 18:21:31 -04:00
Richard Alam
e4868682e0 - update locales 2014-10-29 22:20:11 +00:00
Chad Pilkey
f84ae56e9a added an additional fail case for the WebRTC audio 2014-10-29 09:30:03 -07:00
Richard Alam
c3b0ba1353 - fix https://code.google.com/p/bigbluebutton/issues/detail?id=1692 2014-10-24 21:31:22 +00:00
Richard Alam
0c42c1371c - new signed applet valid until oct 30, 2015 2014-10-23 19:55:43 +00:00