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

3809 Commits

Author SHA1 Message Date
Richard Alam
8c67505a69 - minor reorg 2014-08-20 11:41:40 -07:00
Richard Alam
de2abebe87 Merge branch 'add-mod-only-welcom-message' 2014-08-20 07:39:24 -07:00
Richard Alam
9f63ddd1f7 - add new param (moderatorOnlyMessage) on CREATE API 2014-08-20 07:37:31 -07:00
Ghazi Triki
bb57d17c84 Improved chat URL regex to match more urls 2014-08-20 11:31:09 +01:00
syeshchenko
39c7581d46 '?' button on the WebRTC Audio Connection dialog will open default help page 2014-08-19 13:10:06 -07:00
Chad Pilkey
84c5197097 Merge remote-tracking branch 'upstream/master' into enable-raisehand-for-all 2014-08-19 10:57:10 -07:00
Chad Pilkey
1689a86113 the raise hand button is now visible for all users 2014-08-19 10:56:03 -07:00
Fred Dixon
ec707f829f Minor tweak to the webRTC notification (lower right-hand corner) 2014-08-19 13:10:47 -04:00
Fred Dixon
374828105f Tweaking the language for the Audio Test dialog 2014-08-19 13:02:15 -04:00
syeshchenko
f46e9893da Merge remote-tracking branch 'origin/master' into zoom-slider-bug 2014-08-19 08:48:25 -07:00
Richard Alam
74e2a3a2c3 - show presentation conversion progress 2014-08-19 08:45:45 -07:00
Richard Alam
8dd58b8ea5 - when presenter receives page coordinates from server when dragging the slide, ignore the message 
so as not to reposition the page and creating a jerky page movement
 2014-08-18 13:54:16 -07:00
Richard Alam
b77811d7a6 - mute late user if meeting is muted 2014-08-18 12:23:59 -07:00
Richard Alam
236fd68db1 - send meeting status to client when user joins 2014-08-18 11:19:48 -07:00
Chad Pilkey
3dee8327f6 Merge pull request #366 from SenecaCDOT-BigBlueButton/misc-client-fixes 
Misc client fixes
 2014-08-18 12:27:38 -04:00
Chad Pilkey
7595dbebd2 added notifications to the users window for room mute and lock state 2014-08-18 09:25:00 -07:00
Richard Alam
08ba3efd8c Merge pull request #365 from speakserve/revert-whiteboard-toolbar-alignments 
Reverted WhiteboardToolbar spacers.
 2014-08-18 10:17:24 -04:00
Ghazi Triki
8937634b33 Reverted WhiteboardToolbar spacers. 2014-08-18 13:31:41 +01:00
Fred Dixon
1db651ffcd Minor tweaks to text phrases and icons 2014-08-17 22:15:49 -04:00
Fred Dixon
8f91435ec5 Adjusting icons to give prominence to joining by microphone 2014-08-17 21:57:58 -04:00
Fred Dixon
24ea43ba8f Updates to images for webRTC audio 2014-08-17 19:36:31 -04:00
syeshchenko
972e4ecf6a fixed 'slider will zoom to the bottom right side instead of center' 2014-08-17 14:40:50 -07:00
Chad Pilkey
701fc5c38f Merge remote-tracking branch 'upstream/master' into misc-client-fixes 2014-08-17 13:56:40 -07:00
Chad Pilkey
9daf1d7a16 added styling to the fileupload help, also cleaned up some text 2014-08-17 13:56:15 -07:00
Chad Pilkey
d044596b82 added a notification for when you are using webrtc 2014-08-16 11:35:00 -07:00
Richard Alam
485127c7c2 - send meeting muted state to client 2014-08-16 05:13:47 -07:00
Richard Alam
eac4e83df7 - have the webrtc echo test window query the state after it opens up. We need to do this 
because if the echo test starts up quickly, the window misses the echo test started event.
 2014-08-16 03:22:51 -07:00
Richard Alam
4146ec605f - missed a file to commit 2014-08-16 01:45:19 -07:00
Richard Alam
962109b2e8 - make sure that webRTCEchoTestStartEvent is handled by EchoTest window 2014-08-16 01:23:59 -07:00
Richard Alam
1801f101a1 Merge pull request #361 from SenecaCDOT-BigBlueButton/fix-pan-too-fast 
fixed a bug where panning was too fast
 2014-08-15 14:36:01 -04:00
Chad Pilkey
6240cf1738 fixed a bug where panning was too fast 2014-08-15 11:30:25 -07:00
Richard Alam
19de54ce9e Merge pull request #360 from SenecaCDOT-BigBlueButton/audio-button-click-bug 
Fixed mic button won't change status when flash voice stopped. Added use...
 2014-08-15 13:53:04 -04:00
