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

4286 Commits

Author SHA1 Message Date
Richard Alam
3579ad2122 - prevent dispatching of join event twice whihc triggers loading of modules twice 2015-01-14 21:04:43 +00:00
Richard Alam
083d85687c - fix formatting 2015-01-14 19:44:34 +00:00
Richard Alam
eca5c391bf - display the correct number of modules when loading. 2015-01-14 19:40:35 +00:00
Richard Alam
19044cacb2 - update locales 2015-01-06 15:24:57 +00:00
Richard Alam
3bb8c97f74 - change default chat font size to 12 2015-01-05 20:06:21 +00:00
Lucas Zawacki
2bf4b30b10 Use hostname instead of host on javascript webrtc bridge client code 
This prevents it from appending the port number when a request is made from
the HTML5 client
 2014-12-17 22:58:06 +00:00
Chad Pilkey
8b7d0ddb24 font size in config, and two bugs with private chat squashed 2014-12-11 13:16:38 -08:00
Chad Pilkey
716d1f974b taking another shot at fixing the chat list stack overflow 2014-12-10 16:40:38 -08:00
Chad Pilkey
2b78ed2c09 reworked the layout pushing so that viewers don't get new rows 2014-12-10 11:17:33 -08:00
Chad Pilkey
0a1c74ce07 Merge remote-tracking branch 'upstream/master' into add-chat-fontsize-config 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/services/ChatMessageService.as
 2014-12-08 13:11:34 -08:00
Chad Pilkey
c96e78d829 chat scrolling should be more robust and not rely on events firing 2014-12-08 13:07:40 -08:00
Richard Alam
5667ea4156 - update locales from transifex 2014-12-05 11:05:42 -08:00
Richard Alam
3e4f2d930a Merge pull request #457 from SenecaCDOT-BigBlueButton/fix-chat-scrolling 
Rewrote chat scrolling so that it always scrolls as far down as possible
 2014-12-04 17:46:28 -05:00
Chad Pilkey
f12ac62a47 rewrote chat scrolling so that it always scrolls as far down as possible 2014-12-04 14:39:21 -08:00
Richard Alam
878c81d04b Merge pull request #456 from mconf/fix-client-warnings 
Handle mxmlc warnings
 2014-12-03 15:18:47 -05:00
Felipe Cecagno
afdf4d5f4f few tweaks to handle the warnings during the compilation of bigbluebutton-client 2014-12-03 16:57:39 -02:00
Richard Alam
0b1678cfd1 - fix issue https://code.google.com/p/bigbluebutton/issues/detail?id=1830 2014-12-02 10:54:21 -08:00
Richard Alam
d300b52fba Merge pull request #454 from SenecaCDOT-BigBlueButton/fix-presentation-mouseup 
Moved the whiteboard mouseup listener to the stage
 2014-12-01 18:25:18 -05:00
Chad Pilkey
5cdedb19b1 moved the whiteboard mouseup listener to the stage 2014-12-01 12:48:17 -08:00
Richard Alam
862bf0df0c Merge pull request #452 from SenecaCDOT-BigBlueButton/preload-slides 
Add the ability to preload slides
 2014-12-01 15:07:30 -05:00
Chad Pilkey
7774ac049d added a feature to pre-download the next 3 slides 2014-12-01 11:00:49 -08:00
Chad Pilkey
2bc0901ad9 added a missing variable type declaration 2014-12-01 10:59:09 -08:00
Richard Alam
630541abe2 Merge pull request #450 from mconf/fix1835 
Fix #1835
 2014-12-01 12:08:31 -05:00
Richard Alam
681c4a045e - disallow desktop sharing on Macs when using Chrome 38 and earlier 2014-11-27 14:45:30 -08:00
Richard Alam
73172a8336 - allow desktop sharing on Mac when using at least Chrome 38 2014-11-27 14:34:03 -08:00
Felipe Cecagno
af74d36576 if phone.skipCheck and the browser doesn't support webrtc, we have to setup the default microphone in order to enable the user to share 2014-11-27 18:24:26 -02:00
Chad Pilkey
f5e6adcd9e Merge pull request #415 from mconf/fix-record-tooltip 
Fix the record button tooltip when the locale is changed
 2014-11-27 13:14:23 -05:00
Chad Pilkey
acde1ef3ed Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into remove-chat-translation 2014-11-26 09:14:18 -08:00
Richard Alam
864143253b Merge pull request #441 from mconf/record-notification-config 
Recording notification configurable by the config.xml
 2014-11-26 10:06:21 -05:00
Chad Pilkey
fe09c20911 fixed a null reference in WebRTCCallManager 2014-11-25 15:39:50 -08:00
Chad Pilkey
5cbb059aa6 removed all of the old google translate code in apps and client 2014-11-25 15:17:06 -08:00
Felipe Cecagno
93352a7ea4 make the recording notification alert configurable by the config.xml 
the notification shows up to remind the moderator to click the record button and start the recording
 2014-11-25 17:50:11 -02:00
