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

404 Commits

Author SHA1 Message Date
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
051c55c37d - modify default config.xml 2013-01-07 15:54:20 +00: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
Richard Alam
be04295217 remove scrollbars on chat input box 2013-01-02 13:39:47 +00:00
Richard Alam
7c58ed3c95 - try to display notes window 2013-01-02 01:45:48 +00:00
Richard Alam
6b36e0011a - build BBB default style 2012-12-28 17:32:14 +00:00
Richard Alam
968a56d556 - add broadcast window to layout as exception occurs when the module is loaded 2012-12-27 19:12:14 +00:00
Richard Alam
899bab170c - make broadcast module be displayed using layout manager 2012-12-26 19:34:22 +00:00
Richard Alam
55cfea9ceb Merge branch 'updating-broadcast-module' of github.com:bigbluebutton/bigbluebutton into updating-broadcast-module 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/broadcast/services/MessageReceiver.as
	bigbluebutton-client/src/org/bigbluebutton/modules/broadcast/services/MessageSender.as
 2012-12-26 17:26:08 +00:00
Richard Alam
3418876adc - add options in config template 2012-12-24 19:42:50 +00:00
Richard Alam
5cba147cf8 - fix error on layout for broadcast module 2012-12-21 20:55:23 +00:00
Richard Alam
cbcd54cd7b - update broadcast module to work on master 2012-12-21 20:34:33 +00:00
Richard Alam
f80fcfbc46 - provide absolute url where to load the skin swf file 2012-12-18 20:57:56 +00:00
Richard Alam
20487a75cb - add a way to specify that the windows can be resized or dragged 2012-12-18 20:01:34 +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
1ab06e37b3 - try skinning 2012-12-17 20:06:12 +00: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
50aa8dfd24 - add option to enable displaying of avatar 2012-12-04 19:09:45 +00:00
Richard Alam
f4ff05856a - add JS api to share webcam 2012-12-03 21:23:29 +00:00
Richard Alam
1cd682e1e0 - pass avatar in avatarURL during join API call. Have a default avatarURL 2012-12-02 10:57:58 +00:00
Chad Pilkey
f3dff5b249 You can now focus into flash with a button and get out with a shortcut key (ctrl shift Q) 2012-11-28 15:29:17 -05:00
Chad Pilkey
f0a19f1640 removed obsolete object code 2012-11-28 12:24:13 -05: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
jtrobinson
41b59d6e92 Fixed mistake in config.xml.template, updated README 2012-11-23 18:25:33 +00:00
jtrobinson
b6617ac58b Deskshare and webcam publishing included in tab order. Some tweaking required. 2012-11-22 21:43:31 +00: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
Chad Pilkey
fafe078ab0 Merge branch 'access-hotfix' of github.com:capilkey/bigbluebutton into access-hotfix 2012-11-20 12:04:40 -05:00
jtrobinson
4c13b70a7b Remember to use the baseTabIndex values in config.xml.template for tab order to work 2012-11-20 16:53:45 +00:00
Richard Alam
6adf6b516e Merge branch 'master' into send-receive-chat-from-js-api 2012-11-07 16:13:35 +00:00
Richard Alam
f3df5b1a7c Merge branch 'send-receive-chat-from-js-api' of github.com:bigbluebutton/bigbluebutton into send-receive-chat-from-js-api 2012-11-05 22:30:05 +00:00
Richard Alam
817ceac330 - sample layout with window hidden 2012-11-05 22:29:27 +00:00
Fred Dixon
e2b446c0e0 Fixed include in BigBlueButton.html to point to correct file: bbb_api_bridge.js 2012-11-05 13:41:14 -05:00
Richard Alam
177ff0a753 - add switch presentation button 2012-11-02 17:09:34 +00:00
Richard Alam
b1800200fa - add present layout 2012-11-01 21:08:00 +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
6bb0920988 Merge branch 'send-receive-chat-from-js-api' of git://github.com/bigbluebutton/bigbluebutton into send-receive-chat-from-js-api 2012-11-01 18:46:30 +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
c85ae5b760 - add options in config.xml to display the webcam controls 2012-11-01 17:46:43 +00:00
Richard Alam
e29a347689 - add require.js lib 2012-10-24 22:15: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
969b8a3ab3 - make toolbar and footer visibilty configurable. The toolbar and footer can be hidden by 
setting showToolbar="true" showFooter="true" to "false"
 2012-10-22 17:10:20 +00:00
Fred Dixon
af96609e86 Set use h.264 video to true. We may revert this to false in the future 2012-10-22 10:42:23 -04: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
ec05cf0129 - add switch layout button 2012-10-18 17:32:01 +00:00
Richard Alam
65ce77f911 - add JS API to switch layout 2012-10-18 14:17:12 +00:00
Chad Pilkey
7396417780 fixed the client size in IE 2012-10-12 18:22:09 +00:00
Richard Alam
6e602c4b1d - add mute/unmute all buttons 2012-10-08 00:56:57 +00: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
e726a4d6c5 - add button to display the flash client 2012-10-05 17:39:45 +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
Richard Alam
c528fc6997 - change default layout 2012-10-02 20:22:42 +00:00
Richard Alam
a71069017f - make layoutUrl option full URL 2012-10-02 20:22:12 +00:00
Richard Alam
8e967a9797 - add hook to start webcam 2012-09-27 14:30:35 +00:00
Richard Alam
ca76d3c41d - start layout module first 2012-09-26 20:59:07 +00:00
Richard Alam
d3ff17ab05 - extract bbb-api-bridge into it's own js file 2012-09-20 16:17:57 +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
8ac96a7a3c - change config.xml template to have full URL of SWF files 2012-09-12 15:33:03 +00:00
Richard Alam
781a03a149 Merge branch 'master' into merge-master-into-embedding-client 2012-09-12 15:19:30 +00:00
Gustavo Salazar
e404da9614 Disable h264 by default. 2012-08-27 18:08:29 -05:00
Richard Alam
0971eb9a58 - add example wrapper for loading flash client from different server 2012-08-24 21:32:17 +00:00
Richard Alam
75bd9a754f Merge branch 'master' into embedding-the-client 
Conflicts:
	bigbluebutton-client/resources/prod/BigBlueButton.html
 2012-08-24 21:25:21 +00:00
