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

4380 Commits

Author SHA1 Message Date
Chad Pilkey
d1ed8158eb the example poll now starts in the bottom right and the sizing is more accurate 2015-06-18 12:53:11 -04:00
Chad Pilkey
9e4e6c107b The resizable poll graphic now moves smoothly 2015-06-18 12:51:02 -04:00
Chad Pilkey
5bde72ada8 The poll visualization scales smoothly now 2015-06-18 12:49:07 -04:00
Pedro Beschorner Marin
05a643cef8 More reconnection control and some refactoring 2015-06-17 18:56:22 +00:00
Pedro Beschorner Marin
addd1b455b Avoid kicked user to reconnect 2015-06-16 20:49:34 +00:00
Chad Pilkey
6e7f4e9252 first pass of drawing the poll results and showing to the presenter 2015-06-16 10:47:19 -04:00
Richard Alam
7f06d2a766 - fix switch presenter display in user's list 2015-06-04 20:50:38 +00:00
Felipe Cecagno
9a68afd4ee dispatch successfully reconnected so modules can clean up before receive the latest updates; fixed updates on presentation and whiteboard when reconnected 2015-05-08 19:11:25 -03:00
Felipe Cecagno
19e54bfe66 refactored the autoreconnect capability 
- multiple disconnections are reestablished in order, first the main bigbluebutton connection, then the other connections
- if the user was sharing video, and the video connection drops, the video views close and it reconnect in a consistent state
- if the user is connected to webrtc and the main connection drops, the webrtc connection will still be active, then the server will send a UserLeft message to everyone and will reconnect the user as a phone user, so the UI continues consistent; when the user reconnects, it will reuse the voice information

IMPORTANT: modify external.xml in order to disable media timeout
/opt/freeswitch/conf/sip_profiles/external.xml:    <param name="rtp-timeout-sec" value="0"/>
 2015-05-08 12:43:25 -03:00
Felipe Cecagno
94a85470a0 cleanup 2015-05-08 12:38:19 -03:00
Felipe Cecagno
f8d5198177 implement time and multiple occurrences in the client warning window 2015-05-08 12:37:26 -03:00
Felipe Cecagno
884ae22d97 renamed a few functions on apps and client 2015-05-08 12:36:51 -03:00
Richard Alam
537786044c Merge pull request #637 from maxdoumit/Deskshare-TLS 
Deskshare tls
 2015-05-08 10:07:03 -04:00
maxdoumit
cd90de09f8 Changed names and removed unused function 2015-05-07 09:47:15 -07:00
maxdoumit
07aa31e936 Added missing config in the config.xml.template 2015-05-07 08:53:31 -07:00
maxdoumit
640c3dd4a0 Fixed bug, and added PORT support on the applet side 2015-05-07 08:40:57 -07:00
maxdoumit
d9e88b7620 Added TLS option for the screenshare applet 2015-05-06 12:18:28 -07:00
Felipe Cecagno
5fab4ae1c5 cleanup 2015-05-06 15:49:42 -03:00
Felipe Cecagno
f6c3b85744 Merge branch 'auto-reconnect' into HEAD 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoProxy.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/VideoWindow.mxml
 2015-05-06 15:22:29 -03:00
Felipe Cecagno
0d26ca639f new attempt to fix the line endings 
this particular file has windows line endings
 2015-05-06 15:12:42 -03:00
Felipe Cecagno
c0813c11dd fixing line ending (again) on VideoProxy 2015-05-06 14:54:33 -03:00
Felipe Cecagno
c23fcaef0d Merge branch 'auto-reconnect' into HEAD 2015-05-06 13:23:23 -03:00
Mateus Dalepiane
bdf9d7f68a Update video window talking status on creation 2015-04-29 15:43:24 -03:00
Mateus Dalepiane
0662a242aa Merge branch 'bigbluebutton/master' into 090-new-videodock 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/VideoHolder.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoWindowItf.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videodock/views/VideoDock.mxml
 2015-04-29 12:10:41 -03:00