Felipe Cecagno
08e521ed9f improved the client check so now it uses sip.js and bbb_webrtc_bridge_sip.js from the bigbluebutton-client, so it's going to be easier to maintain; included some new callbacks on bigbluebutton-client related to the websockets; just after the webrtc test, the connection is closed 2014-11-16 19:53:37 -02:00
Richard Alam
ee4e5f1a47 Merge branch 'master' into upgrade-to-red5-nov-4-2014 2014-11-14 03:49:14 -08:00
Chad Pilkey
f78b234d0a Updated defaultLayout to match the localized key 2014-11-12 15:17:16 -05:00
Richard Alam
c30604bb3f Merge branch 'investigate-ping-pong-timers' into upgrade-to-red5-nov-4-2014 2014-11-12 10:59:12 -08:00
Chad Pilkey
e2f71bec3a changed two of the layout names 2014-11-11 11:29:34 -08:00
Chad Pilkey
a23cd2a7c9 added translation of the default layout definitions 2014-11-11 10:26:10 -08:00
Chad Pilkey
3b34e53efe Reenable the LayoutChangeEvent 2014-11-11 09:53:54 -08:00
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
Richard Alam
000ddbd9d7 - add more logging about the connection to red5 2014-11-07 22:09:49 +00:00
Chad Pilkey
65b820966d Changed the wording of the webrtc messages to make them easier to understand 2014-11-07 14:07:42 -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
Felipe Cecagno
eb77644841 fix the record button tooltip when the locale is changed 2014-11-05 18:52:42 -02:00
Richard Alam
4f6362168c Merge pull request #414 from SenecaCDOT-BigBlueButton/additional-timeout-case 
Stop the webrtc timeout timer when 'connecting' is received
 2014-10-30 16:57:52 -04:00
Chad Pilkey
b84992c5a0 Stop the webrtc timeout timer when 'connecting' is received 2014-10-30 13:54:35 -07:00
Richard Alam
c82f467f0f Merge pull request #413 from SenecaCDOT-BigBlueButton/ice-failed-case 
added an additional fail case for the WebRTC audio
 2014-10-29 18:21:31 -04:00
Richard Alam
e4868682e0 - update locales 2014-10-29 22:20:11 +00:00
Chad Pilkey
f84ae56e9a added an additional fail case for the WebRTC audio 2014-10-29 09:30:03 -07:00
Richard Alam
c3b0ba1353 - fix https://code.google.com/p/bigbluebutton/issues/detail?id=1692 2014-10-24 21:31:22 +00:00
Richard Alam
0c42c1371c - new signed applet valid until oct 30, 2015 2014-10-23 19:55:43 +00:00
Richard Alam
1068d594a8 - don't let viewers mute/unmute others through the webcam window 2014-10-23 18:59:06 +00:00
Richard Alam
4ba6b5ef0d - allow start/stop recording when doing autostarting recording 2014-10-21 21:11:46 -07:00
Richard Alam
9552b8a905 - fix https://code.google.com/p/bigbluebutton/issues/detail?id=1776 2014-10-20 23:06:07 -07:00
Richard Alam
5af452c39f - start implementing auto start recording 2014-10-20 03:39:44 -07:00
Fred Dixon
fb1535360b Merge pull request #407 from SenecaCDOT-BigBlueButton/more-webrtc-fixes 
WebRTC fixes
 2014-10-15 19:24:52 -04: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
Richard Alam
da59fb35e4 - updating locales 2014-10-12 07:12:50 -07:00
Fred Dixon
576e8badbd Merge pull request #406 from SenecaCDOT-BigBlueButton/update-audioselection-logout 
Minor client upgrades
 2014-10-10 20:49:12 -04:00
Chad Pilkey
e8d8a8b33d moved the AudioPathSelectionWindow resize function to initialize from creationComplete 2014-10-10 16:30:55 -07:00
Chad Pilkey
fdb763571d made AudioPathSelection less squished, added automatic redirect on logout 2014-10-10 16:11:03 -07:00
Richard Alam
a3f594172f - update locales from transifex 2014-10-07 09:29:31 -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
4ec65bc300 enhannced LoggedOutWindow to allow for easy reconnect 2014-10-06 15:07:22 -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
syeshchenko
14b401851d resized and positioned some of the components to fit with Russian and German locales, changed and added some Russian translation 2014-10-01 15:18:31 -04:00
Fred Dixon
c89b9c63d8 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2014-09-18 08:53:08 -04: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
Chad Pilkey
00ef1d50a1 fixed a crash related to deleting presentations, two ui problems with presentations, and cleaned up an event listener that wasn't used anymore 2014-09-17 11:47:25 -07:00
Richard Alam
90bf3ade5d - new jars with better controls for deskshare applet dragging and resizing 2014-09-17 10:33:17 -07:00
Richard Alam
58302721c0 Merge branch 'chrome-camera-settings' of https://github.com/SenecaCDOT-BigBlueButton/bigbluebutton into SenecaCDOT-BigBlueButton-chrome-camera-settings 2014-09-15 13:36:24 -07:00
syeshchenko
4a1c793390 fixed Chrome permission hint arrow 2014-09-15 13:28:26 -07:00
Richard Alam
a0a6172a4f - fix lock settings for muteme and webcam buttons for mods and presenter 2014-09-15 09:38:05 -07:00
Fred Dixon
35cad7b4f8 Merge pull request #395 from SenecaCDOT-BigBlueButton/use-nginx-for-audio 
change the webrtc websocket connection to use an nginx proxy
 2014-09-14 18:32:20 -04:00
