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 |
|
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 |
|
Richard Alam
|
0c42c1371c
|
- new signed applet valid until oct 30, 2015
|
2014-10-23 19:55:43 +00: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 |
|
Chad Pilkey
|
7d9b26912e
|
Merge remote-tracking branch 'upstream/master' into fix-no-presentation-problems
Conflicts:
bigbluebutton-client/resources/prod/BigBlueButton.html
|
2014-10-06 15:09:36 -07:00 |
|
Chad Pilkey
|
de7dbd0b44
|
Multiple fixes to our webrtc implementation. Hopefully there's less holes now
|
2014-10-06 14:14:34 -07:00 |
|
Fred Dixon
|
b4d49a0f2b
|
Added build numbers into loading JS libraries to ensure they don't get cached
|
2014-09-17 17:38:19 -04:00 |
|
Richard Alam
|
90bf3ade5d
|
- new jars with better controls for deskshare applet dragging and resizing
|
2014-09-17 10:33:17 -07: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 |
|
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 |
|
Mateus Dalepiane
|
cbb4a167bb
|
Merge remote-tracking branch 'origin/new-videodock' into 090-new-videodock
Conflicts:
bigbluebutton-client/branding/default/style/css/BBBDefault.css
bigbluebutton-client/src/BigBlueButton.mxml
bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/AvatarWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarPopupButton.mxml
|
2014-08-26 17:20:00 -03:00 |
|
Richard Alam
|
3c28f36786
|
- initiate closing of applet from server side
|
2014-08-24 13:04:08 -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
|
e9b5e5552d
|
- update applet
- add logging of session id when user disconnects from Red5
|
2014-08-13 12:57:37 -07: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 |
|
Chad Pilkey
|
4962e8e208
|
removed the speed indicator from mxml, styled the layout selector, changed the default layout from 'Default' to 'Default Layout'
|
2014-08-10 20:22:23 -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
|
0daff8a8d4
|
- deskshare applet where min jre version is passed from html page
|
2014-07-18 08:45:59 -07:00 |
|
Richard Alam
|
dfbf77aab0
|
- externalize min jre version required
|
2014-07-18 08:45:10 -07:00 |
|
Richard Alam
|
af3e7875ee
|
- deskshare applet that support 1.7.0_51 and up
|
2014-07-18 07:54:28 -07:00 |
|
Richard Alam
|
cbd12a5f5c
|
Merge pull request #342 from SenecaCDOT-BigBlueButton/fix-audio-prompts-chrome36
upgraded jssip to 0.4-devel, skipped the webrtc switch mic notifications
|
2014-07-11 17:24:09 -04:00 |
|
Chad Pilkey
|
af6e2b4db3
|
upgraded jssip to 0.4-devel, skipped the webrtc switch mic notifications
|
2014-07-11 13:32:04 -07:00 |
|
Richard Alam
|
d2196d4adb
|
- sign applet that support java 8
|
2014-07-11 12:41:27 -07:00 |
|
Gustavo Salazar
|
9a2b05a7ee
|
allow username with spaces
|
2014-03-24 17:18:39 -05:00 |
|
Richard Alam
|
bb5db33eac
|
- implement user joining voice using webrtc
|
2014-03-17 19:47:45 +00: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 |
|
Felipe Cecagno
|
79e513b38f
|
Merge branch 'v0.81-release' of https://github.com/bigbluebutton/bigbluebutton into video-profiles
Conflicts:
bigbluebutton-client/branding/default/style/css/BBBDefault.css
bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/PublishWindow.mxml
|
2014-03-12 21:58:15 -03:00 |
|
Richard Alam
|
ac111de364
|
Merge remote branch 'bbb/v0.81-javau51-update' into merge-java-7u51-branch
|
2014-02-19 20:09:56 +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
|
d3d259527e
|
- update to java 7u51
|
2014-01-16 20:58:39 -05:00 |
|
Richard Alam
|
a961161605
|
- sign with new certificate that expires in 2014
|
2013-10-30 12:40:08 -07:00 |
|
Richard Alam
|
e56a868c0e
|
- update client with deskshare applet with latest fixes
|
2013-10-22 21:11:11 +00: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
|
c30a8c495f
|
- change java version dialog title
|
2013-10-20 20:18:32 +00:00 |
|
Richard Alam
|
a08790fa52
|
- center the java version error message dialog
|
2013-10-20 18:22:13 +00:00 |
|
Richard Alam
|
87c5c41432
|
- change applet display version to 0.81
|
2013-10-20 17:53:12 +00:00 |
|
Richard Alam
|
95ed553f86
|
- add version check on applet. Don't allow sharing of screen when java version
is lower than 1.7.0_45
|
2013-10-20 17:09:06 +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 |
|
Gustavo
|
0f041c248c
|
show Welsh in the client interface
|
2013-10-09 20:29:50 +00:00 |
|
Chad Pilkey
|
238544e495
|
moved the client title prefix to javascript for easier modification
|
2013-08-19 07:28:33 -07:00 |
|
Felipe Cecagno
|
371243dbe6
|
Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton into video-profiles
Conflicts:
bigbluebutton-client/branding/default/style/css/BBBDefault.css
bigbluebutton-client/src/BigBlueButton.mxml
bigbluebutton-client/src/org/bigbluebutton/main/api/ExternalApiCallbacks.as
bigbluebutton-client/src/org/bigbluebutton/main/api/ExternalApiCalls.as
bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/PublishWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/VideoWindow.mxml
|
2013-06-28 16:09:11 -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 |
|
Markos Calderon
|
d9d044f227
|
update localization files
|
2013-06-04 14:11:30 -05: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
|
20c39ea109
|
- upgrade to the applet with fix for java block popup when stopping deskshare
- generate an unsigned applet so other can sign using their own cert
|
2013-05-16 20:10:33 +00:00 |
|
Richard Alam
|
71eedbe1fb
|
- display webcam standalone properly maintaining aspect ratio
|
2013-05-13 18:45:50 +00:00 |
|
Fred Dixon
|
630ec92d84
|
Layout fix for issue https://code.google.com/p/bigbluebutton/issues/detail?id=1498
|
2013-05-12 16:41:08 -07:00 |
|
Richard Alam
|
dfbd64e316
|
- cleanup presentation upload event names
|
2013-05-10 16:59:50 +00:00 |
|
Markos Calderon
|
da3cc3b5b5
|
fix for java showing security warning when closing desktopsharing
|
2013-05-09 17:30:12 -05: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 |
|
Markos Calderon
|
889aa4ef90
|
initial changes for third party page
|
2013-05-07 13:05:35 -05:00 |
|
Felipe Cecagno
|
99d6d959f9
|
Implementation done during the 2nd BigBlueButton Hackfest on April 2013; implemented the concept of video profiles - the sysadmin can specify in a XML file the video profiles that the users will use to broadcast video; it includes width, height, key interval, fps, enableH264 among other parameters; a hack was done to enable the user subscribe to a different profile than the one that is being broadcasted - on the server-side there will be a transcoder component that will handle this kind of subscription
|
2013-04-28 18:18:17 -04:00 |
|
Felipe Cecagno
|
7ad5b359dc
|
adding minWidth to the current default layouts
|
2013-04-25 18:16:14 -03:00 |
|
Richard Alam
|
dcea68de29
|
- try checking for desktop sharing port
|
2013-04-19 21:30:54 +00:00 |
|
Richard Alam
|
2f30fd4485
|
- check if user can connect using RTMP or RTMPT
|
2013-04-17 21:47:12 +00:00 |
|
Richard Alam
|
8986c4b0ef
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
|
2013-04-17 18:37:35 +00:00 |
|
Richard Alam
|
344e87a548
|
- try to figure out best way to test for cam
|
2013-04-17 18:36:43 +00:00 |
|
Fred Dixon
|
d61f83248c
|
Further simplified default layout.xml by commenting out the Users layout as it appears the same as default layout
|
2013-04-17 11:17:49 -07:00 |
|
Fred Dixon
|
b58a7a0028
|
Simplified the choices in layout.xml
|
2013-04-16 19:35:11 -07:00 |
|
Richard Alam
|
dc69530bf0
|
- start add cam check
|
2013-04-16 21:17:00 +00:00 |
|
Richard Alam
|
3481b80230
|
- check for microphone
|
2013-04-16 15:42:31 +00:00 |
|
Richard Alam
|
0f98d922bf
|
- add some checks for java
|
2013-04-12 10:08:48 +00:00 |
|
Richard Alam
|
e5887fe1b8
|
- start adding checks
|
2013-04-12 09:36:21 +00: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 |
|
Markos Calderon
|
d7308bb0ab
|
added hebrew language
|
2013-04-02 16:23:24 -05:00 |
|
Chad Pilkey
|
df557b89af
|
changed all internal references to participants to users
|
2013-03-15 18:53:39 -04:00 |
|
jfederico
|
2b23d9cea7
|
Merge branch 'bbb-lti_v0.1.1'
|
2013-03-13 11:30:46 -04:00 |
|
Chad Pilkey
|
cc563a73b5
|
the presentation window has been added to the layout.xml file and is properly positioned
|
2013-03-04 17:29:36 -05:00 |
|
Chad Pilkey
|
f79de237de
|
fixed a lot of issues with accessibility
|
2013-03-01 20:00:33 -05:00 |
|
Richard Alam
|
36130c1339
|
Merge branch 'master' into unify-users-and-listeners
Conflicts:
bigbluebutton-client/src/org/bigbluebutton/main/model/users/Conference.as
|
2013-02-28 19:26:01 +00: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
|
79ed1bdbe9
|
Merge branch 'master' into unify-users-and-listeners
|
2013-02-20 19:46:11 +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 |
|
Richard Alam
|
2ccf330c08
|
- add layout for unified users and listeners
|
2013-02-20 16:11:04 +00:00 |
|
Richard Alam
|
c24cf55d9c
|
Merge branch 'master' into unify-users-and-listeners
Conflicts:
bigbluebutton-client/build.xml
|
2013-02-19 21:31:56 +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
|
c957be6f4d
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
|
2013-02-12 21:11:24 +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 |
|
Chad Pilkey
|
959c57742a
|
dial-in users get created now and you can't kick dial-in users
|
2013-02-12 15:17:45 -05:00 |
|
Richard Alam
|
a7a85bfd66
|
- update deskshare jar file
|
2013-02-07 20:52:52 +00:00 |
|
Richard Alam
|
44084a0825
|
- update deskshare applet jar
|
2013-02-07 20:50:02 +00:00 |
|
Markos Calderon
|
d2cc026588
|
update deskshare jar
|
2013-02-07 15:49:58 -05:00 |
|
Chad Pilkey
|
7924665c3d
|
the participants module fully works and has been added to the layout manager
|
2013-02-07 13:50:24 -05:00 |
|
Markos Calderon
|
f9b2600cdc
|
updating jar in order to not show warning message
|
2013-02-07 13:49:18 -05: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 |
|
Richard Alam
|
d5ea1099da
|
- update deskshare applet
|
2013-02-04 17:09:36 +00:00 |
|
Richard Alam
|
09a7b9e109
|
- bringing status messages for deskshare standalone into master
|
2013-02-01 20:09:39 +00:00 |
|
Markos Calderon
|
db79ff62ab
|
Update build.xml and applet
|
2013-01-28 16:14:32 -05:00 |
|
Markos Calderon
|
6389cda5e0
|
updating deskshare applet
|
2013-01-28 14:01:29 -05:00 |
|
jfederico
|
facd1b299f
|
Added javascript to BigBlueButton.html to validate that javascript, java and flash are enabled before loading the client
|
2013-01-22 13:27:00 -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
|
26e07fabb7
|
- call js interface when link is clicked on chat
|
2013-01-11 22:26:05 +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 |
|
Richard Alam
|
6303de3007
|
- extract webcam control icons
|
2013-01-08 20:04:03 +00:00 |
|
Chad Pilkey
|
6e002d966e
|
Merge remote branch 'origin/master' into access-hotfix
Conflicts:
bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
|
2013-01-08 14:00:46 -05:00 |
|
Richard Alam
|
2ac2d651aa
|
- add layout with notes and broadcast
|
2013-01-07 15:39:46 +00:00 |
|
Chad Pilkey
|
b3a6e1e552
|
Merge remote branch 'upstream/master' into access-hotfix
Conflicts:
bigbluebutton-client/resources/config.xml.template
bigbluebutton-client/src/BigBlueButton.mxml
bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/SlideView.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/PublishWindow.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/videodock/views/VideoDock.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/ClearButton.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/LineButton.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/PanZoomButton.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/RectangleButton.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/ScribbleButton.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/TextButton.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/UndoButton.mxml
|
2013-01-04 14:03:39 -05:00 |
|
Richard Alam
|
6b95383957
|
- handle response when saving note
|
2013-01-03 20:44:32 +00:00 |
|