Mateus Dalepiane
1d2f980f85 Reset line endings to original 2015-04-29 11:12:50 -03:00
Anton Georgiev
4fd25ca8fd fixed the tooltip for Apply for the lock settings window 2015-04-22 18:46:50 +00:00
perroned
554ce1d06b Merge remote-tracking branch 'bbb/master' into hangup-webrtc-call 
Conflicts:
	bigbluebutton-html5/app/client/main.html
	bigbluebutton-html5/app/client/stylesheets/style.less
	bigbluebutton-html5/app/client/views/chat/chat_bar.html
 2015-04-22 06:03:46 -07:00
Chad Pilkey
4cf9251610 Chrome can manually allow NPAPI until version 45, modified publish window to match 2015-04-20 11:56:50 -07:00
perroned
f0f28f2f76 Update method we check call status 2015-04-16 08:56:56 -07:00
perroned
59b02e3b2f Merge remote-tracking branch 'bbb/master' into hangup-webrtc-call 2015-04-15 05:49:32 -07:00
Chad Pilkey
3265e647b3 removed the layout sync code 2015-04-13 09:27:21 -07:00
perroned
19816f060e avoid conflict 2015-04-13 04:08:03 -07:00
Anton Georgiev
61d64ad9cc Merge branch 'listen-only-prototype' of github.com:perroned/bigbluebutton into listen-only-prototype 
Conflicts:
	bigbluebutton-html5/app/client/globals.coffee
 2015-04-10 19:21:40 +00:00
Anton Georgiev
c4edf0cbf3 prepend the callerIdName so it is recognized as a global audio user 2015-04-10 18:51:46 +00:00
Chad Pilkey
1e732c5b98 fix for issue 1635, some of the values needed to be reset 2015-04-09 15:23:28 -07:00
Felipe Cecagno
aa4ec0c1a8 fixed localization for context menu items on presentation window, using the same text as the buttons tooltip 2015-04-09 17:57:08 -03:00
Felipe Cecagno
bdb2ad585f keep custom context menu items in the users window when the window is minimized or maximized; translate the context menu items when the localization is changed 2015-04-09 17:45:19 -03:00
Felipe Cecagno
46ae3c606c Merge branch 'fix-context-menu' into fix-context-menu-on-master 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml
 2015-04-09 17:26:19 -03:00
Felipe Cecagno
8dd9ee08e0 created a new class CustomMdiWindow to proper handle the context menu 2015-04-09 17:21:37 -03:00
Fred Dixon
d355312715 Fixed typo in check for Chrome42OrHigher 2015-04-08 19:15:34 -04:00
Richard Alam
7970a26756 Merge pull request #603 from capilkey/-chrome-42-warning 
chrome 42 warning
 2015-04-08 18:18:41 -04:00
Chad Pilkey
d6bd54825f fixed the footer link 2015-04-08 15:14:47 -07:00
Chad Pilkey
b8bfedcded added a desktop sharing warning for Chrome 42 2015-04-08 14:31:55 -07:00
Richard Alam
ec23e69d3e - pdate locales 2015-04-08 21:30:39 +00:00
Chad Pilkey
b9427c391a made a bunch of layout changes, still doesn't work 100% correct 2015-04-08 13:15:29 -07:00
Chad Pilkey
daf23751f8 removed the layout reset on presenter switch 2015-04-06 12:06:55 -07:00
Chad Pilkey
397b9e1389 increased the height of a TextArea in the echo tests 2015-04-06 12:06:22 -07:00
Chad Pilkey
475cbb4756 removed some unused layout options 2015-04-06 12:05:46 -07:00
perroned
8467f40148 Documentation for listen only 2015-04-06 07:29:25 -07:00
Chad Pilkey
3f51358618 reworked the applet mouse listeners to simplify and improve the functionality 2015-04-02 11:45:30 -07:00
perroned
2580c24f6a cleaned up 2015-04-02 08:37:51 -07:00
Anton Georgiev
e1c4ae5f48 Merge branch 'listen-only-prototype' of github.com:perroned/bigbluebutton into listen-only-prototype 
Conflicts:
	bigbluebutton-html5/app/client/stylesheets/style.less
 2015-04-02 15:27:41 +00:00
