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

1286 Commits

Author SHA1 Message Date
BigBlueButton
4db0ee6cf3 Fixed disconnect bug. 2011-04-12 20:08:31 +00:00
deniszgonjanin
c6aa0fcf7e Disabled automatic reconnect 2011-04-06 12:22:41 +00:00
Richard Alam
28b5f9f138 - merge in changes from HEAD 2011-04-04 11:10:10 -04:00
Richard Alam
c2fd6f6c20 - add back lines where we need to generate unique filenames for webcam streams 2011-04-14 15:02:44 -04:00
Richard Alam
f8de22e00b - fix merge conflict with video publish 2011-04-14 11:28:56 -04:00
Richard Alam
19694d87e0 Merge branch 'master' into record-and-playback-feature 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationHandler.java
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/PublishWindow.mxml
 2011-04-04 11:15:09 -04:00
Richard Alam
a3640e6f87 - add record status events in the client 2011-03-30 14:33:00 -04:00
Marco Calderon
49df7affdc update zn_TW locale 2011-03-23 15:42:08 +00:00
Marco Calderon
4af0c95285 update polish locale 2011-03-23 15:07:31 +00:00
@deniszgonjanin
e60bf5aa23 Fixed Issue 882. Also another issue where the whiteboard sometimes goes stupid and draws everything from the top left corner of the screen. 2011-03-29 02:39:56 -04:00
@deniszgonjanin
85ae75ee5f Changed javascript file initialization so they work better in sandbox mode 2011-03-27 21:45:29 -04:00
deniszgonjanin
c0d9b16c91 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-03-27 21:45:55 +00:00
deniszgonjanin
46eb5c7dc7 Cleaned up HTML template of the client. Moved all javascript functionality to external java script files 2011-03-27 21:45:08 +00:00
Richard Alam
4e55a6e157 - notify client on the status of deskshare recording 
- this should just display alert boxes for now. we need to figure out the best way
   to display record status that will also be used for voice, video, and events (chat, presentation, whiteboard, etc.)
 2011-03-29 15:28:59 -04:00
Richard Alam
92c0af9f49 - remove LIVE|RECORD mode as we are not using it 2011-03-22 10:23:32 -04:00
Richard Alam
9c6b27fb5f Merge branch 'master' into record-and-playback-feature 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
 2011-03-18 15:43:39 -04:00
Richard Alam
ab2f359a53 - format video stream name into <meetingid>-<userid>-<timestamp> so that we can easily 
identify and parse the video recordings
 2011-03-15 15:36:32 -04:00