Fred Dixon
a253171ac8 Fix for issue http://code.google.com/p/bigbluebutton/issues/detail?id=1294 2012-08-24 13:43:01 -04:00
Richard Alam
414d3568f6 - see if we can callback from flash to javascript 2012-08-24 15:06:18 +00:00
Richard Alam
51e7b4a114 - remove typo 2012-08-24 14:45:54 +00:00
Richard Alam
8012c8f48f Merge branch 'master' into embedding-the-client 2012-08-24 14:09:32 +00:00
Richard Alam
da8d48b909 - prototype js to as3 hook 2012-08-22 21:28:03 +00:00
Richard Alam
c90ae01f09 - take layout.xml from resources dir 2012-08-22 21:27:27 +00:00
tdj-br
3a0552a2b6 Changed the template of config file. 2012-08-22 10:18:40 +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
Richard Alam
b2b3ac89be - update deskshare applet wiht improvements from XOP 2012-08-17 17:48:35 +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
Chad Pilkey
cfd3446123 Merge remote branch 'upstream/master' 
Conflicts:
	README
	bigbluebutton-client/.gitignore
	bigbluebutton-client/resources/prod/BigBlueButton.html
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
	bigbluebutton-web/grails-app/conf/bigbluebutton.properties
 2012-08-07 19:56:23 +00:00
Richard Alam
d6ab348aff - add sample embed html 2012-08-05 22:14:01 +00:00
Richard Alam
76f94df0a1 - creating JS hooks 2012-08-21 22:02:24 +00:00
Gustavo Salazar
7735ff6d62 build client for Flash Player 11 2012-07-31 17:49:09 -05:00
Chad Pilkey
aa31b7f059 Merge remote branch 'upstream/master' 2012-07-24 16:16:04 +00:00
Chad Pilkey
37090f6d15 pressing escape with mic setting open now closes window 2012-07-23 21:47:47 +00:00
Chad Pilkey
2ca52ac6e4 new flexlib, fixed FF Flash focus issue 2012-07-20 15:55:26 +00:00
Ralf Sippl
68bf9f027b added SVC2 (Screen Video V2) support to deskshare 2012-07-16 23:01:49 +02:00
Chad Pilkey
eed32ebc3b Allow tabbing through flex app 2012-07-09 11:02:09 +00:00
Richard Alam
1d4ee2862c Merge branch 'layout-module' 2012-07-06 15:03:49 +00:00
Richard Alam
17bba97d40 - add catalan locale 
- update version to 0.8
 2012-06-18 12:56:30 +00:00
Felipe Cecagno
85aa046010 added an attribute to the layout module to show or hide the module control buttons (add, save and load) 2012-06-15 14:43:18 -03:00
Felipe Cecagno
e2d99acbb0 it still needs some refactoring, but it's working fine; this is the client side of the layout module which interacts with the server in order to (un)lock the windows layout 2012-06-15 11:45:14 -03:00
Richard Alam
d4b1c41298 - updating deskshare applet filename to 0.8 2012-06-05 21:09:37 +00:00
Richard Alam
c1a59722f2 - remove grayscale step when sharing desktop 2012-05-22 17:53:27 +00:00
firstuser
c32016cb28 Merge branch 'master' into layout-module 2012-05-13 00:23:32 -03:00
Felipe Cecagno
f0214fa580 implements the very first prototype of the layout module; the admin put the layout definitions in a XML file, and the user may apply the layouts independently; the users also can extract the current layout to add directly to the xml file with the layout definitions 2012-05-22 23:13:12 -03:00
Richard Alam
517c1c7cb9 - update dekshare applet with more logs to profile where it takes a long 
time to process
 2012-05-14 15:17:25 +00:00
Richard Alam
37b1edcc93 - update applet jar with changes to minimize connect timeout 2012-05-04 18:09:26 +00:00
Richard Alam
8bcaeb1edf - update deskshare standlone html 2012-04-24 22:20:12 +00:00
Richard Alam
af8620f292 - remove tunnel log on java console as it is confusing 2012-04-16 18:37:45 +00:00
Richard Alam
49bab2514b - change how we decode byte stream into frames 
- add an end frame delimeter so we can handle frames easily
 2012-04-12 21:49:37 +00:00
Richard Alam
0723e820b6 - add more logging to figure out why deskskare hangs when getting exceptions 2012-03-21 17:32:32 +00:00
Richard Alam
ec372dd538 - try to make deskshare resilient to corrupted packets 2012-03-15 22:06:33 +00:00
Richard Alam
be76c7d8ab - update locale to 0.8-beta4 2012-03-01 19:15:31 +00:00
Fred Dixon
2e458d147d Tweaked the settings for VideoconfModule to slightly improve quality video. Bandwidth of video will take on aberage 50 KiB/S 2012-02-12 12:26:20 -05:00
Richard Alam
3d8722d504 - allow to configure to show presentation window controls or not 2012-01-25 22:05:50 +00:00
Richard Alam
50123b81ba - new deskshare jar with sending message to stop sharing 2012-01-19 17:41:28 +00:00
Richard Alam
ce49090bd0 - make deskshare port configurable 2012-01-18 16:04:53 +00:00