Chad Pilkey
28b55f7df3 reset the TextToolbar position when it is made visible and avoid unnecessary redraws 2015-03-31 14:27:09 -07:00
Chad Pilkey
467538953d updated the webcam url regex to match the new userid format 2015-03-31 14:24:59 -07:00
Chad Pilkey
7d23a3adb1 reset the client layout even if the already selected item is clicked 2015-03-31 14:24:17 -07:00
Chad Pilkey
a082f8ede2 hopefully fix the flash mic list so that it repopulates 2015-03-31 14:22:10 -07:00
perroned
4e1ad3b42a Added extra field allowing for listen only 2015-03-31 12:35:09 -07:00
Richard Alam
1d32fb7dc4 - update locales 2015-03-27 21:58:21 +00:00
Chad Pilkey
6c6e092402 increase height of text in audio windows so it doesn't get cut off 2015-03-27 14:33:49 -07:00
Chad Pilkey
3245934d15 prevent enter from going into the input box 2015-03-27 14:33:15 -07:00
Chad Pilkey
3b5ab7cbbe improved the chat url regex 2015-03-27 14:32:27 -07:00
Richard Alam
2a0786d19c Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into fix-issue-1909 2015-03-25 21:15:20 +00:00
Richard Alam
315ac0688c - fix issue https://code.google.com/p/bigbluebutton/issues/detail?id=1909 2015-03-25 21:14:48 +00:00
Chad Pilkey
4814fe65a2 annotations now follow the mouse if it leaves the WhiteboardCanvas 2015-03-25 14:08:51 -07:00
Chad Pilkey
056f880a53 add URL parsing to private chat messages 2015-03-25 14:06:03 -07:00
Chad Pilkey
f7a99342b5 increase webrtc transfer timeout 2015-03-25 14:05:26 -07:00
Richard Alam
3f4bec3333 Merge pull request #585 from capilkey/fix-three-whiteboard-bugs 
Fix some whiteboard annoyances
 2015-03-25 10:11:01 -04:00
Chad Pilkey
7431f5186f reworked the pan and zoom so it breaks way less 2015-03-24 16:58:18 -07:00
Richard Alam
afa579b43e - comment out trace logs to minimize noise 2015-03-23 22:38:50 +00:00
Richard Alam
bd4b95b0af - fix https://code.google.com/p/bigbluebutton/issues/detail?id=1849 2015-03-23 22:28:28 +00:00
Chad Pilkey
80f44e5f21 switch from custom pop-up menu to modified combo box 2015-03-23 15:11:49 -07:00
Chad Pilkey
7a7619c311 avoid drawing the text tool input area outside the presentation bounds 2015-03-23 15:09:33 -07:00
Chad Pilkey
981d7c4d39 disable mouse input on the text annotations 2015-03-23 15:08:14 -07:00
Chad Pilkey
2423d934df remove unused TextDrawObject class, the real one is TextObject 2015-03-23 14:34:21 -07:00
Chad Pilkey
d8a3325337 moved 'Ready' text to locales 2015-03-23 14:33:16 -07:00
Richard Alam
1bc477e297 - pass external meeting id in client logs 2015-03-23 19:41:45 +00:00
Mateus Dalepiane
0a350a4ceb Client auto reconnection with bbb-voice 
The client reconnects automatically with bbb-voice if the connection
drops. Also, implemented mechanisms for auto reconnection of listen
only audio, but these are disabled because currently there is no way
to ensure that bbb-apps connection is already re-established.
 2015-03-20 17:21:50 -03:00
Mateus Dalepiane
cfbf739c01 Improve connection events handling in client voice 
NetConnection events Failed and Disconnected now trigger a
FlashLeftVoiceConferenceEvent and reset the module to the
initial state.
 2015-03-20 14:29:36 -03:00
Chad Pilkey
6bd3c4d1f4 Merge pull request #570 from BBBManager/bbb-lock-settings 
Bbb lock settings
 2015-03-20 13:09:17 -04:00
Mateus Dalepiane
d5e79788a6 Clean client users list when it connects to bbb-apps 
The list must be cleaned in case of re-connection, so the client
will have the most recent information about users.
 2015-03-20 14:04:28 -03:00