Felipe Cecagno
6f76f07b42 starting to implement the window layouts - the small videos layout is fully implemented 2011-03-15 16:24:41 +00:00
Felipe Cecagno
bcbb108536 some other improvements on the resize window feature. still blinking sometimes 2011-03-10 18:13:54 +00:00
Fred Dixon
e1d9783db7 Recompiled bbb-deskshare-applet-0.71.jar with JDK 1.5 to work on Mac OS 10.5.6 under Firefox 2011-03-07 20:45:00 -05:00
Marco Calderon
e9c996be77 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-03-07 11:03:26 +00:00
Felipe Cecagno
d15f6b270c some other improvements on the resize window feature. still blinking sometimes 2011-03-07 09:13:31 +00:00
Felipe Cecagno
1c389f01d3 resolutions are configurated by the config.xml; removed the close button from PublishWindow; implemented the maximize and restore; corrected the implementation of resizing; the implementation of maximize, restore and resize is exactly the same for both PublishWindow and VideoWindow 2011-03-07 09:13:31 +00:00
Marco Calderon
01a5490421 added korean and update dutch locale 2011-03-07 03:45:42 +00:00
Marco Calderon
0b82f712eb - [ignore] deleting wrong files 2011-03-06 07:40:35 +00:00
Marco Calderon
5a58b9ba11 - added indonesian and portuguese (brazil) locales 2011-03-06 07:35:59 +00:00
@deniszgonjanin
465b8e4922 Issue with non presenter muting in Classroom Audio Module 2011-03-05 15:41:15 -05:00
@deniszgonjanin
e99a3f9335 Modifications to how the microphone is set up in the Class Audio Module 2011-03-05 11:53:04 -05:00
@deniszgonjanin
cdebb92dc6 Another attempted fix at the mute/unmute problem with the Classroom Audio Module 2011-03-05 11:44:04 -05:00
@deniszgonjanin
451f5edd28 Fixed a bug with some viewers coming in unmuted. Class Audio Module 2011-03-05 11:36:34 -05:00
@deniszgonjanin
415da72005 Seems it's hard to completely mute the microphone in flex, so trying to detach the mic from the audio stream. 2011-03-05 11:27:49 -05:00
@deniszgonjanin
c8cafe7ccb Fixed a problem with fully muting people in the Class Audio Module 2011-03-05 11:23:10 -05:00
@deniszgonjanin
e7768ae0dc Added a small API to allow better alignment control of the buttons on the top toolbar. 2011-03-05 11:09:49 -05:00
@deniszgonjanin
52cf24593d Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-03-05 10:22:57 -05:00
@deniszgonjanin
f7d3b5437b Minor regression error 2011-03-05 10:22:35 -05:00
deniszgonjanin
a77827ee16 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-03-05 15:20:54 +00:00
deniszgonjanin
20ab541cf4 New task for client's build.xml to allow for building a single module only, to save time when developing from outside Flash Builder 2011-03-05 15:20:13 +00:00
@deniszgonjanin
bc087d2d3d Added a new skin for the Push to Talk Button. Will appear as an actual push button now 2011-03-05 10:19:16 -05:00
@deniszgonjanin
8336bc77e2 Minor mute bug in Classroom Audio Module 2011-03-04 19:22:23 -05:00
@deniszgonjanin
67d94a0057 Changes to the Push To Talk button 2011-03-04 19:11:49 -05:00
@deniszgonjanin
a043d45df6 ClassroomAudioModule - changes to how muting and unmuting are handled 2011-03-04 18:18:59 -05:00
@deniszgonjanin
46eae2e4ec Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-03-04 17:36:10 -05:00
@deniszgonjanin
4fe35444e9 Added a Push To Talk button for the Classroom Audio Module 2011-03-04 17:35:30 -05:00
deniszgonjanin
bc434062c0 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-03-04 21:38:19 +00:00
deniszgonjanin
63cb08fbd6 Added ClassAudioModule to build.xml and config.xml.template 2011-03-04 21:37:46 +00:00
@deniszgonjanin
ae40303082 Enable presenter only speaking for ClassAudioModule 2011-03-04 16:36:53 -05:00
@deniszgonjanin
28fa3d5116 Prototype Classroom style Audio module 2011-03-04 14:19:56 -05:00
Felipe Cecagno
859176db78 resolutions are configurated by the config.xml; removed the close button from PublishWindow; implemented the maximize and restore; corrected the implementation of resizing; the implementation of maximize, restore and resize is exactly the same for both PublishWindow and VideoWindow 2011-03-03 23:30:51 +00:00
Marco Calderon
43046a7338 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-02-24 16:40:23 +00:00
Marco Calderon
c70e26f3cb update locale for ukrainian and norwegian 2011-03-01 10:35:18 +00:00
Fred Dixon
0c8b05ce6d Fixed bug #884 2011-02-28 21:51:36 -05:00
Marco Calderon
14d4419c7e - changes in turkish locale 2011-02-24 16:17:58 +00:00
Marco Calderon
a3231b4b39 added danish locale 2011-02-23 17:06:09 +00:00
@deniszgonjanin
34e41fd0e1 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-02-18 14:14:02 -05:00
@deniszgonjanin
6620ffc1bc Auto-reconnect now loads html page instead of swf file. 2011-02-18 14:13:17 -05:00
Richard Alam
4a92404295 - add th_TH to the build 2011-02-16 10:39:57 -05:00
Richard Alam
dee59aa806 - ooooppssss.. forgot the commit build.xml 2011-02-15 12:14:44 -05:00
Richard Alam
d98c871689 - add th_TH (thai) locale 
- change es_ES locale
 - add th_TH and fa_IR (Farsi) locale into Language selector
 2011-02-15 12:08:19 -05:00
@deniszgonjanin
f58ed26069 Moved around client api relevant classes to the same package to have all the asdocs in one place, to help users developing bbb 2011-02-15 11:19:57 -05:00
@deniszgonjanin
591ab11875 Added some documentation to relevant parts of bbb-client, to build with ASDoc 2011-02-15 11:01:14 -05:00
deniszgonjanin
20c97bfece Ant task for generating ASDoc documentation for the client. Docs generated under bigbluebutton-client/asdoc. Added that directory to client's .gitignore 2011-02-11 22:41:38 +00:00
@deniszgonjanin
1285474db7 Refactoring. Deleted a no longer used file from the PresentModule 2011-02-11 15:49:44 -05:00
@deniszgonjanin
aa1d9285c3 Some refactoring. Deleted a no longer needed mxml class file 2011-02-11 15:45:00 -05:00
@deniszgonjanin
5df793c02d Some changes to work properly with the asdoc tool. Right now throwing error due to some syntax it doesn't like. 2011-02-11 15:39:56 -05:00
@deniszgonjanin
f89efce2ae A working version of the notes module. Disabled by default 2011-01-29 02:08:47 -05:00
@deniszgonjanin
fc7296d88c Initial commit of Islams Shared Notes module. Module is off by default 2011-01-29 01:35:07 -05:00
@deniszgonjanin
941882409e Added optional warning suppresion for locale version check 2011-01-29 01:33:59 -05:00
deniszgonjanin
8934bad003 Fixed bugs in the push to talk implementation (ClassroomAudioModule) 2011-01-25 10:05:54 +00:00
Denis Zgonjanin
95b8303d15 Patch by Steven Schroedl (sschroedl@gmail.com) to generate voice-bridge compatible meeting ids. http://groups.google.com/group/bigbluebutton-dev/browse_thread/thread/c9cb12acf0290c14 2011-01-21 12:31:33 -08:00
Richard Alam
1892a26bba - update Latvian locale 2011-01-21 13:21:59 -05:00
Richard Alam
a1d13a9fa4 - new Turkish locale from Irfan 2011-01-20 09:30:13 -05:00
Richard Alam
1bfdbc85a3 - add Ukrainian translation 
- fix German translation
 2011-01-18 17:33:24 -05:00
