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

386 Commits

Author SHA1 Message Date
Chad Pilkey
c5e0436204 added a 'ready' notification when the client starts up for screen readers 2015-03-18 14:21:01 -07:00
Anton Georgiev
f62fd4ce31 due to this the html5 client was not able to join a voice conf without a flash user already joined 2015-03-05 21:10:27 +00:00
Felipe Cecagno
bb330cf0a2 Merge branch '090-deskshare-window' into mconf-live0.6.2 
Conflicts:
	bigbluebutton-client/resources/prod/layout.xml
	bigbluebutton-client/resources/prod/lib/deployJava.js
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
 2015-03-02 00:25:02 -03:00
Chad Pilkey
815be28d0b Revert "Revert "Added Java check to the configuration notifications"" 
This reverts commit 82545a03f3.
 2015-03-02 00:53:10 +00:00
Chad Pilkey
eb17e4a056 added extra logging information to TURN debugging 2015-02-24 12:15:01 -08:00
Chad Pilkey
4be1b5c2e3 remove disclaimer from bbblogger.js 2015-02-24 11:36:41 -08:00
Chad Pilkey
4336612830 fixed a null error and race condition with the TURN support 2015-02-24 11:36:14 -08:00
Richard Alam
65c35e1137 Merge pull request #520 from bigbluebutton/add-more-info-js-log 
- add more info into JS log
 2015-02-17 19:26:22 -05:00
Chad Pilkey
e6d3cd551d fixed a race condition in the webrtc javascript code, and added cause for error 1004 2015-02-17 16:11:42 -08:00
Richard Alam
931d1624d7 - add more info into JS log 2015-02-18 00:09:10 +00:00
Calvin Walton
1af70d8e4e Use configured stun/turn servers when making webrtc call 2015-02-17 12:00:04 -05:00
Chad Pilkey
d6ef5168c0 add support for webrtc call transferring, cuts join time in half 2015-02-12 14:25:41 -08:00
Felipe Cecagno
fe69560cb1 Merge branch '090-java-detection' into mconf-live0.6.2 2015-02-12 15:51:54 -02:00
Mateus Dalepiane
899a98d3c5 Reverting our Java detection changes 
Since BBB team also improved Java detection, we decided to revert our changes
and use theirs.
 2015-02-05 16:25:40 -02:00
Felipe Cecagno
4b683e9bd1 Merge branch '090-java-detection' into mconf-live0.6.2 2015-02-03 17:08:59 -02:00
Felipe Cecagno
0bd0a8b30b reverted deployJava to the original, and changed a bit bbb_deskshare so the java detection works on Windows as well 2015-02-03 17:08:44 -02:00
Chad Pilkey
19fb9b9671 Revert "Revert "Added Java check to the configuration notifications"" 
This reverts commit 82545a03f3.
 2015-01-27 14:19:02 -08:00
Fred Dixon
82545a03f3 Revert "Added Java check to the configuration notifications" 2015-01-27 17:11:54 -05:00
Chad Pilkey
84d6c5e132 added deskshare help information for Chrome users 2015-01-27 13:54:24 -08:00
Felipe Cecagno
3a89cab752 Merge branch '090-java-detection' into mconf-live0.6.2 2015-01-25 18:20:48 -02:00
Felipe Cecagno
b7130a379f Merge branch '090-java-detection' into HEAD 
Conflicts:
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/resources/prod/BigBlueButton.html
	bigbluebutton-client/resources/prod/lib/bbb_deskshare.js
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml
 2015-01-25 18:19:13 -02:00
Felipe Cecagno
2761c31e52 Merge branch '090-encrypted-recording' into mconf-live0.6.2 
Conflicts:
	bbb-video/build.gradle
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/redis/MeetingMessageHandler.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsListener.java
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/MessageNames.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/locale/de_DE/bbbResources.properties
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/src/org/bigbluebutton/main/views/LoadingBar.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
	bigbluebutton-config/web/index.html
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
	bigbluebutton-web/grails-app/services/org/bigbluebutton/web/services/PresentationService.groovy
 2015-01-21 18:11:56 -02:00