Chad Pilkey
e15de759e3 change the webrtc websocket connection to use an nginx proxy 2014-09-14 13:49:12 -07:00
Richard Alam
d03f532b08 - ignore transifex dir when building locales 2014-09-12 13:13:34 -07:00
Richard Alam
6ca675fd83 - update locales 2014-09-11 12:16:08 -07:00
Chad Pilkey
2c6b060ba5 replace deprecated escape() with encodeURIComponent() 2014-09-09 14:27:03 -07:00
Chad Pilkey
681aedbdde fixed the glowing listen only indicator 2014-09-09 09:24:55 -07:00
Richard Alam
025ac35c3a Merge pull request #390 from SenecaCDOT-BigBlueButton/slide-zoom-change-presenter-sync 
fixed 'zoom slider won't update value after presenter have changed'
 2014-09-08 14:54:43 -04:00
Richard Alam
4c312d5c2e Merge pull request #388 from speakserve/copy-chat-selection 
Copy chat selection as text
 2014-09-08 14:54:29 -04:00
Richard Alam
83d15332d6 Merge pull request #387 from SenecaCDOT-BigBlueButton/chrome-webcam-permission-prompt 
Chrome webcam permission prompt
 2014-09-08 14:54:09 -04:00
syeshchenko
fb3966921e fixed 'zoom slider won't update value after presenter have changed' 2014-09-04 13:22:33 -07:00
Chad Pilkey
b65da7ec25 hide switch presenter for phone users, hide presentation thumbnails when you click the presentation 2014-09-03 14:32:34 -07:00
Mateus Dalepiane
f5cb6f4725 Improved multicamera support 
An array is used to store the stream names, instead of using a single string to
store them all.
 2014-09-03 16:28:33 -03:00
Chad Pilkey
8825f0a899 Merge remote-tracking branch 'upstream/master' into sort-raisehand-better 2014-09-02 13:42:00 -07:00
Chad Pilkey
ecfe3831b2 stop webrtc hangup from happening twice 2014-09-02 13:41:48 -07:00
Chad Pilkey
5fa76a872f adjust the positioning of the webrtc chrome title window 2014-09-02 13:41:22 -07:00
Ghazi Triki
c01d91ddaf Setting ChatMessageRenderer Text event listener to keyDown 2014-09-02 21:15:54 +01:00
syeshchenko
8b9c949818 minor bug fixes and optimization 2014-09-02 12:38:08 -07:00
Ghazi Triki
2d283e85b0 Copying chat text selection from mx_internal text field. 2014-09-02 20:11:57 +01:00
Richard Alam
0d3e23db21 - update locales 2014-09-02 12:01:20 -07:00
Ghazi Triki
9597c0cca7 Copy chat message selection. 2014-09-02 19:29:24 +01:00
Fred Dixon
e02476071d Make clear this is a private echo test 2014-09-01 16:48:00 -04: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
2c67bf44ea - move deskshare view control to the top of the window 2014-08-29 13:29:01 -07:00
Richard Alam
a79bea7a3d Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2014-08-29 08:58:01 -07:00
Richard Alam
172738534c - fix issue where rectangle shape gets lost when zooming 2014-08-29 08:57:34 -07:00
Richard Alam
117c69e557 - try to fix error when querying for browser type 2014-08-29 08:57:02 -07:00
Fred Dixon
88a0455248 Tweak phrasing for private echo test 2014-08-29 11:51:31 -04:00
Fred Dixon
1683067559 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2014-08-29 11:48:39 -04:00
Ghazi Triki
1c74e58a9f MainApplicationShell mdiCanvas height binded to the application height instead of its parent heignt. 2014-08-28 23:26:01 +01:00
Ghazi Triki
8db78cbe6d Renamed BigBlueButtonMainPanel to BigBlueButtonMainContainer and transformed to a Canvas. 2014-08-28 23:25:16 +01:00
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
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
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
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
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
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
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
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
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
Chad Pilkey
893c977ec9 forgot to add the new config property to the template 2014-06-05 14:04:19 -07:00
Chad Pilkey
632096fd64 the phone option is now somewhat configurable 2014-06-05 13:52:37 -07:00
Chad Pilkey
9b86798f21 cleaned up the file upload window and made it so that when you click the file name it will open the native file dialog 2014-06-04 11:47:24 -07:00
Richard Alam
8015eeeecd Merge branch 'merge-polling-with-master' of github.com:bigbluebutton/bigbluebutton into merge-polling-with-master 2014-06-03 19:20:44 -07:00
Richard Alam
3051bf9dd5 - change color of user talking icon glow 2014-06-03 19:19:47 -07:00
Richard Alam
d7b6918340 Merge pull request #330 from SenecaCDOT-BigBlueButton/fix-webrtc-dialogs 
add audio selection window
 2014-06-03 19:36:52 -04:00
Chad Pilkey
344103922a moved the webrtc call failed alertbox text to locales 2014-06-03 13:14:05 -07:00
Chad Pilkey
b1da215ac2 if presenterShareOnly is true don't switch moderators to listen only when presenter changes 2014-06-03 12:14:51 -07:00
Chad Pilkey
cfc49f51d5 Merge pull request #319 from SenecaCDOT-BigBlueButton/fix-presentation-control-bar 
Fix presentation control bar
 2014-06-03 12:07:21 -04:00
