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
Fred Dixon
9380a73dac Added message to let administration know that monit will restart bbb-record-core and LibreOffice. Tweaked the language for audio settings dialog. 2014-08-28 17:39:59 -04:00
Mateus Dalepiane
b8b91e39d2 Merge remote-tracking branch 'origin/multivideo-1404' into 090-multivideo 
Conflicts:
	bbb-video/build.gradle
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	bigbluebutton-web/grails-app/conf/bigbluebutton.properties
 2014-08-28 18:37:28 -03:00
Richard Alam
66fa77d57b - tool to cleanup transifex downloaded files 2014-08-28 14:09:35 -07:00
Richard Alam
2ece654c09 - init on creation complete not when added to stage as sometimes it may create multiple windows 2014-08-28 13:39:32 -07:00
Mateus Dalepiane
56a4b58c5a Fixed webcam toolbar icon 
All icons are now loaded from the CSS styles.
 2014-08-28 17:15:44 -03:00
Richard Alam
f347e7f2db - make joining of voice and closing mic settings window a 2-step process to prevent race condition 2014-08-28 12:59:17 -07:00
Richard Alam
416189fd5d - add logging on why joining into conf from echo test in CHrome fails 2014-08-28 11:04:59 -07:00
Richard Alam
caaa18d811 Merge pull request #382 from speakserve/fix-window-maximize-lockup 
MainCanvas height binded to its parent to avoid using percentHeight.
 2014-08-28 10:22:57 -04:00
Richard Alam
d6d6fba020 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2014-08-27 12:14:43 -07:00
Richard Alam
8dd374c78c - put some JS console logging to figure out why Chrome sometimes failt o join the voice conference 2014-08-27 12:13:57 -07:00
Chad Pilkey
90da8e5df4 fixed the skipping of an innocuous IO error in FileUploadService 2014-08-27 09:25:08 -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
Ghazi Triki
b03504aac0 MainCanvas height binded to its parent to avoid using percentHeight. 2014-08-26 22:18:54 +01:00
Mateus Dalepiane
a182800194 Fix video profiles init 
TODO: Fix problems with webcam icon
 2014-08-26 17:49:48 -03:00
Richard Alam
94cfbafb0a Merge pull request #380 from SenecaCDOT-BigBlueButton/unsupported-deskshare-chrome-on-mac 
identify if user is on mac and chrome and show the warning during deskto...
 2014-08-26 16:47:38 -04:00
Richard Alam
67798fcbd8 Merge pull request #381 from SenecaCDOT-BigBlueButton/presentation-upload-window-enhancements 
properly resized presentation file list, centered file format hint text ...
 2014-08-26 16:46:59 -04:00
Richard Alam
aa606b669f - don't send a StopEchoTest ocmmand and HasAudio event when the user clicks "Yes" on the echo test step. This causes a race condition 
as the StopEchoTest handler just hangsup the call white the HasAudio event, hangs up then calls into the conference.
 2014-08-26 13:41:50 -07:00
syeshchenko
5ccc49cde9 properly resized presentation file list, centered file format hint text and fixed typo 2014-08-26 13:25:32 -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
syeshchenko
77b7d4b327 identify if user is on mac and chrome and show the warning during desktop share 2014-08-26 12:02:08 -07:00
Chad Pilkey
dc5eadbda5 added some extra trace commands to track down Flash audio issues 2014-08-25 12:18:54 -07:00
Chad Pilkey
5896e5d21e hide delete button when presentation name is default.pdf 2014-08-25 11:39:51 -07:00
Chad Pilkey
c38e463e76 Merge remote-tracking branch 'upstream/master' into sort-raisehand-better 2014-08-25 09:57:42 -07:00
Chad Pilkey
bc0c27f683 allow ENTER in the whiteboard text, widen the language selector 2014-08-25 09:57:29 -07: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
4cb7faaa49 - update localization 2014-08-24 11:02:00 -07:00
Fred Dixon
a374c59e30 Renamed 'WebRTC' -> 'WebRTC Audio' so users have a better chance of knowing what this indicator means 2014-08-23 21:57:03 -04:00
Fred Dixon
3b7c3894d4 Adjusted FireFox permissions image to give more prominence to the microphone 2014-08-23 19:11:35 -04:00
Fred Dixon
5e63dd31be minor adjustment to record icon 2014-08-23 18:55:56 -04:00
Fred Dixon
35b3c6b1bf Corrected wording in prompt for user to give permission to access microphone (FireFox) 2014-08-23 18:47:31 -04:00
Fred Dixon
04d291a785 Darkend the had to make it more visible in Users window 2014-08-23 18:44:17 -04:00
Chad Pilkey
18ab0f1dd4 Merge remote-tracking branch 'upstream/master' into sort-raisehand-better 2014-08-23 14:32:22 -07:00
Chad Pilkey
46f5fcbfc7 fix strings in FirefoxMicPermission 2014-08-23 13:40:33 -07:00
Richard Alam
e4be6f5e1b - remove go to page dialog 2014-08-23 13:22:34 -07:00
Richard Alam
ba5b2d357f Merge pull request #379 from SenecaCDOT-BigBlueButton/sort-raisehand-better 
minor client updates
 2014-08-23 15:35:19 -04:00
Chad Pilkey
8e9477bbe8 sort based on handraised, move strings to locale, minor tweaks to the audio dialogs 2014-08-23 12:31:28 -07:00
Richard Alam
edd070ef48 - implement eject user from meeting 2014-08-23 12:00:41 -07:00
Fred Dixon
9d37588495 Minor tweaks in language strings 2014-08-23 08:06:52 -04:00
Richard Alam
bfe2153c2d Merge pull request #372 from SenecaCDOT-BigBlueButton/record-reminder-icon 
added record icon to the recording notification
 2014-08-22 09:48:45 -04:00
Fred Dixon
55baf5b0be Minor updates to prompts 2014-08-21 21:18:10 -04:00
syeshchenko
dae155c676 added record icon to the recording notification 2014-08-21 15:24:47 -07:00
Richard Alam
77dc5b1c1c Merge pull request #371 from SenecaCDOT-BigBlueButton/upload-presentation-window-miscs 
Properly resized upload presentation window, removed unnecessary text
 2014-08-21 15:31:38 -04:00
syeshchenko
85d3e5f72a properly resized upload presentation window, removed unnecessary text 2014-08-21 10:48:13 -07:00
Fred Dixon
a7b074df98 Merge pull request #370 from SenecaCDOT-BigBlueButton/mac-chrome-allow-audio-window 
when on Mac - move chrome audio image to the right
 2014-08-20 17:34:11 -04:00
syeshchenko
d564292cd8 when on Mac - move chrome audio image to the right 2014-08-20 14:19:18 -07:00
Richard Alam
29ac6397ef Merge pull request #369 from SenecaCDOT-BigBlueButton/enable-raisehand-for-all 
fixed raise hand, and fixed an issue with the users grid roll over
 2014-08-20 15:13:57 -04:00
Chad Pilkey
0b22dc8008 fixed raise hand for non-viewers, and fixed a long standing issue with the users grid roll over 2014-08-20 11:45:52 -07:00
Richard Alam
0ff3deb673 - add support for pre-built config xml 2014-08-20 11:43:12 -07:00
Richard Alam
d6aac8f24b - minor reorg 2014-08-20 11:41:54 -07:00
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