Chad Pilkey
80e58d1ee3 added java check to the configuration notifications 2015-01-21 11:40:55 -08:00
Chad Pilkey
985f08895a removed the unused jssip library 2015-01-15 15:15:30 -08:00
Lucas Zawacki
2bf4b30b10 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-12-17 22:58:06 +00:00
Felipe Cecagno
12f7aacf4b Merge remote-tracking branch 'bigbluebutton/master' into mconf-live0.6.1 
Conflicts:
	bigbluebutton-client/locale/fr_CA/bbbResources.properties
	bigbluebutton-client/resources/config.xml.template
	bigbluebutton-client/src/org/bigbluebutton/main/views/RecordButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/maps/ChatEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/model/ChatConversation.as
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
 2014-12-09 16:52:43 -02:00
Felipe Cecagno
a45bbfb29a Merge branch '090-multinotes' into mconf-live0.6.1 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
	bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
	bigbluebutton-client/resources/prod/layout.xml
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/model/LayoutDefinition.as
 2014-12-02 20:04:23 -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
Felipe Cecagno
a3acb00893 Merge remote-tracking branch 'bigbluebutton/master' into mconf-live0.6.1 
Conflicts:
	bbb-video/build.gradle
	bbb-video/src/main/java/org/bigbluebutton/app/video/VideoApplication.java
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoProxy.as
	bigbluebutton-config/web/default.pdf
 2014-11-22 20:28:39 -02: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
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
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
5a5a3aecc2 Merge branch 'multinotes' into 090-multinotes 
Conflicts:
	bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-apps.xml
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/resources/prod/BigBlueButton.html
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
 2014-10-31 15:01:29 -02:00
Chad Pilkey
b84992c5a0 Stop the webrtc timeout timer when 'connecting' is received 2014-10-30 13:54:35 -07:00
Chad Pilkey
f84ae56e9a added an additional fail case for the WebRTC audio 2014-10-29 09:30:03 -07:00
Felipe Cecagno
0af623e9e7 Merge branch '090-listen-only-by-default' into mconf-live0.6.1 2014-10-24 23:38:09 -02:00
Richard Alam
9552b8a905 - fix https://code.google.com/p/bigbluebutton/issues/detail?id=1776 2014-10-20 23:06:07 -07:00
Chad Pilkey
a8b53f9acc changed webrtc error messages to errorcodes, fixed a bug with webrtc call failing at echo test 2014-10-15 16:17:58 -07:00
Felipe Cecagno
3db4ead6e4 Merge branch '090-listen-only-by-default' into mconf-live0.6.1 
Conflicts:
	bigbluebutton-client/locale/ru_RU/bbbResources.properties
	bigbluebutton-client/src/org/bigbluebutton/main/views/AudioSelectionWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
 2014-10-15 00:22:27 -03:00
Chad Pilkey
de7dbd0b44 Multiple fixes to our webrtc implementation. Hopefully there's less holes now 2014-10-06 14:14:34 -07:00
Felipe Cecagno
59debc5d1e Merge branch '090-mconf-branding' into mconf-live0.6.1 2014-10-05 23:32:43 -03:00
Felipe Cecagno
015d708d7c Merge branch 'mconf-branding-0.81' into 090-mconf-branding 
Used the following command to comment the default copyright label for all languages except en_US
find -name bbbResources.properties | xargs sed -i "s:^\(bbb.mainshell.copyrightLabel2.*\):# \1:g"

Conflicts:
	bigbluebutton-client/resources/prod/MconfLive.html
	bigbluebutton-client/src/BigBlueButton.mxml
	record-and-playback/presentation/playback/presentation/playback.html
 2014-10-05 19:36:43 -03:00
Chad Pilkey
e15de759e3 change the webrtc websocket connection to use an nginx proxy 2014-09-14 13:49:12 -07:00
Chad Pilkey
2c6b060ba5 replace deprecated escape() with encodeURIComponent() 2014-09-09 14:27:03 -07:00
Mateus Dalepiane
6bf36d2d86 Merge branch '081-java-detection' into 090-java-detection 
Conflicts:
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/resources/prod/BigBlueButton.html
	bigbluebutton-client/resources/prod/lib/bbb_deskshare.js
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml
	deskshare/applet/src/main/java/org/bigbluebutton/deskshare/client/DeskShareApplet.java
 2014-09-08 15:06:50 -03:00