Mateus Dalepiane
246db98916 Fix indentation at AutoReconnect.as 2015-03-19 12:47:19 -03:00
Mateus Dalepiane
9ea7b3a7cb Move video NetStream creation to publish method 
The NetStream is not used until the client start publishing video,
therefore the NetStream creation may be delayed.

Also, removed redundant code on NetConnection closed handler. The
StopBroadcastEvent triggers the execution of stopBroadcasting(),
that does exactly the same thing.
 2015-03-19 12:30:20 -03:00
Felipe Cecagno
a06efd5490 setting back VideoProxy and VideoWindow to use Windows line ending (¬¬) 2015-03-19 12:02:57 -03:00
Felipe Cecagno
867e9b9b36 first attempt to use an auto-reconnection handler, still not working properly 2015-03-19 11:54:08 -03:00
Fred Dixon
c4d50d59dc Merge pull request #574 from capilkey/add-ready-notification 
Added a 'ready' notification when the client starts up for screen readers
 2015-03-18 19:53:09 -04:00
Fred Dixon
b214de3d2c Merge pull request #575 from capilkey/fix-webrtc-null-errors 
check for null before calling UA.stop()
 2015-03-18 19:52:57 -04:00
Chad Pilkey
afb5787941 check for null before calling UA.stop() 2015-03-18 15:36:29 -07:00
Chad Pilkey
c5e0436204 added a 'ready' notification when the client starts up for screen readers 2015-03-18 14:21:01 -07:00
Richard Alam
acc58d250f - lower log level when not able to load html5 client 2015-03-18 18:19:55 +00:00
Tiago Daniel Jacobs
8b429dcaa6 Process lock event for all users to make the UI consistent. 2015-03-16 20:44:27 +00:00
Tiago Daniel Jacobs
44e387b2dd Merge remote-tracking branch 'bbboficial/master' into bbb-lock-settings 2015-03-16 20:04:32 +00:00
Tiago Daniel Jacobs
64e72e9934 Fixed visibility of viewers locked label for a empty room with lockOnJoin false. 2015-03-16 20:03:56 +00:00
Tiago Daniel Jacobs
3c5ba8c5b9 Changing template to include the muteOnStart option 2015-03-16 18:06:41 +00:00
Richard Alam
3c73519ec3 - update locales 2015-03-13 15:18:11 -07:00
Fred Dixon
2bf6d05ca1 Merge pull request #565 from antobinary/meteor-endpoint 
meteor endpoint /html5client/check. update BigBlueButton.html
 2015-03-13 17:31:06 -04:00
Anton Georgiev
238f1e56ff meteor endpoint /html5client/check. update BigBlueButton.html 2015-03-13 20:43:32 +00:00
Tiago Daniel Jacobs
0f130e9f69 Removed unused property 2015-03-12 21:40:16 +00:00
Tiago Daniel Jacobs
f6139c5b4a Updating the config.xml with the lockOnJoin* properties 2015-03-12 21:23:36 +00:00
Tiago Daniel Jacobs
71d1d70a4e Hide label and checkbox of lockOnJoin configuration 2015-03-12 21:14:42 +00:00
Tiago Daniel Jacobs
e52262cf15 Added lockOnJoinConfigurable property to lock config (missed some files) 2015-03-12 20:52:52 +00:00
Tiago Daniel Jacobs
4fff479e03 Added lockOnJoinConfigurable property to lock config. 2015-03-12 20:52:38 +00:00
Richard Alam
778df2da9d Update ChatBox.mxml 2015-03-12 14:37:20 -04:00
Fred Dixon
c2d97d9cb6 Merge pull request #556 from matnunes/bugfix-1892 
Bugfix issue 1892 (ChatBox)
 2015-03-12 13:52:33 -04:00
Fred Dixon
2c5d4d105e Merge pull request #551 from bigbluebutton/bbb-lock-settings-fix 
Fixed problem when changing presenter with webcam
 2015-03-12 13:52:14 -04:00