syeshchenko
d34db11f43 Fixed mic button won't change status when flash voice stopped. Added user feedback when flash echo test in progress and flash echo test failed. 2014-08-15 09:42:49 -07:00
Richard Alam
984ccec140 Merge pull request #356 from speakserve/follower-tooltip 
Follower tooltip skin
 2014-08-15 10:17:09 -04:00
Richard Alam
0751ca186f Merge pull request #358 from speakserve/improve-flex-client 
Improve flex client by removing unneedful components
 2014-08-15 10:16:46 -04:00
Richard Alam
779f5a8042 Merge branch 'upgrade-to-red5-1.0.3-release' into merge-polling-with-master 2014-08-15 02:41:24 -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
13f8397822 Merge pull request #363 from SenecaCDOT-BigBlueButton/unresponsive-mic-sound-bar 
Fixed click no can't hear audio - mic detection now won't work until mic...
 2014-08-15 17:02:12 -04:00
syeshchenko
7dff3f82d6 Fixed click no can't hear audio - mic detection now won't work until mic is changed then changed back. 2014-08-15 13:25:30 -07:00
Richard Alam
521109ed08 Merge pull request #362 from SenecaCDOT-BigBlueButton/deleting-presentation 
fixed removing presentation
 2014-08-15 16:05:06 -04:00
adam-sharpe
8563812446 fixed removing presentation 2014-08-15 12:47:15 -07:00
Richard Alam
72e7f20def Merge branch 'merge-polling-with-master' into upgrade-to-red5-1.0.3-release 2014-08-15 00:56:46 -07:00
Ghazi Triki
40ae4100f7 Improved nested componenets by removing non necessary ones. 2014-08-15 05:08:27 +01:00
Richard Alam
1423286014 - try to figure out if we can extend NetConnection timeout from ~20s to >1 minute. If the NetConnection 
doesn't receive any packets from Red5, it will close the connection in ~20s. Red5 closes the connection
   after 1 minute "due to too much inactivity". However, we can't extend the NetConnection timeout so the user
   will just be logged out.

   To test it out:
   1. Connect using the bbb client in RTMP
   2. Block port 1935 on the firewall on the server
   3. Client will get logged out after ~20s
   4. On red5.log, red5 will continue sending pings until after 1min and then close the connection
 2014-08-14 13:33:26 -07:00
Ghazi Triki
89f6411e9b Removed spacers when possible to make the flash display list lighter. 2014-08-14 21:02:01 +01:00
Chad Pilkey
3aedc92187 Merge remote-tracking branch 'upstream/merge-polling-with-master' into recording-notification 2014-08-14 11:22:38 -07:00
Chad Pilkey
f38ff557a1 added a reminder to the recording button 2014-08-14 11:21:21 -07:00
Ghazi Triki
7fd10a0e54 Added tooltip fading effects. 2014-08-13 23:31:29 +01:00
Ghazi Triki
716ee3c731 Added a follower tooltip with an indicator arrow. 2014-08-13 23:08:03 +01: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
eb0caa9b3e Merge branch 'merge-polling-with-master' of github.com:bigbluebutton/bigbluebutton into merge-polling-with-master 2014-08-13 12:07:50 -07:00
Richard Alam
b9d6401a9e - mute/unmute all users 
- mute all users except presenter
 2014-08-13 12:07:01 -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
2aa1ddb600 Presentation name is displayed after being lost. 2014-08-13 18:47:57 +01: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
Fred Dixon
b1c22ad8fd Set autoJoin to true to display audio options on loading 2014-08-12 22:38:25 -04:00
Chad Pilkey
fb9b1b9f1e fixed the height of the locale combobox 2014-08-11 14:42:13 -07:00
Chad Pilkey
f48855697f cleaned up the meeting name display logic a little 2014-08-11 10:20:53 -07: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
Chad Pilkey
b5cc4ec31d Merge remote-tracking branch 'upstream/merge-polling-with-master' into fix-chrome-webrtc 2014-08-10 13:42:54 -07:00
Chad Pilkey
980100dad6 fixed an issue when leaving the audio 2014-08-10 13:39:27 -07:00
Richard Alam
5b449a89a2 Merge branch 'switch-to-sipjs' into merge-polling-with-master 2014-08-10 09:28:25 -07:00
Richard Alam
b98bd3fc25 Merge branch 'switch-to-sipjs' of https://github.com/SenecaCDOT-BigBlueButton/bigbluebutton into switch-to-sipjs 2014-08-10 09:28:03 -07:00
Richard Alam
9244dd19d0 - allow forcing user to join listen only when autoJoin=true 2014-08-10 08:42:11 -07:00
Chad Pilkey
8607c78c2a moved echo test strings to localization, and animated the dots 2014-08-10 07:56:08 -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
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
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
Richard Alam
e0f8272ddf Merge pull request #349 from speakserve/chat-paste-xml 
Ability to paste in XML into Chat
 2014-08-08 10:57:03 -04:00