syeshchenko
1d148ef624 Merge branch 'master' into chrome-webcam-permission-prompt 2014-09-01 13:18:32 -07:00
syeshchenko
ae6a4d5fa1 on Chrome show webcam permission prompt before webcam preview opened 2014-09-01 13:10:50 -07:00
Richard Alam
1fb4427173 - trye to figure out why voice toolbar button gets stuck in Chrome 2014-08-27 09:16:43 -07:00
Richard Alam
57b7de8b36 - stop sharing from server side instead of destroing the applet from the client side 2014-08-24 12:12:29 -07:00
Richard Alam
4ca73b97d5 Add stun server to get FF to work behind firewall 2014-08-16 13:36:46 -04:00
Richard Alam
c56fde0c42 Merge pull request #348 from speakserve/unify-version-number 
Unify version number
 2014-08-13 14:17:45 -04:00
Ghazi Triki
bb09eb6d75 After checking we bumped projects version and Flex locales to 0.9.0 with some fixes 2014-08-13 12:20:10 +01:00
Ghazi Triki
9a794f854a Bumped projects version and Flex locales to 0.9 2014-08-13 10:28:08 +01:00
Chad Pilkey
e2079cc358 added escape to the username in sipjs user agent 2014-08-11 10:04:02 -07:00
Richard Alam
1994eece36 Merge branch 'switch-to-sipjs' of https://github.com/SenecaCDOT-BigBlueButton/bigbluebutton into switch-to-sipjs 2014-08-09 12:24:35 -07:00
Chad Pilkey
ba6628256a changed a jssip filename to sipjs 2014-08-09 12:46:53 -07:00
Chad Pilkey
20239454bd the sipjs call is successful, added extra states to the echo test window for more feedback 2014-08-09 12:39:37 -07:00
Chad Pilkey
02bb29ae29 sipjs connects to the echo test and stops correctly 2014-08-09 09:38:48 -07:00
Richard Alam
281d9a8efe Merge branch 'switch-to-sipjs' of https://github.com/SenecaCDOT-BigBlueButton/bigbluebutton into switch-to-sipjs 2014-08-09 09:15:26 -07:00
Chad Pilkey
750579e342 the sipjs media request now works 2014-08-08 14:17:28 -07:00
Richard Alam
5bd7b3e793 Merge branch 'switch-to-sipjs' of https://github.com/SenecaCDOT-BigBlueButton/bigbluebutton into switch-to-sipjs 2014-08-08 13:55:03 -07:00
Richard Alam
654c93831e Merge branch 'merge-polling-with-master' into switch-to-sipjs 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
 2014-08-08 13:46:53 -07:00