Anton Georgiev
efc126f410 styled the wrong div 2015-03-10 16:11:56 +00:00
Anton Georgiev
edb667a419 minor styling changes 2015-03-10 15:28:39 +00:00
Tiago Daniel Jacobs
3c6601a5df Fixing infinite loop in the presenter change event. 2015-03-10 05:36:13 +00:00
Tiago Daniel Jacobs
f4087ab270 Fixing infinite loop in the presenter change event. 2015-03-10 05:34:22 +00:00
Anton Georgiev
ee69c62309 first check if the html5 client is running and then attempt to redirect the user 2015-03-06 22:44:13 +00:00
Anton Georgiev
deec36b411 style the redirect page a bit 2015-03-06 22:43:51 +00:00
Anton Georgiev
e77b295517 Merge branch 'master' into flash-redirect 2015-03-05 22:56:34 +00:00
Anton Georgiev
f62fd4ce31 due to this the html5 client was not able to join a voice conf without a flash user already joined 2015-03-05 21:10:27 +00:00
Anton Georgiev
0a79f0dc29 the redirection page offers installing Flash or redirection 2015-03-05 17:30:09 +00:00
Anton Georgiev
44429a6bd6 redirect user to HTML5 client if Flash not installed/enabled. Must be attendee (for now) 2015-03-04 23:51:33 +00:00
Fred Dixon
cf5ab25ca0 Revert "Revert "Bbb lock settings fix"" 2015-03-04 16:47:35 -05:00
Chad Pilkey
34fdfb9f83 Revert "Bbb lock settings fix" 2015-03-04 11:49:13 -05:00
Chad Pilkey
8de57dfc36 Fixed the WhiteboardModule definition in config.xml 2015-03-04 10:43:54 -05:00
Felipe Cecagno
2d00bda3ea removed an ObjectUtil.toString that was causing the entire UI to freeze when there was an async error on UserVideo 2015-03-04 11:57:34 -03:00
Tiago Daniel Jacobs
9d53c765fa Redoing the changes to PhoneButton due to conflict on merge 2015-03-03 07:04:47 +00:00
Tiago Daniel Jacobs
34e2e48be2 Merging 2015-03-03 06:52:56 +00:00
Tiago Daniel Jacobs
cc9fdc1a9e Fixed layouts combo state when presenter mode is turned on/off 2015-03-03 06:34:56 +00:00
Tiago Daniel Jacobs
0033e36384 Fixed state of webcam button when leaving presenter state 2015-03-03 06:34:10 +00:00
Tiago Daniel Jacobs
3060b2ea7d Implemented method to check if lock is in use or not, refactored to use it in entire code. 2015-03-03 05:01:58 +00:00
Tiago Daniel Jacobs
647c0a83bc Code clean up and fixes to lock settings 2015-03-03 04:49:56 +00:00
Tiago Daniel Jacobs
95cf0167f2 Restored ability to lock/unlock individual users 2015-03-03 00:44:34 +00:00
Tiago Daniel Jacobs
7cd5fff1d6 Fixed display of the lock on join flag 2015-03-02 19:25:26 +00:00
Tiago Daniel Jacobs
bf62dd66a2 Fixed mute on start, added lock on join option 2015-03-02 18:06:09 +00:00
Richard Alam
e8c61c5356 - lower log level on some logs so we can filter 
- add a detection when a meeting actor has hung resulting in users not being able to do anything
 2015-02-26 16:02:21 +00:00
Richard Alam
27bb493473 Merge pull request #530 from capilkey/improve-webrtc-logging 
Improvements to WebRTC
 2015-02-24 16:26:33 -05:00
Chad Pilkey
eb17e4a056 added extra logging information to TURN debugging 2015-02-24 12:15:01 -08:00
Chad Pilkey
c9939b1c7c fixed webrtc call failed callback 2015-02-24 12:14:25 -08:00
Chad Pilkey
4be1b5c2e3 remove disclaimer from bbblogger.js 2015-02-24 11:36:41 -08:00
Chad Pilkey
4336612830 fixed a null error and race condition with the TURN support 2015-02-24 11:36:14 -08:00
Chad Pilkey
0ebfec21f7 fixed an error with the webrtc warnings 2015-02-24 11:35:27 -08:00
Richard Alam
c1671f7a5d - remote stun related code 
- get meeting and user info so we can log more info when user fails to connect to Red5
 2015-02-20 19:54:24 +00:00