Ghazi Triki
de8b886be8 Fixed string replacement index in ChatUtil.parseURLs 2014-08-07 23:49:59 +01:00
Richard Alam
723ee43830 - fix https://code.google.com/p/bigbluebutton/issues/detail?id=1695 2014-08-07 13:24:52 -07:00
Richard Alam
92254d4853 - allow voice conf button to be stylized 2014-08-07 11:42:57 -07:00
Richard Alam
9c19b0d8f8 Merge pull request #352 from SenecaCDOT-BigBlueButton/fix-slide-zoom 
fixed presentation zooming on a point
 2014-08-07 14:31:10 -04:00
adam-sharpe
39cea99616 fixed presentation zooming on a point 2014-08-07 11:15:15 -07:00
Richard Alam
b04916fd84 - minor format 
- put recording indicator before meeting name
 2014-08-07 11:04:39 -07:00
Richard Alam
7ca8933ea8 - fix exception when start/stop recording 2014-08-07 11:03:49 -07:00
Richard Alam
62f9ed3944 - move locale settings to bottom 
- add recording lable to meeting name in toolbar
 2014-08-07 10:32:10 -07:00
Ghazi Triki
2394b34d49 Better string cleanup html/xml entities as suggested by markoscalderon. 2014-08-07 15:06:44 +01:00
Ghazi Triki
930d4d4d25 RegEx inside parseURLs method is executed only once instead of two times : fixes first match not found where there is only one match. 2014-08-07 14:48:43 +01:00
Ghazi Triki
39cae0e920 Added missing right brace for parseURLs method. 2014-08-06 15:32:20 +01:00
Ghazi Triki
90cfc95fa1 Added missing right brace in a condition for "parseURLs" method. 2014-08-06 15:22:33 +01:00
Ghazi Triki
930048317c Chat messages can contain XML code and all links starting with http, https, ftp and www are parsed and sent correctly to chat service. 2014-08-06 15:09:44 +01:00
Richard Alam
bc8f22ff70 - allow joining audio skipping mic check 2014-08-05 13:59:01 -07:00
Richard Alam
e6f1c6a852 - add string to locale 2014-08-05 11:14:23 -07:00
Richard Alam
11c9d21229 - add string to locale 2014-08-05 11:13:58 -07:00
Richard Alam
0eb48379f2 - add recording indicator label 2014-08-05 09:31:27 -07:00
Mateus Dalepiane
faadd6cece Default stream path is now configurable 
By default the stream path is set to empty, so the clients will connect directly
to the conference server. Otherwise it should be set to something like:
	proxy1/proxy2/conference
 2014-07-31 14:27:29 -03:00
Richard Alam
64fdb9e2f8 - allow configuring lock settings from config.xml 2014-07-31 09:44:42 -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
Mateus Dalepiane
3f2caacddf Implemented video service at bbb-apps 
The client will request the stream path for the video service.
The request and reply is currently working, but need re-factoring.
 2014-07-30 17:37:01 -03:00
Richard Alam
dede32bd63 - turn off polling 2014-07-30 11:22:23 -07:00
Richard Alam
aa92bdf61c - don't show phone dial option by default 2014-07-30 11:21:21 -07:00
Richard Alam
36183d55d2 - remove unused option 2014-07-30 08:38:21 -07: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
Richard Alam
3d959234cd - fix issue where button display the wrong state when user is muted but the icon shows unmuted 2014-07-29 08:06:08 -07:00
Richard Alam
d11974a0e9 - fix issue where we can't join voice when RTMP Tunnelling 2014-07-28 12:41:41 -07:00
Richard Alam
19c933b8fa - minor cleanup 2014-07-28 12:41:21 -07:00
Richard Alam
7481c46cd9 - re-enable buttons when there is an error encountered during presentation conversion 2014-07-28 11:39:44 -07:00
Richard Alam
2d20915e40 - prevent user from closing presentation upload window while the presentation is being converted 2014-07-28 11:07:35 -07:00
Richard Alam
5ddd295ea6 - remove mic init as it triggers Chrome to prompt user to allow mic access 
even if we still don't need it
 2014-07-28 09:48:04 -07:00