Chad Pilkey
f6cb040908 moved the audio selection window strings to the locale file 2014-06-03 09:00:41 -07:00
Chad Pilkey
d0618c1a03 added presenterShareOnly, error popup when webrtc fails with option to fallback to flash 2014-06-02 15:16:52 -07:00
Chad Pilkey
b9afd0e36b fixed a null pointer exception when the mic is not found 2014-06-02 09:23:13 -07:00
Chad Pilkey
e1a56c45ba Merge remote-tracking branch 'upstream/merge-polling-with-master' into fix-webrtc-dialogs 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml
 2014-06-02 08:59:33 -07:00
Richard Alam
19ac02fab2 - enable polling by default 2014-06-02 07:44:46 -07:00
Richard Alam
26a142b49a - make window smaller 2014-06-01 18:17:07 -07:00
Richard Alam
e0f65acffd - make viewer init the polling module properly 2014-06-01 09:22:07 -07:00
Chad Pilkey
02e6a98f1c removed some unused managers from the phone module 2014-05-30 15:20:00 -07:00
Chad Pilkey
19ce05b31b created an audio selection window to choose your stream type 2014-05-30 15:19:25 -07:00
Chad Pilkey
91d2e1d288 removed the background from the listen only indicator image 2014-05-30 15:15:38 -07:00
Richard Alam
93c3ef7d05 - try to figure out how layout changes on window resize 2014-05-30 14:23:40 -07:00
Richard Alam
c806b4364f - continue modifyng the layout module to sync with others when windows are resized 2014-05-30 13:54:40 -07:00
Richard Alam
39fa4f2db1 - modify how we send lock and broadcast layout from client 2014-05-30 11:08:47 -07:00
Richard Alam
04c271996d Merge branch 'broadcast-layout' of github.com:mconf/bigbluebutton into broadcast-layout 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/layout/LayoutApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/layout/LayoutService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/layout/LayoutApp.scala
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/events/LayoutEvent.as
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/services/LayoutService.as
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/services/MessageReceiver.as
 2014-05-29 11:21:01 -07:00
Felipe Cecagno
5821c32372 implemented the new button broadcast layout, which will send to all viewers the moderator's current layout; the lock button and broadcast button only affect viewers, not moderators 2014-05-29 12:19:40 -03:00
Richard Alam
224bea1f5f - sync layout with viewers 2014-05-29 07:06:44 -07:00
Jonata Teixeira Pastro
f931d6cf76 Merging branches feat1212 and new-videodock. 2014-05-28 21:02:23 +00:00
Jonata Teixeira Pastro
d8c431d056 Small fixes in config.xml.template 2014-05-28 20:54:39 +00:00
Jonata Teixeira Pastro
736140dd20 #Feature 1212: Small fixes in the presentation of the video. 2014-05-28 20:43:34 +00:00
Richard Alam
e254787276 - add layout to lock settings 2014-05-28 12:25:28 -07:00
Richard Alam
f87933cf76 - try to inject layout change when layout option is changed in lock settings 2014-05-27 19:00:38 -07:00
Richard Alam
79136feeba - presenter should not be affected by lock settings 2014-05-27 07:16:04 -07:00
Richard Alam
f8974e5922 - apply lock icon to viewers only 2014-05-27 06:57:22 -07:00
Richard Alam
ff8c210104 - still the lock icon is not updating properly 2014-05-26 14:24:29 -07:00
Richard Alam
320ee09231 - try to apply lock settings to moderator only 2014-05-26 14:13:07 -07:00
Jonata Teixeira Pastro
172950f6ae #Feature 1212: Implemented VideoWithWarnings class that encapsulates Camera warnings. The new class is used in the camera preview in CameraDisplaySettings and in the new video dock windows. 2014-05-26 19:50:10 +00:00
Jonata Teixeira Pastro
42b852f4a4 #Feature 1212: Implemented VideoWithWarnings class that encapsulates Camera warnings. The new class is used in the camera preview in CameraDisplaySettings and in the new video dock windows. 2014-05-26 19:48:41 +00:00
Richard Alam
068df39570 - add [Disabled] text beside feature name 2014-05-26 11:32:21 -07:00
Richard Alam
e7c5a343a9 - show lock icon when a settings are locked 2014-05-26 10:48:30 -07:00
Richard Alam
b550ba966f - disable/enable users list in chat window when private chat is enabled/disabled 2014-05-26 10:30:57 -07:00
Richard Alam
fb2fd12f3c - disable/enable chat for viewer when settings are changed 2014-05-23 19:33:27 -07:00
Richard Alam
8549159aad - try creating a chat conversation model 2014-05-23 14:43:01 -07:00
Richard Alam
71cff3bfe6 - extract some user code from flex module. Module should only be for the UI. 2014-05-23 13:24:01 -07:00
Richard Alam
6eee34b86c - remove some of the menu items for the gear icon 2014-05-23 10:29:09 -07:00
Richard Alam
87b776ad58 - fix sending of lock settings to server 2014-05-23 08:47:13 -07:00
Richard Alam
5c844ffeee - send lock settings to server 2014-05-22 11:41:59 -07:00
Richard Alam
1ab0b0a2c4 - send new lock settings to server 2014-05-22 11:13:00 -07:00
Richard Alam
1b8fa657ce - send lock settings from server to client 2014-05-22 08:30:46 -07:00
Chad Pilkey
b4b5e7793c Merge remote-tracking branch 'upstream/merge-polling-with-master' into fix-webrtc-dialogs 2014-05-21 12:33:34 -07:00
Chad Pilkey
679b899b74 first take at new audio dialogs 2014-05-21 12:14:08 -07:00
Richard Alam
f266067e1a - display message to user when auth token is invalid 2014-05-21 18:42:49 +00:00
Richard Alam
391dc9be5a - fix listen-only in get users reply 2014-05-16 17:26:51 +00:00
Richard Alam
5686b6871c - finish global audio...display speaker icon beside user's name when joined in listen-only mode 2014-05-16 15:24:22 +00:00
Richard Alam
42fcfe1055 Merge branch 'merging-global-audio' of github.com:mconf/bigbluebutton into merge-global-audio 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
 2014-05-12 10:39:25 -07:00