Richard Alam
7d7b29620d - change log level to warn 2015-02-18 15:48:23 +00:00
Richard Alam
65c35e1137 Merge pull request #520 from bigbluebutton/add-more-info-js-log 
- add more info into JS log
 2015-02-17 19:26:22 -05:00
Richard Alam
edaeaf6bf4 Merge pull request #521 from capilkey/webrtc-fixes 
WebRTC fixes
 2015-02-17 19:26:07 -05:00
Chad Pilkey
e6d3cd551d fixed a race condition in the webrtc javascript code, and added cause for error 1004 2015-02-17 16:11:42 -08:00
Richard Alam
931d1624d7 - add more info into JS log 2015-02-18 00:09:10 +00:00
Calvin Walton
8e7a34b5dd Add webrtc 1009 error to translations 2015-02-17 13:29:27 -05:00
Calvin Walton
1af70d8e4e Use configured stun/turn servers when making webrtc call 2015-02-17 12:00:04 -05:00
Richard Alam
797be9ce10 Merge pull request #515 from capilkey/fix-blurriness 
fix blurriness in the client caused by Flex SDK 4.14
 2015-02-13 14:11:14 -05:00
Chad Pilkey
941b044cd7 fix blurriness in the client caused by Flex SDK 4.14 2015-02-13 10:49:23 -08:00
Fred Dixon
0c5e427093 Merge pull request #514 from capilkey/pixel-align-fix 
move the pixel alignment check to a callback
 2015-02-12 18:57:29 -05:00
Chad Pilkey
537f5b6e9a move the pixel alignment check to a callback 2015-02-12 15:52:03 -08:00
Fred Dixon
aa518d6ef0 Merge pull request #513 from capilkey/cut-call-time 
Cut WebRTC call time
 2015-02-12 18:13:09 -05:00
Chad Pilkey
229f446914 remove help button from the layout correctly 2015-02-12 14:27:54 -08:00
Chad Pilkey
10874f986d move <script> tag to the correct place in BigBlueButton.html 2015-02-12 14:26:19 -08:00
Chad Pilkey
d6ef5168c0 add support for webrtc call transferring, cuts join time in half 2015-02-12 14:25:41 -08:00
Richard Alam
aa0e92137b - remove querying of stun from flash. We will be doing this outside in JS instead. 2015-02-12 18:29:39 +00:00
Chad Pilkey
81b567aebc Merge remote-tracking branch 'upstream/master' into fix-issue-1866 2015-02-09 11:52:43 -08:00
Chad Pilkey
5326b9cca2 fixed issue 1865 - fit-to-width zoom issues 2015-02-09 11:51:45 -08:00
Chad Pilkey
ab4dfdf4f3 fixed two issues with the text toolbar sticking around when it shouldn't 2015-02-09 11:51:00 -08:00
Richard Alam
cd9ef88567 - update locales 2015-02-09 16:30:23 +00:00
Fred Dixon
2ed3195fbc Update bbbResources.properties 
Change the copyright date to 2015
 2015-02-06 16:34:54 -05:00
Richard Alam
24b9c5c525 - store stun and turn servers in client 2015-02-06 21:05:12 +00:00
Richard Alam
cdc6daced8 - add support for configuring stun and turn servers 
- add new /stuns api to be called by the Flash client
 2015-02-06 19:46:56 +00:00
Chad Pilkey
ac220162dd add a context menu item to UserGrid to export user names 2015-02-04 12:33:08 -08:00
Chad Pilkey
ac373429b2 fix arrow keys in textboxes and slide change keybinds 2015-02-03 12:29:26 -08:00
Chad Pilkey
8eb7bc9ed8 Merge remote-tracking branch 'upstream/master' into fix-issue-1866 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoWindowItf.as
 2015-02-03 12:27:16 -08:00