Richard Alam
919ec2f23c - new Turkish file from Irfan 2011-01-14 17:29:10 -05:00
Richard Alam
05675fe2ad - trying again to commit Turkish locale. Hopefully this will be a text file now. 2011-01-14 16:48:17 -05:00
Richard Alam
e95f0a24c1 - looked like Turkish local was checked-in as binary and causing it now to load properly 2011-01-14 16:29:07 -05:00
Fred Dixon
19c53b822d - Changed en_US copyright to 2011 2011-01-10 21:46:39 -05:00
Marco Calderon
ea10e4bb7c Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into record-and-playback-feature 
Conflicts:
	.gitignore
	bigbluebutton-web/application.properties
 2011-01-03 19:15:11 +00:00
Richard Alam
b42b43079b Merge branch 'master' into record-and-playback-feature 2011-01-18 17:36:47 -05:00
Richard Alam
6b97c99817 Merge branch 'master' into record-and-playback-feature 
Conflicts:
	bigbluebutton-client/.actionScriptProperties
	bigbluebutton-client/.flexProperties
 2011-01-11 16:08:12 -05:00
@deniszgonjanin
1edb303d39 Created a script to automatically generate an audio file of the same length as the conference. Should be easily convertible to a script we can use to pad the beginning and end of audio files generated by asterisk/freeswitch. 2010-12-28 11:05:28 +00:00
@deniszgonjanin
d5e4813aff Improvements to the branding ant tasks 2010-12-24 04:20:26 +00:00
@deniszgonjanin
20e9410920 Added updated Latvian (lv_LV) and Turkish (tr_TR) translations 2010-12-24 02:58:44 +00:00
@deniszgonjanin
810f127a70 Added basic branding file for adding just the logo to the BigBlueButton default client 2010-12-24 02:13:02 +00:00
Richard Alam
ee9150d9e1 - use uri instead of module to fix standalone deskshare client 2010-12-22 14:43:04 -05:00
Marco Calderon
d6c8b30e19 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into record-and-playback-feature 2010-12-17 12:03:11 +00:00
@deniszgonjanin
060b7483b0 Added support for logo branding in the lower right corner of the client 2010-12-13 20:20:27 +00:00
Richard Alam
eeee05608b - set bufferTime to zero to prevent Flash from buffering flood of delayed audio packets when there 
is network congestion
 2010-12-13 11:55:30 -05:00
Scott Morris
3261a669a2 Updated some debug issues 2010-12-03 18:05:39 -05:00
Scott Morris
8c62f2474b Removed issue where mic was set to null forcefully (sorry guys) 2010-12-03 17:09:00 -05:00
Scott Morris
ab7c11e972 Added more debugging to the call connection Managers 2010-12-03 10:23:18 -05:00
Scott Morris
099d3eec27 Stopped voice stream from client. Now when the headset button is clicked the stream is properly terminated. (Fixes another server side threading issue) 2010-12-02 14:29:10 -05:00
Richard Alam
f4b7817fa1 - display number of listeners on window 2010-11-26 10:45:26 -05:00
Richard Alam
b456c92822 - add meaningfull logging so we can track a user when joining/leaving conference. 2010-11-25 15:38:38 -05:00
Richard Alam
36cd4d25a7 - allow to pass autoJoin param in config.xml to auto join voice conference 2010-11-23 16:39:08 -05:00
Marco Calderon
49d7ea37f4 fix bug recording 2010-11-17 06:34:18 +00:00
Marco Calderon
d18276e64f Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into record-and-playback-feature 2010-11-11 03:01:42 +00:00
Marco Calderon
2d102450b9 added send parameter record from bbb-web to bbb-apps 2010-11-10 22:40:52 +00:00
Fred Dixon
3a181428df - Noticed revently that some webcams were not successfully opening on other computers ... lowering the quality just a bit 2010-11-09 21:52:13 -05:00
Richard Alam
76ff233218 - fix http tunneling for desktop sharing 2010-11-09 15:56:42 -05:00
Richard Alam
74a8665777 - don't resize deskshare preview window when region is smaller than preview window 2010-11-08 16:42:25 -05:00