Felipe Cecagno
eb0a56bb13 refactoring part of the global audio server-side implementation 2014-05-11 22:31:35 -03:00
Richard Alam
eef2c87cd4 - cleanup 2014-05-05 18:45:18 +00:00
Jonata Teixeira Pastro
3c2296fd9a Minor corrections (null testing and aspect ratio correction 2014-05-02 20:50:59 +00:00
Jonata Teixeira Pastro
b90416846d Added priorityRatio property to config.xml.template 2014-04-30 15:17:35 +00:00
Jonata Teixeira Pastro
8a9df273eb Added priorityRatio option to config.xml.template 2014-04-30 11:52:48 -03:00
adam-sharpe
f428f046de Fixed presentation control for viewers 2014-04-24 15:51:00 -07:00
Felipe Cecagno
19e3a4b3f0 client side implementation is done, but having issues because the server calls three times disconnectedFromJoinVoiceConferenceCallback when the user leaves the listen only stream (need a server-side refactoring) 2014-04-24 19:41:22 -03:00
Tiago Daniel Jacobs
97ad5e28f4 Changes to support RTMPS connections 2014-04-24 17:16:03 -03:00
Felipe Cecagno
92eac1e988 Merge branch 'global-audio' into merge-global-audio 
Most of the client implementation is going to be rewritten on next commits.
 2014-04-23 16:13:40 -03:00
Felipe Cecagno
4d49b6f0f4 trying to deal with the webrtc connection failed 2014-04-22 18:13:18 -03:00
Jonata Teixeira Pastro
af99b9dfa6 Feature #1211: Minor corrections of aspectRatio problems. PriorityRatio property added to config.xml 2014-04-16 21:05:32 -03:00
Jonata Teixeira Pastro
8618bfef2c Indentation fix. 2014-04-10 18:00:07 +00:00
Jonata Teixeira Pastro
5f246ebe26 Indentation fix. 2014-04-10 17:52:00 +00:00
Jonata Teixeira Pastro
1cc8c5b82a Feature #1211: Prioritization of video dock on mouse click. 2014-04-10 17:01:07 +00:00
Jonata Teixeira Pastro
c6cc869b49 Feature #1211: Prioritization mode for videodock. Correcting commit a17c076..8d52fc5 2014-04-09 21:11:37 +00:00
Jonata Teixeira Pastro
8d52fc5c9f Feature #1211: Prioritization mode working with a fixed video element (first). 2014-04-09 21:01:18 +00:00
Jonata Teixeira Pastro
a17c076c35 Feature #1211: Partial implementation of prioritization mode; Optimal use of the canvas space in priorityMode. 2014-04-09 19:19:19 +00:00
Jonata Teixeira Pastro
7d888b2cfb Feature #1211: Partial implementation of prioritization mode; Horizontal split. 2014-04-08 20:00:48 +00:00
Jonata Teixeira Pastro
485adde68b Feature #1211: Partial implementation of prioritization mode; Vertical split. 2014-04-08 19:36:50 +00:00
Richard Alam
bee1320463 Merge branch 'merge-polling-with-master' into connect-bbb-apps-html5 
Conflicts:
	bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
 2014-04-08 19:07:37 +00:00
Jonata Teixeira Pastro
c7cafd35fe Feature #1211: Partial implementation of prioritization mode of a video window. Cases of 0 and 1 windows done. For 2 or more a static vertical division of the screen is made, the first window is given 2/3 of the screen and the others are disposed in the remaining space. 2014-04-08 15:58:02 +00:00
Anton Georgiev
2d89a73c0c Merge branch 'addMsgLib' of /home/ubuntu/dev/antonHtml5/bigbluebutton into connect-bbb-apps-html5 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/Room.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/RoomsManager.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessagingConstants.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessagingService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/RedisMessagingService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsHandler.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/ConversionUpdatesProcessor.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardService.java
	bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-apps.xml
	bigbluebutton-web/grails-app/conf/UrlMappings.groovy
	bigbluebutton-web/grails-app/conf/bigbluebutton.properties
	bigbluebutton-web/grails-app/conf/spring/doc-conversion.xml
	bigbluebutton-web/ivy.xml
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MessagingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/RedisMessagingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/presentation/imp/SwfSlidesGenerationProgressNotifier.java
 2014-04-08 15:55:04 +00:00
Jonata Teixeira Pastro
1f0fb4f9a0 Feature #1211 - Initial version of prioritized video dock functions findPriorityConfiguration and updateDisplayListHelperByPriority 2014-04-07 17:32:31 -03:00
Gustavo Salazar
1d647470b7 Skip flash error 2038 2014-04-04 12:15:13 -07:00
Richard Alam
3742ebc1c2 - prevent the user from rejoining meeting when meeting has ended 2014-04-02 19:45:58 +00:00
Felipe Cecagno
d599307543 commenting out the old video dock module 2014-04-01 15:00:46 -03:00
Richard Alam
214957e52c - localize text 2014-03-28 16:02:33 +00:00
Richard Alam
0e1945118f - fix toolbar icon display when user leaves voice conf using webrtc 2014-03-28 15:05:38 +00:00
Felipe Cecagno
50f2953453 Merge branch 'video-profiles' into new-videodock 2014-03-27 17:55:31 -03:00
Felipe Cecagno
4da4980a1f video profiles are now only identified by its name on the camera display settings (resolution was removed) 2014-03-27 17:53:28 -03:00
Felipe Cecagno
fad9a9a38b Merge branch 'multicamera-0.81' into new-videodock 
Conflicts:
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.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/ToolbarPopupButton.mxml
 2014-03-27 17:41:16 -03:00
Richard Alam
d007fecd9f - leave voice conference when logging out even if the browser hasn't fully redirected away from the client yet 2014-03-27 19:36:02 +00:00
Richard Alam
bddd6f747d i - fix issue where user cannot leave voice conference when clicking on headset icon 2014-03-27 15:23:28 +00:00
Richard Alam
7e528c6890 - don't connect using flash when we want webrtc 2014-03-26 20:40:37 +00:00
Richard Alam
cc624dfa5e - fix race condition where we hangup the chotest and join the conference at the same time. 
We should stop echo test then join voice conference.
 2014-03-26 19:00:39 +00:00
Richard Alam
963468d729 Merge branch 'merge-polling-with-master' into implement-join-voice-with-flash 2014-03-26 16:58:13 +00:00
Richard Alam
5fb8dee4cd - hide mic settings when user has joined the voice conference 2014-03-26 16:56:38 +00:00
Felipe Cecagno
68da29897b removing the black border 2014-03-26 11:03:37 -03:00
Felipe Cecagno
52a016bf3b fixed the issue when windows got different aspect ratio; cleanup 2014-03-26 11:03:28 -03:00
Felipe Cecagno
79f6b8daee making the video canvas border always visible 2014-03-26 10:25:38 -03:00
Felipe Cecagno
f6bd6fedae handling properly the permissions to mute 2014-03-26 10:25:12 -03:00
Richard Alam
9a001ed324 - close mic settings when user has joined voice conference 2014-03-25 21:33:58 +00:00
Richard Alam
4a495e0f6a - start stop echo test 2014-03-25 21:22:24 +00:00
Felipe Cecagno
89a96d2527 cleanup 2014-03-25 17:36:29 -03:00
Felipe Cecagno
c163d4783a improve the layout to avoid scroll bars 2014-03-25 17:08:42 -03:00
Richard Alam
e065b4a63b connect to echo test app 2014-03-25 20:05:33 +00:00
Felipe Cecagno
fc6b9ddabd better handling of voice events in the video camera; prettier transition between visible and invisible states in the mute btn 2014-03-25 14:46:19 -03:00
Richard Alam
cd552664bc - continue implementing joining voice conf using flash 2014-03-25 17:16:42 +00:00
Gustavo Salazar
9a2b05a7ee allow username with spaces 2014-03-24 17:18:39 -05:00
Felipe Cecagno
b4607f8f38 better icons in the video windows 2014-03-24 17:37:47 -03:00
Richard Alam
e27c8000f8 Merge branch 'merge-polling-with-master' into implement-join-voice-with-flash 2014-03-23 16:05:28 +00:00
Richard Alam
35daebbf86 - don't go through echo test again when user has already done it 2014-03-23 16:02:40 +00:00
Richard Alam
3f66908f4d - reinit mic 2014-03-21 22:08:50 +00:00
Richard Alam
bd0a54e9f1 - continue implementing Flash Mic Settings dialog 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/PhoneManager.as
 2014-03-21 21:43:19 +00:00
Richard Alam
ce3432fb1b - disable flash calling for webrtc testing 2014-03-21 14:37:09 +00:00
Richard Alam
0bc45659fc - show elcome message in chat window 2014-03-21 14:20:27 +00:00
Richard Alam
98d851c582 - add new commands 2014-03-20 20:46:46 +00:00
Richard Alam
5bb2a2cb2b - continue implementing join voice using flash 2014-03-20 19:10:09 +00:00
Richard Alam
148e3be430 - start implementing joining voice using flash 2014-03-19 21:34:09 +00:00
Felipe Cecagno
69ea5a3175 fully working version of the new videoconf window, still needs some UI tweaks to look better 2014-03-19 15:47:41 -03:00
Richard Alam
a08be6298f - implement flow for user to join vonce conf uwing webrtc 2014-03-18 19:14:27 +00:00
Richard Alam
bb5db33eac - implement user joining voice using webrtc 2014-03-17 19:47:45 +00:00
Felipe Cecagno
78f5761627 avoiding the main NetConnectionDelegate to trace for every cursor message 2014-03-16 22:08:31 -03:00
Felipe Cecagno
70ba73d388 implemented the very first version of the video dock without the internal windows as part of the videoconf module 2014-03-16 22:07:22 -03:00
firstuser
915f9aa3d7 - continue implementing mic settings for webrtc 2014-03-15 18:15:28 -07:00
Richard Alam
61d90933f4 - display different mic setting for ff and chrome 2014-03-14 22:44:53 +00:00
Richard Alam
04a77ddaca - figure out how to display mic permissions for FF and Chrome 2014-03-14 21:06:31 +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
4cc16f1b00 - add bin-debug dir to ignore 2014-03-14 16:03:23 +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
680fa7709a - minot cleanup 2014-03-12 18:36:33 +00:00
Richard Alam
dd0ed0df37 - fix query presentations from JS API 2014-03-12 14:18:14 +00:00
Richard Alam
31926bd26d - implement end and destroy meeting 2014-03-10 21:38:03 +00:00
Richard Alam
62f89ebe2d - start deskshare properly 2014-03-09 20:23:39 -04:00
Richard Alam
1a5251621d - display poll button if presenter when user joins 2014-03-02 18:16:52 -05:00
Richard Alam
a418190169 - sync presentation position for latecomer 2014-03-02 16:43:04 -05:00
Richard Alam
a535412629 - fix switching presentation 2014-03-02 15:15:42 -05:00
Richard Alam
46bb7633ca - fix undo and clear whiteboard 2014-03-06 20:35:00 +00:00
Richard Alam
bb11712a19 - display whiteboard shapes 2014-03-06 19:23:18 +00:00
Richard Alam
e27274bf8c - use wb id instead of pres/pagenumber for whiteboard 
- the whiteboard id matches presId/page id for the current page
 2014-03-06 16:37:03 +00:00
Richard Alam
6b855aa351 - start refactoring whiteboard 2014-03-05 21:43:35 +00:00
Richard Alam
2f9650d1d3 - fix uploading of presentation 2014-03-05 19:54:32 +00:00
Richard Alam
a43c942314 - fix upload 2014-03-04 22:51:35 +00:00
Richard Alam
371e2da0b0 - allow changing of page usng thumbnail 2014-03-04 20:52:23 +00:00
Richard Alam
09c9bfa9e5 - display page properly 2014-03-04 20:18:31 +00:00
Richard Alam
4f799f09b4 - sync page 2014-03-04 16:54:49 +00:00
Richard Alam
0b9f90348c - handle page moves 2014-03-04 15:34:07 +00:00
Richard Alam
a5c9932498 - fix go to next/previous page 2014-03-04 14:59:19 +00:00
Richard Alam
bc5f60923c - figure out why we can't get to the next page 2014-03-03 21:41:18 +00:00
Richard Alam
89e2f6363a - display presentation page 2014-03-03 18:39:04 +00:00
Richard Alam
fe30c034d8 - continue refactoring presentation on client 2014-02-28 22:48:24 +00:00
Richard Alam
10b4b6ee3a - fix compile issues 2014-02-28 19:26:58 +00:00
Richard Alam
c946687872 - continue refactoring presentation 2014-02-28 16:48:21 +00:00
Richard Alam
d15e8c3a5b - continue cleaning up presentation 2014-02-27 21:41:25 +00:00
Richard Alam
feb49951a5 - add presentation ids to presentation conversion 2014-02-27 17:23:44 +00:00
Richard Alam
32431f62c7 - missed one file 2014-02-25 02:45:37 +00:00
Richard Alam
d8933b322c - disable join button when doing an echo test 2014-02-24 23:56:09 +00:00
Richard Alam
5c3859aa23 - add echo test for voice 2014-02-24 21:45:00 +00:00
Richard Alam
dcfe856f46 - fix issue where users show up as joined voice when a client loads 2014-02-24 19:24:23 +00:00
Richard Alam
b78a0fa776 - remove auto switching to presenter from client if joining as the first moderator 
as this is now driven on the server side
 2014-02-21 22:50:02 +00:00
Richard Alam
944b04e3a7 - fix async errors when users join/leave voice 2014-02-21 22:26:12 +00:00
Richard Alam
ab7d328ba1 - fix issue where connection drops due to async error when joining voice conference 2014-02-21 21:41:56 +00:00
Richard Alam
8a2990284e - cleanup and formatting 2014-02-21 20:02:54 +00:00
Richard Alam
4fc48da1b2 - change user joining sequence 2014-02-20 21:39:29 +00:00
Richard Alam
02e3e8cbc3 - set up flow for validating auth token when user joins 2014-02-20 18:01:55 +00:00
Richard Alam
6159029711 - cleanup 2014-02-19 21:54:15 +00: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
Richard Alam
e05d310908 - removing dependency on FS userid to manage voice for each user 2014-02-19 19:23:17 +00:00
Richard Alam
b6e5bf8091 - fix some compile issues 2014-02-19 15:33:51 +00:00
Richard Alam
ae36cb7997 - try to fix why we can't handle user leaving voice 2014-02-18 19:07:07 -05:00
Richard Alam
3a5f4ad079 - handle user messages from the server 2014-02-18 16:57:35 -05:00
Richard Alam
7d484dc0ba - create individual messages 2014-02-14 17:05:50 -05:00
Richard Alam
67b591001a - move users model 2014-02-14 15:42:20 -05:00
Richard Alam
d922531288 - organize data model 2014-02-14 14:50:00 -05:00
Richard Alam
2f9364cdc1 - start implementing the models 2014-02-14 12:13:38 -05:00
Richard Alam
a60299d036 - start/stop recording button works now 
- need to work on record processing
 2014-02-13 16:02:43 +00:00
Richard Alam
0bd25997a9 - implement start/stop recording. 
- TODO: alert doesn't popup when clicking on the record button
 2014-02-12 18:25:28 -05:00
Richard Alam
948e1b323e Merge branch 'master' into merge-polling-with-master 2014-02-12 15:59:23 -05:00
Richard Alam
0e935d4927 - fix swithc presenter 2014-02-12 15:56:19 -05:00
Richard Alam
aa341b5b6f - fix issue where other users gets logged out when a user leaves the meeting 2014-02-12 15:33:30 -05:00
Richard Alam
6cef7ecdac - fix share webcam 2014-02-12 15:27:10 -05:00
Chad Pilkey
e3b617225e Merge pull request #305 from syeshchenko/presentationWindowFix 
FileUploader window fixes
 2014-02-12 13:04:00 -05:00
Richard Alam
d967f86750 - fix get users reply message 2014-02-12 12:33:28 -05:00
Richard Alam
0f59af0aad - fix voice users commands and events 
- TODO: figure out why we are not receiving mute/talk events from FS ESL
 2014-02-11 22:45:24 -05:00
syeshchenko
ed15780273 Centred the FileUploadWindow, restricted the width of file name to be shown in the list 2014-02-11 14:48:44 -08:00
Richard Alam
f071e65235 - finally! got presentation to work...needs some cleanup 2014-02-11 14:52:13 -05:00
Gustavo Salazar
901d7a1097 use mic permission image not only for chrome 2014-02-11 11:41:02 -08:00
Gustavo Salazar
8709d7fae8 Update browser versions for webrtc 2014-02-11 11:15:01 -08:00
Richard Alam
e30ef32867 - now sending correct messages to client 2014-02-11 13:33:14 -05:00
syeshchenko
df001f9c9a Centred the Close button 2014-02-11 08:32:58 -08:00
Gustavo Salazar
339608c813 update message for not webrtc capable browser 2014-02-10 14:16:05 -08:00
Richard Alam
c77ddd76d3 Merge branch 'master' into merge-polling-with-master 2014-02-10 21:49:36 +00:00
Gustavo Salazar
fd4a34bc57 Fit webrtc buttons in audio settings window. 2014-02-10 13:49:18 -08:00
Richard Alam
858f1fef88 - try to figure out why whiteboard history isn't working 2014-02-10 21:48:24 +00:00
Richard Alam
5552583bbe - fix typo as it's driving CHad nuts :) 2014-02-10 21:21:15 +00:00
Richard Alam
79d3146ce1 - synch presentation 
- however, whiteboard doesn't sync for latecomers
 2014-02-10 20:27:58 +00:00
Richard Alam
1f080c78e0 - now late comers can display current presentation page 2014-02-10 19:39:05 +00:00
Gustavo Salazar
edf9518a31 Merge master branch to add style in mic settings. 2014-02-10 11:03:15 -08:00
Richard Alam
20f3e41038 - alittle bit of formatting 2014-02-09 20:20:01 -05:00
Richard Alam
03d4b05217 - continue fixing presentation. Looks like it synchs. Need to fix why 
current page of presentation doesn't display for late comer.
 2014-02-09 15:51:05 -05:00
Richard Alam
d4b02df765 - fix go to slide message 2014-02-08 19:51:46 -05:00
Richard Alam
f12ec75377 - slowly making presentation work again 2014-02-08 17:56:13 -05:00
Richard Alam
aa8f68076f - try to figure out logging 
- send presentation messages as JSON
 2014-02-08 15:29:12 -05:00
Richard Alam
ff333b9232 - handle get presentation info message 2014-02-08 14:20:05 -05:00
Gustavo Salazar
ea0c763712 Merged with https://github.com/mconf/bigbluebutton/tree/webrtc_support 2014-02-07 16:56:23 -08:00
Richard Alam
cf321098ac - try to get presentation working again 2014-02-07 14:14:28 -05:00
Richard Alam
1430eff18d - update locales to show java7u51 2014-02-06 16:53:26 -05:00
syeshchenko
850558ac15 Disable file list when file upload process running 2014-02-05 11:06:57 -08:00
syeshchenko
06bf0fe049 Add file format hint message 2014-02-05 11:01:23 -08:00