Mateus Bisotto
1fffd18153 Fixed issue in chatbox related described in: https://code.google.com/p/bigbluebutton/issues/detail?id=1892 2015-02-03 10:12:47 -02:00
Chad Pilkey
d4b4950aaf fixed an exception in VideoWindowItf 2015-02-02 16:36:43 -08:00
Richard Alam
e2eea34830 - fix exception that broke sharing of webcam 2015-02-02 19:34:26 +00:00
Chad Pilkey
672348eafe labelling and tab order fixes for accessiblity 2015-01-30 08:03:36 -08:00
Chad Pilkey
364178857e reapplied the global shortcut keys 2015-01-29 10:03:13 -08:00
Chad Pilkey
69b250bea6 fixed the loading of the slide text 2015-01-29 10:02:12 -08:00
Felipe Cecagno
d728b730ab simplified the default profiles 2015-01-28 22:53:56 -02:00
Felipe Cecagno
4cebd2cd27 fixed the issue of duplicating video streams on a just joined user 2015-01-28 21:32:58 -02:00
Felipe Cecagno
5938984886 removed the videodock code which is not used anymore 2015-01-28 21:32:01 -02:00
Felipe Cecagno
9a7bae79a8 Merge branch '090-new-videodock' into HEAD 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	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/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/ToolbarButton.mxml
	record-and-playback/deploy.sh
 2015-01-28 20:33:28 -02:00
Felipe Cecagno
162e6899a4 added back the css for the video warning message 2015-01-28 19:18:58 -02:00
Chad Pilkey
9580a9c350 removed forceListenOnly option from the PhoneModule, use presenterShareOnly instead 2015-01-27 15:27:41 -08:00
Chad Pilkey
ef21d9a22e changed the java help delay from 3 to 7 seconds 2015-01-27 15:26:37 -08:00
Chad Pilkey
19fb9b9671 Revert "Revert "Added Java check to the configuration notifications"" 
This reverts commit 82545a03f3.
 2015-01-27 14:19:02 -08:00
Fred Dixon
82545a03f3 Revert "Added Java check to the configuration notifications" 2015-01-27 17:11:54 -05:00
Fred Dixon
57d82e3eb9 Merge pull request #490 from SenecaCDOT-BigBlueButton/client-pre-check 
Added Java check to the configuration notifications
 2015-01-27 17:11:36 -05:00
Chad Pilkey
84d6c5e132 added deskshare help information for Chrome users 2015-01-27 13:54:24 -08:00
Richard Alam
7f2caf852f - use the passed in authToken from bbb-web to validate in bbb-apps 2015-01-23 20:01:44 +00:00
Chad Pilkey
8cb29e1ccc Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into client-pre-check 2015-01-23 10:36:24 -08:00
Chad Pilkey
742bd1a423 added extra webcam warning for Chrome users 2015-01-21 14:21:26 -08:00
Chad Pilkey
8a3fca5d3b fix for issue 1868 2015-01-21 13:22:40 -08:00
Chad Pilkey
9032afdb38 Merge remote-tracking branch 'upstream/master' into client-pre-check 2015-01-21 11:41:24 -08:00
Chad Pilkey
80e58d1ee3 added java check to the configuration notifications 2015-01-21 11:40:55 -08:00
Richard Alam
26c6ca0fd1 - update locales from transifex 2015-01-20 18:47:19 +00:00
Richard Alam
95776a62bd - updating locales 2015-01-19 18:38:00 +00:00
Chad Pilkey
12d3a34ff5 change warnings to notifications 2015-01-19 10:22:15 -08:00
Chad Pilkey
5a9a2a0a6c minor tweaks to the configuration warnings 2015-01-16 13:39:44 -08:00
Chad Pilkey
9be9cca051 added a configuration warning system to the flash client 2015-01-15 16:14:49 -08:00
Chad Pilkey
fa7fa71f41 updated ChatOptions default fontSize to match config.xml.template 2015-01-15 15:19:00 -08:00
Chad Pilkey
f67c68e728 made the chat message spacing a little tighter 2015-01-15 15:16:38 -08:00
Chad Pilkey
985f08895a removed the unused jssip library 2015-01-15 15:15:30 -08:00
Chad Pilkey
94377d5da9 removed old js files from html experiment 2015-01-15 15:13:44 -08:00
Chad Pilkey
644ad523c5 removed the old Settings module 2015-01-15 15:12:24 -08:00
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