Richard Alam
65d8b0889c - minor cleanup 2014-07-28 09:47:50 -07:00
Richard Alam
889ea9187a - display remote layout name on layout dropdown 2014-07-28 08:28:53 -07:00
Richard Alam
9868dfdae5 - blur mic image when user is talking 2014-07-25 14:13:23 -07:00
Richard Alam
4148c5db8a - move button so that it's not overlapped by whiteboard toolbar 2014-07-25 08:03:51 -07:00
Richard Alam
806a09ec3f - update copyright year 2014-07-25 08:03:32 -07:00
Mateus Dalepiane
d7034ac848 Change the variable used to store and access connections from VideoProxy 
The previous variable was userID, now the streamName is used. This is necessary
because the streamName will be used to request the path that should be used to
connect to the stream.
 2014-07-25 11:38:35 -03:00
Richard Alam
c4a791437b - fix race condition on setting mute user 2014-07-24 12:29:56 -07:00
Richard Alam
e4d9b1e8f2 - fix muted/unmuted icon 2014-07-24 11:52:37 -07:00
Richard Alam
9485d25af7 - fix raise condition between setting the user has joined the voice conf and the joined voice event 2014-07-24 11:28:45 -07:00
Richard Alam
58f34d7767 - try and fix issue where mute button isn't showing up 2014-07-24 11:02:10 -07:00
Richard Alam
41ebc6859d - don't throw exception when external userid is not found as the user might have acutally left the meeting 2014-07-23 10:48:02 -07:00
Richard Alam
b47efe5675 - init dataprovider when layout list has been updated after the combo has been initialized 2014-07-22 10:45:56 -07:00
Richard Alam
5236d85cd4 - fix layout drop NPE 2014-07-22 08:53:38 -07:00
Richard Alam
94a8dc5762 - fix race condition on initializing layout combo dropbox 2014-07-22 08:33:36 -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
9d20d28d30 - disable layout dropbox when layout is locked 2014-07-17 11:16:53 -07:00
Richard Alam
4c41140193 - do not sync layout to others automatically 2014-07-17 10:48:23 -07:00
Richard Alam
412e2c51a6 - a little cleanup 2014-07-16 13:12:10 -07:00
Richard Alam
7fd7b13088 - change layout sync icon 2014-07-16 11:39:16 -07:00
Mateus Dalepiane
a7bf60a674 Fixing comparation, empty string doesn't mean it wasn't set 
It's better to check if the dictionary entry is null
 2014-07-14 14:16:39 -03: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
Richard Alam
13046276fe - update windows when broswer is resized 2014-07-05 01:35:33 -07:00
Felipe Cecagno
b360db51e6 fix complementary to the previous one; non-prioritized videos now are correctly centralized on the grid cell 2014-07-02 16:09:41 -03:00
Mateus Dalepiane
52502488ec Merge branch 'multivideo' into multivideo-1404 
Conflicts:
	bbb-video/build.gradle
	bbb-video/src/main/java/org/bigbluebutton/app/video/VideoApplication.java
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
	bigbluebutton-web/grails-app/conf/bigbluebutton.properties
 2014-06-26 16:21:25 -03:00
Jonata Teixeira Pastro
1bcd668904 Fixed scrollbar issue. 2014-06-23 19:15:14 +00:00
Jonata Teixeira Pastro
7db69944be Fixed scrollbar issue. 2014-06-23 19:14:40 +00:00
Mateus Dalepiane
b09a75a61b Set client for paly NetConnections 2014-06-13 16:18:31 -03:00
Felipe Cecagno
c3c56a6355 few improvements on the camera messages; cleanup and refactoring of the new video dock implementation; extracted many hardcoded branding information to the branding file 2014-06-11 17:01:45 -03:00
Richard Alam
c7ceb58f43 - don't sync layout to viewers when moderstor resize the windows 2014-06-11 11:54:59 -07:00
Richard Alam
73877cab9b - switch layout when combo box is selected 2014-06-11 10:10:20 -07:00
Richard Alam
c8ec8bb24b - figure out why sync is broken 2014-06-07 01:25:39 -07:00
Richard Alam
0dd1b37afd Merge branch 'merge-polling-with-master' into broadcast-layout 2014-06-06 22:14:32 -07:00
Richard Alam
aac2dd3c3c - chnage label on lock settings 2014-06-06 21:26:01 -07:00
Richard Alam
73bb2cdeb6 - display layout names in dropdown 2014-06-06 18:27:46 -07:00
Richard Alam
045426e9af - try to diplay layouts in dropdown 2014-06-06 17:49:04 -07:00
Richard Alam
262f94b69c Merge branch 'merge-polling-with-master' into broadcast-layout 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
 2014-06-06 15:34:35 -07:00