Chad Pilkey
ac7a688965 swapped jssip for sipjs, cleaned up the webrtc events, changed instances of Rtc to RTC 2014-08-08 13:19:38 -07:00
Ghazi Triki
ac7af7dfea Manually bumped all application version to the correct actual version 0.9.0-dev 2014-07-31 17:42:38 +01:00
Richard Alam
3bf4991eec - try to force FF 31 to display java applet permission bar 2014-07-30 07:48:59 -07:00
Richard Alam
a6dc4f6465 - change how to insert applet div into HTML 2014-07-29 13:16:12 -07:00
Chad Pilkey
5c79202ade reverted jssip back to 0.3.7 and fixed chrome webrtc 2014-07-21 10:25:08 -07:00
Richard Alam
dfbf77aab0 - externalize min jre version required 2014-07-18 08:45:10 -07:00
Chad Pilkey
af6e2b4db3 upgraded jssip to 0.4-devel, skipped the webrtc switch mic notifications 2014-07-11 13:32:04 -07:00
Felipe Cecagno
2fb47f53b3 modified deployJava to embed tags inside a hidden div; also, only embed the test plugin when the user tries to share his desktop 2014-05-19 14:51:34 -03:00
Felipe Cecagno
a8baafc2f7 starting to solve the issue of the javaDeploy plugin creating a blank bar on top of BigBlueButton: uploading the human readable verion of deployJava script 2014-05-19 12:14:52 -03:00
Felipe Cecagno
738162fd5f trying to improve the Java detection using Java Deployment Toolkit Script (http://docs.oracle.com/javase/6/docs/technotes/guides/jweb/deployment_advice.html#deplToolkit); few modifications on DesksharePublishWindow to make it more straightforward 2014-05-16 21:00:18 -03:00
Gustavo Salazar
9a2b05a7ee allow username with spaces 2014-03-24 17:18:39 -05:00
Richard Alam
3b4b818841 i - do echo test and then join voice conference using webrtc 2014-03-14 19:21:21 +00:00
Richard Alam
d869dab51e - start implementing echo test and join conference using webrtc 2014-03-14 16:02:54 +00:00
Gustavo Salazar
8709d7fae8 Update browser versions for webrtc 2014-02-11 11:15:01 -08:00
Gustavo Salazar
edf9518a31 Merge master branch to add style in mic settings. 2014-02-10 11:03:15 -08:00
Gustavo Salazar
ea0c763712 Merged with https://github.com/mconf/bigbluebutton/tree/webrtc_support 2014-02-07 16:56:23 -08:00
Richard Alam
c09636ea4a - handle parameter scale = 1 to do pixel for pixel display when sharing fullscreen 2013-10-22 15:08:11 +00:00
Richard Alam
183148b5eb Revert " - add alert warning when user has old java version when starting desktop sharing." 
This reverts commit 570ea3c6f8.
 2013-10-18 22:12:59 +00:00
Richard Alam
570ea3c6f8 - add alert warning when user has old java version when starting desktop sharing. 2013-10-18 20:54:38 +00:00
Richard Alam
6e5fa16f96 - fix problem where java security dialog pops up due to java 7 update 45 
https://code.google.com/p/bigbluebutton/issues/detail?id=1658
 2013-10-18 19:16:52 +00:00
Felipe Cecagno
f8e63fd6f4 Merge branch 'master' into mconf-branding 
Conflicts:
	bigbluebutton-client/build.xml
	bigbluebutton-client/locale/ar_SY/bbbResources.properties
	bigbluebutton-client/locale/az_AZ/bbbResources.properties
	bigbluebutton-client/locale/bg_BG/bbbResources.properties
	bigbluebutton-client/locale/ca_ES/bbbResources.properties
	bigbluebutton-client/locale/cs_CZ/bbbResources.properties
	bigbluebutton-client/locale/da_DK/bbbResources.properties
	bigbluebutton-client/locale/de_DE/bbbResources.properties
	bigbluebutton-client/locale/el_GR/bbbResources.properties
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/locale/es_ES/bbbResources.properties
	bigbluebutton-client/locale/es_LA/bbbResources.properties
	bigbluebutton-client/locale/et_EE/bbbResources.properties
	bigbluebutton-client/locale/eu_EU/bbbResources.properties
	bigbluebutton-client/locale/fa_IR/bbbResources.properties
	bigbluebutton-client/locale/fi_FI/bbbResources.properties
	bigbluebutton-client/locale/fr_CA/bbbResources.properties
	bigbluebutton-client/locale/fr_FR/bbbResources.properties
	bigbluebutton-client/locale/he_IL/bbbResources.properties
	bigbluebutton-client/locale/hr_HR/bbbResources.properties
	bigbluebutton-client/locale/hu_HU/bbbResources.properties
	bigbluebutton-client/locale/id_ID/bbbResources.properties
	bigbluebutton-client/locale/it_IT/bbbResources.properties
	bigbluebutton-client/locale/ja_JP/bbbResources.properties
	bigbluebutton-client/locale/kk_KZ/bbbResources.properties
	bigbluebutton-client/locale/km_KH/bbbResources.properties
	bigbluebutton-client/locale/ko_KR/bbbResources.properties
	bigbluebutton-client/locale/lt_LT/bbbResources.properties
	bigbluebutton-client/locale/lv_LV/bbbResources.properties
	bigbluebutton-client/locale/mn_MN/bbbResources.properties
	bigbluebutton-client/locale/ne_NE/bbbResources.properties
	bigbluebutton-client/locale/nl_NL/bbbResources.properties
	bigbluebutton-client/locale/no_NO/bbbResources.properties
	bigbluebutton-client/locale/pl_PL/bbbResources.properties
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/locale/pt_PT/bbbResources.properties
	bigbluebutton-client/locale/ro_RO/bbbResources.properties
	bigbluebutton-client/locale/ru_RU/bbbResources.properties
	bigbluebutton-client/locale/si_LK/bbbResources.properties
	bigbluebutton-client/locale/sk_SK/bbbResources.properties
	bigbluebutton-client/locale/sr_RS/bbbResources.properties
	bigbluebutton-client/locale/sv_SE/bbbResources.properties
	bigbluebutton-client/locale/th_TH/bbbResources.properties
	bigbluebutton-client/locale/tr_TR/bbbResources.properties
	bigbluebutton-client/locale/uk_UA/bbbResources.properties
	bigbluebutton-client/locale/vi_VN/bbbResources.properties
	bigbluebutton-client/locale/zh_CN/bbbResources.properties
	bigbluebutton-client/locale/zh_TW/bbbResources.properties
	bigbluebutton-client/resources/prod/MconfLive.html
	bigbluebutton-client/resources/prod/lib/bbb_blinker.js
	bigbluebutton-client/src/BigBlueButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MicSettings.mxml
	bigbluebutton-web/grails-app/conf/bigbluebutton.properties
	record-and-playback/presentation/playback/presentation/playback.html
 2013-08-26 21:26:44 -03:00
Felipe Cecagno
7f991d1346 Merge branch 'master' into sharedNotesNoServer-0.81 
Conflicts:
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
 2013-08-25 23:30:44 -03:00
Chad Pilkey
238544e495 moved the client title prefix to javascript for easier modification 2013-08-19 07:28:33 -07:00
Hugo Lazzari
bcfa02ee48 Implemented sharedNotesNoServer to work with bigbluebutton 0.81 2013-07-15 11:49:46 -03:00
Felipe Cecagno
42cbc0d609 fixed the window blinking title to restore the original title instead of a fixed one 2013-07-02 13:55:10 -03:00
Chad Pilkey
06a279ba2f added meeting title to the client html document title 2013-07-08 09:46:23 -07:00
Chad Pilkey
7bafd045e1 chat notification blinker is removed 2013-07-04 15:21:25 -07:00
Richard Alam
fb23b44e03 - add JS API to querly list of presentations, display a presentation, and delete a presentation 2013-06-11 18:19:35 +00:00
Richard Alam
2bd9794008 - add option in presentation to open external file uplaod window instead of from within flash 2013-05-19 22:51:08 +00:00
Richard Alam
482972a309 - add raise hand JS api 2013-05-31 20:55:12 +00:00
Richard Alam
b2545ee5d7 - pass the avatarURL into some of the events for JS API 2013-05-30 20:01:58 +00:00
Richard Alam
c8f1a89e7a - notify 3rd-party apps when a user has been kicked out passing the userID 2013-05-29 16:06:02 +00:00
Richard Alam
e74bcbb5a4 - start putting avatar into webcam standalone apps 2013-05-25 15:55:13 +00:00
jtrobinson
9c8c679a16 Added separation between global hotkeys and local-to-module hotkeys. Also changed hotkey modifiers to more favourable combinations. 2013-05-23 11:14:50 -07:00
Richard Alam
dfbd64e316 - cleanup presentation upload event names 2013-05-10 16:59:50 +00:00
Markos Calderon
7e7e0e6377 fix for presentation name in JS presentation api 2013-05-09 13:37:07 -05:00
Markos Calderon
7d4a446afb listen js conversion events 2013-05-08 18:17:06 -05:00
Richard Alam
89c73c9951 - start implementing standalone pre-flight check page 2013-04-12 07:47:07 +00:00
Richard Alam
753a79546d - provide JS api to eject user 2013-04-11 20:56:02 +00:00
Chad Pilkey
f79de237de fixed a lot of issues with accessibility 2013-03-01 20:00:33 -05:00
Richard Alam
8189c61909 - add example on how to get dial number and voice bridge from JS API 2013-02-25 15:14:52 +00:00
Richard Alam
f616a8e8ef Merge branch 'master' into add-user-custom-properties 2013-02-20 17:37:19 +00:00
Richard Alam
2f52da172c - example how to access user data from JS 2013-02-20 17:36:20 +00:00
Chad Pilkey
8702b42def Merge remote branch 'upstream/master' into access-hotfix 
Conflicts:
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/resources/config.xml.template
	bigbluebutton-client/src/BigBlueButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/ShortcutHelpWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/viewers/views/ViewersWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
 2013-02-19 13:45:50 -05:00
Richard Alam
37db82c67a - add JS API to query for presenter user id 2013-02-13 17:05:59 +00:00
Richard Alam
b5141883f1 - add sample on how to query the presenter user id 2013-02-13 17:05:05 +00:00
Richard Alam
36e191d3d2 - update BBB JS API 2013-02-14 21:26:08 +00:00
Richard Alam
c871bbd369 - update event name list 2013-02-14 19:58:51 +00:00
Richard Alam
1c7c4c1dd8 - add JS callback for Webcam Stanalone apps to say that they are ready 2013-02-12 21:09:45 +00:00
jtrobinson
a3c5a13433 Pulled in upstream changes; now there's a crazy focus bug. Trying to figure that out. 2013-02-04 18:43:27 +00:00
Markos Calderon
6389cda5e0 updating deskshare applet 2013-01-28 14:01:29 -05:00
Richard Alam
f9fca35577 - add API to tell that SWF is ready for external interface calls 2013-01-14 21:06:49 +00:00
Richard Alam
bc80d55b2a Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2013-01-14 20:29:41 +00:00
Richard Alam
cb3ecd01f3 - add example on how to handle preview and view webcam stream when switching presenter 2013-01-14 20:27:21 +00:00
Richard Alam
9bcac978e5 Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton 2013-01-14 19:04:19 +00:00
Richard Alam
027dccbb6e - add sample how to query if user is publishing cam or not 2013-01-14 19:03:51 +00:00
Richard Alam
4ab5371e0f - add js api to query if user is publishing cam or not 2013-01-14 19:02:05 +00:00
Richard Alam
eaa19d3e98 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2013-01-11 22:28:09 +00:00
Richard Alam
4e0d1cf787 - sample calls to show how to use the api 2013-01-11 22:27:18 +00:00
Richard Alam
d32ccde274 - provide example on how to use get user info api 2013-01-11 16:59:30 +00:00
Richard Alam
fee32ddf7a - provide api to query user info 2013-01-11 16:58:15 +00:00
Chad Pilkey
493696d1f2 Merge remote branch 'origin/master' into access-hotfix 
Conflicts:
	bigbluebutton-client/resources/config.xml.template
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
 2013-01-10 14:36:57 -05:00
Richard Alam
7d6f26826e - try to switch webcam stream when switching presenter 2013-01-09 22:43:30 +00:00
Richard Alam
92d483eae1 - update events from Flash client 2013-01-09 19:43:56 +00:00
jtrobinson
f000b81d22 Starting to refurbish the way hotkeys are handled 2012-12-17 21:50:08 +00:00
Chad Pilkey
02b222625f Merge branch 'master' into access-hotfix 
Conflicts:
	bigbluebutton-client/resources/config.xml.template
	bigbluebutton-client/src/BigBlueButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/model/VideoConfOptions.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/PublishWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/VideoWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videodock/views/VideoDock.mxml
 2012-12-17 15:29:49 -05:00
Richard Alam
d43b7488ce Merge branch 'master' into view-publish-webcam-stanalone 2012-12-14 21:04:06 +00:00
Richard Alam
1dca7b19bf Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton 2012-12-14 21:02:53 +00:00
Richard Alam
7d4f4b849c - show example on how to use webcam standalone apps 2012-12-14 21:02:05 +00:00
Richard Alam
f6ecdcf775 - preview webcam in standalone app 2012-12-14 20:03:30 +00:00
Richard Alam
06bc130895 - implement view webcam standalone 2012-12-14 16:47:30 +00:00
Richard Alam
30911ef181 Merge branch 'master' into view-publish-webcam-stanalone 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/core/EventConstants.as
	bigbluebutton-client/src/org/bigbluebutton/main/api/ExternalApiCallbacks.as
	bigbluebutton-client/src/org/bigbluebutton/main/api/ExternalApiCalls.as
	bigbluebutton-client/src/org/bigbluebutton/main/api/maps/ExternalApiEventMap.mxml
 2012-12-14 16:17:32 +00:00
Richard Alam
2a8f3b7e55 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2012-12-14 15:32:51 +00:00
Richard Alam
25d46134bb - add example API to query if user is presenter 2012-12-14 15:32:08 +00:00
Richard Alam
46b54043c1 - add API to query if user is presenter 2012-12-14 15:31:21 +00:00
Richard Alam
9d2277d214 Merge branch 'master' into view-publish-webcam-stanalone 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/api/ExternalApiCallbacks.as
 2012-12-12 20:06:55 +00:00
Richard Alam
9967668158 - add apis to switch presenter, stop webcam, and leave voice conf 2012-12-12 19:33:33 +00:00
Richard Alam
73906c0acd - add sample api calls for switch presenter, stop sharing cam, and leave voice conf 2012-12-12 19:21:09 +00:00
Richard Alam
b3b03ba9ab - add JS API to preview and view camera 2012-12-11 21:54:51 +00:00
Richard Alam
f4ff05856a - add JS api to share webcam 2012-12-03 21:23:29 +00:00
Chad Pilkey
b4cb759797 Better descriptions for rest of whiteboard buttons. Added button to focus into the flash content. 2012-11-28 11:04:26 -05:00
Chad Pilkey
38dd3dc427 added better accessibility names for some of the whiteboard toolbar 2012-11-23 18:04:17 -05:00
Richard Alam
5ca6267e69 Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton 2012-11-21 19:12:22 +00:00
Richard Alam
65c835a761 - add listener for voice mute, join/leave, and locked 2012-11-21 19:10:46 +00:00
Richard Alam
c63b312d55 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2012-11-20 20:22:32 +00:00
Richard Alam
200d770b4f - add JS api to query user id 2012-11-20 20:20:12 +00:00
Richard Alam
e67465afc7 - add JS api to query user's id 2012-11-20 19:58:47 +00:00
Richard Alam
787e1de310 - pass external meeting id to the client and provide JS api to query it 2012-11-20 19:30:08 +00:00
Richard Alam
fa35d4bfca - add sample to query meeting id 2012-11-20 19:27:23 +00:00
Richard Alam
bb20a2a7f9 Merge branch 'send-receive-chat-from-js-api' of github.com:bigbluebutton/bigbluebutton into send-receive-chat-from-js-api 2012-11-01 19:38:11 +00:00
Richard Alam
7f8d4f5df5 - add a way to lock unlock layout from JS API 2012-11-01 19:37:34 +00:00
Richard Alam
3265e6c2a1 - add example in 3rd party html to lock unlock layout 2012-11-01 18:45:51 +00:00
Richard Alam
9ab215e98e - setup dir structure 2012-10-24 22:08:58 +00:00
Richard Alam
258175545b - add more structure 2012-10-24 21:27:44 +00:00
Richard Alam
d05c7090fa - add underscore JS lib 2012-10-24 21:09:21 +00:00
Richard Alam
97cb44293a Merge branch 'send-receive-chat-from-js-api' of github.com:bigbluebutton/bigbluebutton into send-receive-chat-from-js-api 2012-10-24 19:58:55 +00:00
Richard Alam
3cce928ebc - add backbone.js lib 2012-10-24 19:58:33 +00:00
Richard Alam
3879cc446c - register for event listeners on load 2012-10-24 19:28:24 +00:00
Richard Alam
1639c624ca - don't need userid when sending chat thru JS as we can determine the userid from within flash 2012-10-24 19:07:33 +00:00
Richard Alam
b40a05b904 - add echo private message to test sending of private message from JS api 2012-10-18 20:32:20 +00:00
Richard Alam
87fe30e30b - add hook to send public chat message from JS 2012-10-18 20:17:51 +00:00
Richard Alam
65ce77f911 - add JS API to switch layout 2012-10-18 14:17:12 +00:00
Felipe Cecagno
2cd83eb0e6 Merge commit 'v0.8' into sharedNotes 2012-10-17 14:59:32 -03:00
Richard Alam
8f84fd2eef - add mute/unmute all 2012-10-05 21:07:22 +00:00
Richard Alam
8e9475ecfd - add muteme/unmuteme api 2012-10-05 20:54:45 +00:00
Richard Alam
1dabeca677 - rename bbb_sdk.js to reflects it's an api bridge between js and flash 
- rename event to reflect it's a request to share camera
 2012-10-05 18:27:17 +00:00
Richard Alam
43f2524d0f - provide a way to query user's role 2012-10-04 21:24:10 +00:00
Richard Alam
bb024cb971 - add example 3rd-party.js to interact with BBB through JS api 2012-10-04 19:46:23 +00:00
Richard Alam
0303e01828 - fix problem where we are not notifying the listeners of events 2012-10-04 14:55:55 +00:00
Richard Alam
64724c4104 - setup bbb-sdk so that 3rd-party js can interact with BBB 2012-10-03 19:55:36 +00:00
Hugo Lazzari
996699078e Feature #431 new url and favicon. 2012-10-02 11:55:36 -03:00
Richard Alam
8e967a9797 - add hook to start webcam 2012-09-27 14:30:35 +00:00
Richard Alam
870bd93013 - move bbb-api-bridge into it's onwn js file 
- rename the api method names
 - cleanup
 2012-09-12 16:00:38 +00:00
Richard Alam
76f94df0a1 - creating JS hooks 2012-08-21 22:02:24 +00:00
Richard Alam
e04da4042a Merge remote branch 'rsippl/deskshare-improvements' into merge-svc2-deskshare 
Conflicts:
	bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.8.jar
	deskshare/applet/src/main/java/org/bigbluebutton/deskshare/client/net/NetworkHttpStreamSender.java
 2012-08-17 19:21:34 +00:00
jtrobinson
5530863201 Audio notifications cleaned up; ctrl-shift-r added to navigate to latest read message 2012-08-10 21:01:54 +00:00
jtrobinson
8c6de25d40 JAWS/IE and NVDA/Firefox combinations now use ARIA alerts to deliver audio chat notifications. Nothing cooperates with Chrome. 2012-08-09 20:10:46 +00:00
jtrobinson
082e57c565 Trying to back up Chat Module changes 2012-08-09 18:14:20 +00:00
Ralf Sippl
68bf9f027b added SVC2 (Screen Video V2) support to deskshare 2012-07-16 23:01:49 +02:00
Richard Alam
d4b1c41298 - updating deskshare applet filename to 0.8 2012-06-05 21:09:37 +00:00
Felipe Cecagno
334ed6db81 Merge branch 'master' into sharedNotes0.8 
Conflicts:
	bigbluebutton-apps/build.gradle
	bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-apps.xml
	bigbluebutton-client/build.xml
	bigbluebutton-client/html-template/index.template.html
	bigbluebutton-client/html-template/sharednotes/diff_match_patch_uncompressed.js
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/resources/config.xml.template
	bigbluebutton-client/resources/prod/BigBlueButton.html
	bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/infrastructure/ServerConnection.as
 2012-02-17 14:04:31 -02:00
Richard Alam
ce49090bd0 - make deskshare port configurable 2012-01-18 16:04:53 +00:00
Fred Dixon
743dd51f5c Reduced height of deskshare applet iframe from 400 to 1 2011-10-07 13:39:38 -07:00
Richard Alam
5ae3ec24d7 modify BigBlueButton.html to use swfobject. 2011-09-22 16:48:49 -04:00