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

4889 Commits

Author SHA1 Message Date
Chad Pilkey
5a40d9095c the poll menu items are translatable now 2015-07-31 18:14:17 -04:00
Chad Pilkey
120ba2417e better positioned the menu in the UsersWindow 2015-07-31 17:12:41 -04:00
Chad Pilkey
9c69f60437 Changed the quick poll label to be more descriptive 2015-07-31 17:09:59 -04:00
Pedro Beschorner Marin
d826e309dc Fixing view tooltip and configuring sizes 2015-07-31 16:00:41 +00:00
Pedro Beschorner Marin
fdc90d569e Formatting shared notes text 2015-07-31 15:22:59 +00:00
Ghazi Triki
d906e6599e Merge branch 'development' into tab-indexer 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
 2015-07-31 09:36:59 +01:00
Ghazi Triki
4e6a215033 Added missing comma in a LOGGER call for VideoEventMapDelegate class. 2015-07-30 20:33:35 +01:00
Ghazi Triki
0ab06495bc Fixed VideoProxy class imports. 2015-07-30 16:34:22 +01:00
Ghazi Triki
7a8737cfaf Merge branch 'development' into as3-logging 
Conflicts:
	bigbluebutton-client/src/BigBlueButton.mxml
	bigbluebutton-client/src/BigBlueButtonMainContainer.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoProxy.as
 2015-07-30 09:31:05 +01:00
Ghazi Triki
31892ca0de Force showing logs in trace before the configuration is loaded. 2015-07-30 09:25:13 +01:00
Richard Alam
85529a131e - fix logging 2015-07-29 21:20:27 +00:00
Richard Alam
386c870583 - log all state changes to connection. Hoepfully we can narrow down why disconnects occur to bbb-video. 2015-07-29 20:03:38 +00:00
Ghazi Triki
83666a7caa Merge branch 'development' into as3-logging 
Conflicts:
	bigbluebutton-client/src/BigBlueButtonMainContainer.mxml
	bigbluebutton-client/src/org/bigbluebutton/core/services/UsersService.as
	bigbluebutton-client/src/org/bigbluebutton/main/maps/ApplicationEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/Conference.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainCanvas.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/WebRTCEchoTest.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/services/MessageReceiver.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/managers/PublishWindowManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/services/red5/Connection.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopViewWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/ConnectionManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/FlashCallManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/WebRTCCallManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/polling/service/PollDataProcessor.as
	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/UserGraphicHolder.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/PollResultObject.as
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/models/WhiteboardModel.as
 2015-07-29 19:44:29 +01:00
Richard Alam
75343449a8 Revert "Updated application lifecycle : the application configuration is loaded before displaying the main application shell, all loaded resources will then be able to access the configuration without any issue." 
This reverts commit b5af206a43.
 2015-07-29 17:59:48 +00:00
Richard Alam
b5c2a0a7e9 Merge pull request #711 from riadvice/lifecycle-update 
Updated application lifecycle: load the configuration before display
 2015-07-29 11:41:56 -04:00
Pedro Beschorner Marin
5519278153 Merge remote-tracking branch 'bigbluebutton/pedrobmarin-development-auto-reconnect' into pedrobmarin-development-auto-reconnect 2015-07-27 20:03:43 +00:00
Pedro Beschorner Marin
b7580fe814 Closing Flash phone connection if user leaves Flash audio. 2015-07-27 20:02:19 +00:00
Richard Alam
df58235432 - Merge branch 'development' of https://github.com/bigbluebutton/bigbluebutton into pedrobmarin-development-auto-reconnect 
- fix webcam auto-reconnect issue
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoProxy.as
 2015-07-27 19:58:56 +00:00
Felipe Cecagno
210cd92e50 Merge remote-tracking branch 'bigbluebutton/v0.9.0-release' into mconf-live0.7.1 
Conflicts:
	bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.9.0.jar
	bigbluebutton-client/resources/prod/bbb-deskshare-applet-unsigned-0.9.0.jar
	bigbluebutton-config/web/index.html
 2015-07-27 16:58:55 -03:00
Felipe Cecagno
e3f2df289b new deskshare applet signed by RNP, with Mconf logo 2015-07-27 16:26:13 -03:00
Felipe Cecagno
89b44cef06 refactored a bit the behavior of the audio ToolbarButton, so creationComplete and click uses the same code 2015-07-27 16:23:43 -03:00
Pedro Beschorner Marin
51a7d21ddd We still need this to close the loading bar. Added a control to avoid reconnection exception. 2015-07-27 18:07:41 +00:00
Richard Alam
30d1a86ce2 Merge pull request #722 from ritzalam/log-bbb-video-disconnection 
- do not disconnect when stream has stopped
 2015-07-27 12:02:53 -04:00
Richard Alam
14d6fdcb12 - do not disconnect when stream has stopped 2015-07-27 16:01:05 +00:00
Richard Alam
1275cbcf89 Merge pull request #721 from ritzalam/log-bbb-video-disconnection 
Log bbb video disconnection
 2015-07-27 11:35:39 -04:00
Richard Alam
3a6c02969e Merge pull request #720 from ritzalam/log-webrtc-failure 
Log webrtc failure
 2015-07-27 11:34:56 -04:00
Richard Alam
d00fcf2da6 - add more logging to see why webcams get disconnected 2015-07-27 15:32:51 +00:00
Richard Alam
662e151524 - log wbertc test failure 2015-07-27 15:30:37 +00:00
Felipe Cecagno
5782741d29 fixed the way we load the background, so if the crossdomain file is defined, we can smooth the image, otherwise we show the image anyway (Bitmap vs. Image); fixed the calculation we do to resize the background image 2015-07-27 11:26:58 -03:00
Ghazi Triki
c03c6519e6 Reverted back JS logging classes because they are used for monitoring. 2015-07-25 12:12:49 +01:00
Chad Pilkey
3be37e99ac added a quick poll button, feedback is appreciated 2015-07-24 18:35:30 -04:00
Richard Alam
6a1a7e796a - make sure we are connected first before vieweing deskshare stream 2015-07-24 19:59:54 +00:00
Richard Alam
7ee48e9397 - stop desktop sharing when presenter get disconnect from red5/deskshare app 2015-07-24 19:01:27 +00:00
Pedro Beschorner Marin
20085e0f3b Merge remote-tracking branch 'origin/auto-reconnect' into pedrobmarin-development-auto-reconnect 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/LoadingBar.mxml
 2015-07-24 13:25:25 -03:00
Richard Alam
9ef59a41c6 - fix client exception 2015-07-24 16:13:17 +00:00
Richard Alam
bad00ed7c1 Merge branch 'development' into pedrobmarin-development-auto-reconnect 2015-07-24 16:01:04 +00:00
Pedro Beschorner Marin
24619cad08 Added localization and testing parenting in Loading window 2015-07-24 16:00:59 +00:00
Richard Alam
27c8b521fb - fix https://code.google.com/p/bigbluebutton/issues/detail?id=1953 2015-07-24 16:00:30 +00:00
Richard Alam
4b552329d7 Revert " - fix https://code.google.com/p/bigbluebutton/issues/detail?id=1953" 
This reverts commit 94df500ba6.
 2015-07-24 15:59:42 +00:00
Richard Alam
94df500ba6 - fix https://code.google.com/p/bigbluebutton/issues/detail?id=1953 2015-07-24 15:35:39 +00:00
Felipe Cecagno
4a8c2ccc05 updated the translations of es_LA from transifex 2015-07-23 23:40:05 -03:00
Richard Alam
d63b54d291 Merge branch 'development' of https://github.com/pedrobmarin/bigbluebutton into pedrobmarin-development 2015-07-23 19:45:19 +00:00
Pedro Beschorner Marin
1eef689a0a Cleanup 2015-07-23 19:08:06 +00:00
Pedro Beschorner Marin
b1ccea37a1 Merge branch 'auto-reconnect' into development 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/freeswitch/FreeswitchConferenceActor.scala
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoProxy.as
 2015-07-23 18:44:21 +00:00
Chad Pilkey
abab8c3e3b added an accessible poll results chat message 2015-07-23 13:06:46 -04:00
Chad Pilkey
be0e43baa2 translate the poll answers 2015-07-23 13:06:09 -04:00
Ghazi Triki
a4d243b202 Added TabIndexer class for automating tab indexation. 2015-07-23 13:02:32 +01:00
Ghazi Triki
b5af206a43 Updated application lifecycle : the application configuration is loaded before displaying the main application shell, all loaded resources will then be able to access the configuration without any issue. 2015-07-22 19:08:13 +01:00
Felipe Cecagno
880befcba7 fix untranslated string to pt_BR 2015-07-22 11:35:11 -03:00
Felipe Cecagno
0015dc2c6f updated es_LA translation from transifex 2015-07-22 11:34:59 -03:00
Felipe Cecagno
24be80a3eb fixed the bug which disallow users to enable microphone when the server is configured as forceListenOnly=true 2015-07-22 11:12:48 -03:00
Ghazi Triki
632df068ad Added logging entry to application configuration. 2015-07-22 11:59:15 +01:00
Ghazi Triki
4202fcdcf0 Added new client logging target LogWindowTarget. 2015-07-22 10:01:45 +01:00
Richard Alam
134facbbf4 - make webcam stream a live stream 2015-07-21 20:15:53 +00:00
Ghazi Triki
eafaac15f6 - Added JSNLogTarget for jsnlog library. ( still experimental because too slow ). 
- Removed JSLog and JSLogger classes to unifiy JavaScript logging output.
 2015-07-21 05:39:36 +01:00
Ghazi Triki
053ec095a0 Use of as3commons-logging-2.7 library to update all the client logging using TraceTarget. 2015-07-20 16:51:04 +01:00
Chad Pilkey
be9971c2cd fixed the weird colouring in the TitleWindow headers and removed uneeded duplication in CSS 2015-07-17 18:06:11 -04:00
Chad Pilkey
387c0770e3 added some extra content to the PollResultsModal 2015-07-17 18:05:29 -04:00
Pedro Beschorner Marin
ca6fbc31b6 Syncing note names for new users 2015-07-15 14:59:18 +00:00
Richard Alam
4de982bf7c - set the font of polling to arial 2015-07-14 20:28:43 +00:00
Pedro Beschorner Marin
2b8b315ef5 Adding name to shared notes windows 2015-07-14 20:22:21 +00:00
Richard Alam
7c862a10aa - change the background color of poll result and size of window 2015-07-14 19:40:09 +00:00
Richard Alam
aa630e52fb - hardcode poll result display position on server side so different clients won't have to recalculate 
position
 2015-07-14 18:45:55 +00:00
Richard Alam
909091d426 - display poll result in lower-right corner of presentation 2015-07-14 18:14:21 +00:00
Richard Alam
9958479077 - reset presentation page to 100% when starting poll 2015-07-14 18:13:56 +00:00
Richard Alam
c1ccc79b28 - handle number of responders in client 2015-07-14 15:28:13 +00:00
Chad Pilkey
22b7d7bc69 remove the hardcoded poll whiteboard position 2015-07-13 17:20:30 -04:00
Chad Pilkey
abc3966598 clear the vote buttons when the results are published 2015-07-13 13:51:06 -04:00
Pedro Beschorner Marin
5dfa655003 Removed unused resource 2015-07-13 17:42:51 +00:00
Chad Pilkey
9f5ebab201 clean up some unused code in PresentationWindow 2015-07-13 13:30:57 -04:00
Chad Pilkey
bf96c3a4bf hide the poll start button when the polling module is absent 2015-07-13 13:30:14 -04:00
Richard Alam
25ea23eb8d Merge pull request #693 from riadvice/improve-gitignore 
Improved .gitignore files with better patterns.
 2015-07-13 11:58:03 -04:00
Richard Alam
57cc039f9a Merge pull request #694 from capilkey/fix-issue-1964 
Fix issue 1964 - Meeting name label truncation
 2015-07-13 11:57:46 -04:00
Chad Pilkey
c06b1f9919 turn scrollpolicy off in MainApplicationShell 2015-07-10 12:51:12 -04:00
Chad Pilkey
0132f62f65 fixed issue 1964 making meeting name label truncate 2015-07-09 18:45:19 -04:00
Ghazi Triki
1ac5a308b5 Improve .gitignore files with better patterns. 2015-07-09 16:13:09 +01:00
Richard Alam
95ff9d0925 - specify location of poll result display 2015-07-08 20:57:16 +00:00
Pedro Beschorner Marin
d1bce6ffe0 Closing users video windows before trying to open new ones 2015-07-08 19:15:50 +00:00
Richard Alam
6783e709e9 - display poll result as whiteboard shape. 2015-07-07 21:37:21 +00:00
Pedro Beschorner Marin
c1d80eeda8 Querying for paricipants when reconnected 2015-07-07 16:50:03 +00:00
Richard Alam
a83428301a - poll result message now compes into the client but doesn't get displayed in the whiteboard 2015-07-06 22:12:40 +00:00
Pedro Beschorner Marin
028e5a4784 Updating Shared Notes when user reconnects 2015-07-03 15:07:46 +00:00
Pedro Beschorner Marin
324ed1b9ab Merge branch 'auto-reconnect' into mconf-live0.6.4 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/branding/default/style/css/assets/images/icons-license.txt
	bigbluebutton-client/src/org/bigbluebutton/main/maps/ApplicationEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/AutoReconnect.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/Conference.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoProxy.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
 2015-07-03 14:35:08 +00:00
Pedro Beschorner Marin
ed12579fb0 Some refactoring 2015-07-03 12:29:44 +00:00
Chad Pilkey
8abe9e04a5 add the PollGraphic to the shape 2015-07-02 18:42:51 -04:00
Chad Pilkey
c20768efc9 Merge remote-tracking branch 'upstream/development' into poll-client 2015-07-02 18:39:52 -04:00
Chad Pilkey
772e03bca7 added a new shape for poll results 2015-07-02 18:38:20 -04:00
Richard Alam
4b604d8e56 - fix issue where only presenter gets polling message from server 2015-07-02 20:43:16 +00:00
Richard Alam
8097f58e3f Merge branch 'development' of https://github.com/bigbluebutton/bigbluebutton into reconnect-to-bbb-video 2015-07-02 18:19:45 +00:00
Chad Pilkey
fa808ec594 Uncommenting the PollingModule in config.xml.template 2015-07-02 14:08:29 -04:00
Richard Alam
40422d0934 - close webcam window when receiving webcam stream stopped message from server 2015-07-02 17:10:23 +00:00
Richard Alam
721bcf9342 - fix parsing of video stream name 2015-07-02 14:40:52 +00:00
Richard Alam
3033724471 - reopne webcam windows 2015-06-30 22:26:35 +00:00
Richard Alam
7f5f5a5ee7 - force stop broadcasting of webcam when disconnected to bbb-video 2015-06-30 21:01:59 +00:00
Richard Alam
be27e7bd9a - when client detects that connection to bbb-video has been disconnected, close all webcam windows 
in video dock and reconnect if needed.
 2015-06-30 19:53:26 +00:00
Chad Pilkey
087223b3fe first pass at a UI for voting and viewing votes 2015-06-26 18:31:14 -04:00
Chad Pilkey
3ebc23619f moved the poll specific views from the presentation module to polling module 2015-06-26 18:29:12 -04:00
Chad Pilkey
cb597c6f0b Merge remote-tracking branch 'upstream/development' into poll-client 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
 2015-06-24 14:39:10 -04:00
Chad Pilkey
16aab6378a first pass at creating buttons for voting 2015-06-24 14:17:48 -04:00
Chad Pilkey
46840dd727 moved some poll strings to locales 2015-06-24 14:17:25 -04:00
Chad Pilkey
67cc2fc651 fixed some compiler warnings in PollGraphic 2015-06-24 14:11:31 -04:00
Richard Alam
be9becacc1 - cleanup of unused polling code 2015-06-24 16:02:17 +00:00
Richard Alam
a0345d23b3 - add some way to test polling 2015-06-24 15:32:24 +00:00
Richard Alam
6f9fcd87e1 - handle poll messages in the client 2015-06-24 15:16:36 +00:00
Pedro Beschorner Marin
5a6c3efd7d Better control of reconnection presenter status change 2015-06-24 13:33:11 +00:00
Richard Alam
d9295115c8 - handle voting, stop, and show result in the client 2015-06-23 21:50:38 +00:00
Pedro Beschorner Marin
b1638f3184 The welcome message is only sent once 2015-06-23 20:42:45 +00:00
Richard Alam
dcfa4ee8fb - cleanup unneded polling events 
- process start poll message
 2015-06-23 19:34:58 +00:00
Richard Alam
da76271e92 Merge branch 'development' of https://github.com/bigbluebutton/bigbluebutton into implement-polling-v3 2015-06-23 19:30:35 +00:00
Richard Alam
d46053d05e - start poll message now sent from client and then back to clients 2015-06-23 19:29:09 +00:00
Pedro Beschorner Marin
0ed67e9ecd Refresh public chat history after reconnection 2015-06-23 19:19:13 +00:00
Chad Pilkey
628d47968d fixed the poll start button css 2015-06-23 15:09:44 -04:00
Pedro Beschorner Marin
fb0bd078c5 Refactored video refresh 2015-06-23 16:47:54 +00:00
Chad Pilkey
078f9accb9 added a poll image to the branding folder 2015-06-23 11:34:43 -04:00
Chad Pilkey
49366a5782 started on the publish poll client code 2015-06-23 11:34:09 -04:00
Chad Pilkey
4d8b14c0b7 added a button to start the polls 2015-06-23 11:33:07 -04:00
Pedro Beschorner Marin
24eec8a713 Refresh video window when reconnecting 2015-06-23 14:53:04 +00:00
Pedro Beschorner Marin
3e6f6c3cd7 Resetting presenter status and some cleanup 2015-06-22 20:53:34 +00:00
Felipe Cecagno
c79be37591 Merge branch 'mconf-live0.6.4' into base-for-0.6.4 
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/UserGraphicHolder.mxml
 2015-06-22 17:18:26 -03:00
Felipe Cecagno
a2a7e9af24 Merge remote-tracking branch 'bigbluebutton/v0.9.0-release' into mconf-live0.6.4 
Conflicts:
	bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.9.0.jar
	bigbluebutton-client/resources/prod/bbb-deskshare-applet-unsigned-0.9.0.jar
 2015-06-19 15:11:13 -03:00
Felipe Cecagno
e657cddc8d new deskshare applet signed by RNP, with Mconf logo 2015-06-19 14:50:30 -03:00
Pedro Beschorner Marin
809a77468d Added a reconnection timeout 2015-06-18 19:13:49 +00:00
Chad Pilkey
c668cfdebd disabled the sample poll display 2015-06-18 14:50:37 -04:00
Richard Alam
aab372e481 Merge pull request #660 from capilkey/poll-client 
First pass of poll visualization
 2015-06-18 14:30:55 -04:00
Chad Pilkey
da9bb8b4a1 added license information to new poll files 2015-06-18 12:55:59 -04:00
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
Richard Alam
2a93dbf4a7 - fix https://code.google.com/p/bigbluebutton/issues/detail?id=1953 2015-06-17 15:59:27 +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
9ef6434ef7 Merge branch 'webrtc-reconnect' into mconf-live0.6.3 2015-06-01 23:01:50 -03:00
Felipe Cecagno
65323b93f6 fixed pt_BR translation 2015-06-01 23:01:36 -03:00
Felipe Cecagno
a819933ebf Merge branch 'webrtc-reconnect' into mconf-live0.6.3 
Conflicts:
	bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/WebRTCCallManager.as
 2015-06-01 22:48:23 -03:00
Felipe Cecagno
ddfbd0b138 Merge branch 'webrtc-reconnect' into v0.9.0-release 
Conflicts:
	bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/WebRTCCallManager.as
 2015-06-01 22:43:10 -03:00
Felipe Cecagno
f498515fb0 set camera name to "Unknown Device" when chrome doesn't allow to retrieve the real name; disable the popup button when there's no camera available 2015-06-01 21:43:33 -03:00
Felipe Cecagno
9857f8d53b improve the dimensions of the deskshare publish window 2015-06-01 14:45:40 -03:00
Felipe Cecagno
2e7e968dd1 Merge branch 'improved-firefox-hint' into mconf-live0.6.3 2015-06-01 14:15:00 -03:00
Felipe Cecagno
e17c212cfb increase the contrast between the modal with the firefox hint for request for media and the rest of the UI 2015-06-01 14:14:30 -03:00
Felipe Cecagno
a1fdf5bba8 new window to help users to share microphone while setting up the webrtc connection on firefox 2015-05-27 17:54:13 -03:00
Felipe Cecagno
cad68ba530 make client check compatible with v0.9.0-release 2015-05-26 17:03:33 -03:00
Felipe Cecagno
b2dd51a384 Merge branch '090-download-presentation' into mconf-live0.6.3 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/FileUploadWindow.mxml
 2015-05-25 12:14:00 -03:00
Felipe Cecagno
e9f4836815 fixed the positioning of ui elements in the file upload window 2015-05-25 12:13:23 -03:00
Felipe Cecagno
034cccda1e Merge branch 'fix-layout-module' into mconf-live0.6.3 2015-05-24 20:07:52 -03:00
Felipe Cecagno
6e13383689 updated default layouts definition 2015-05-24 20:07:18 -03:00
Felipe Cecagno
17825ed6e5 fixed the multiple remote mark on the layouts list; fixed the way new layouts are added to the list 2015-05-24 20:06:00 -03:00
Felipe Cecagno
810fe4b176 when the layout is switched and the new layout is on the combo list, use the label previously assigned to it 2015-05-24 19:57:30 -03:00
Felipe Cecagno
673d4d3316 changed the way layouts are applied to windows, attempting to fix the application of the remote layout when the user first joins 2015-05-24 19:12:10 -03:00
Felipe Cecagno
c072bbd410 Merge branch 'webrtc-timeout' into mconf-live0.6.3 2015-05-21 12:54:58 -03:00
Felipe Cecagno
aca0db14e3 reduced the ice gathering timeout to 3 seconds instead of 5 2015-05-21 12:54:50 -03:00
Felipe Cecagno
6e947f999f cleanup 2015-05-18 23:48:55 -03:00
Mateus Dalepiane
1bc5445dde Update video window talking status on creation 2015-05-18 22:41:10 -03:00
Felipe Cecagno
707674958c Merge branch 'webrtc-timeout' into mconf-live0.6.3 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/WebRTCEchoTest.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/FlashCallManager.as
	bigbluebutton-config/web/index.html
 2015-05-17 23:32:36 -03:00
Felipe Cecagno
b555c579a8 Merge branch 'webrtc-timeout' into v0.9.0-release 
Conflicts:
	bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
	bigbluebutton-client/src/org/bigbluebutton/main/views/WebRTCEchoTest.mxml
 2015-05-17 23:29:48 -03:00
Felipe Cecagno
2a5f4ebedb cleanup; reverted the implementation which avoid the user to join twice using the same internal user id because the enter call was modified to change the internal user id everytime it's called; reverted a few files with different line endings than the original; merged properly the html5 client code 2015-05-17 23:08:41 -03:00
Felipe Cecagno
9919052dbf reverted back mconf implementation of the layout module; it's still buggy, but the fixes are very different from those applied to bigbluebutton/bigbluebutton@v0.9.0-release 2015-05-17 20:58:48 -03:00
Felipe Cecagno
7846b3ecb6 Merge branch '090-expanded-status' into mconf-live0.6.3 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.mxml
 2015-05-17 20:12:15 -03:00
Felipe Cecagno
6e60ae2aa9 refactored a bit the expanded status; removed an unnecessary event used to change the button icon 2015-05-17 20:02:13 -03:00
Felipe Cecagno
7cb12f8b49 Merge branch 'mconf-live0.6.3' into bigbluebutton/bigbluebutton@v0.9.0-release 
Conflicts:
	bbb-api-demo/src/main/webapp/demo10_helper.jsp
	bbb-video/build.gradle
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonSession.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/red5/ConnectionInvokerService.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/ParticipantsListener.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
	bigbluebutton-client/locale/bg_BG/bbbResources.properties
	bigbluebutton-client/locale/cs_CZ/bbbResources.properties
	bigbluebutton-client/locale/cy_GB/bbbResources.properties
	bigbluebutton-client/locale/de_DE/bbbResources.properties
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/locale/es_419/bbbResources.properties
	bigbluebutton-client/locale/es_ES/bbbResources.properties
	bigbluebutton-client/locale/et_EE/bbbResources.properties
	bigbluebutton-client/locale/fa_IR/bbbResources.properties
	bigbluebutton-client/locale/fr_CA/bbbResources.properties
	bigbluebutton-client/locale/fr_FR/bbbResources.properties
	bigbluebutton-client/locale/hu_HU/bbbResources.properties
	bigbluebutton-client/locale/hy_AM/bbbResources.properties
	bigbluebutton-client/locale/it_IT/bbbResources.properties
	bigbluebutton-client/locale/ms_MY/bbbResources.properties
	bigbluebutton-client/locale/no_NO/bbbResources.properties
	bigbluebutton-client/locale/pl_PL/bbbResources.properties
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/locale/ru_RU/bbbResources.properties
	bigbluebutton-client/locale/sk_SK/bbbResources.properties
	bigbluebutton-client/locale/tr_TR/bbbResources.properties
	bigbluebutton-client/locale/uk_UA/bbbResources.properties
	bigbluebutton-client/locale/zh_CN/bbbResources.properties
	bigbluebutton-client/resources/config.xml.template
	bigbluebutton-client/resources/prod/MconfLive.html
	bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.9.0.jar
	bigbluebutton-client/resources/prod/bbb-deskshare-applet-unsigned-0.9.0.jar
	bigbluebutton-client/resources/prod/lib/bbb_api_bridge.js
	bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
	bigbluebutton-client/resources/prod/lib/deployJava.js
	bigbluebutton-client/src/org/bigbluebutton/main/api/ExternalApiCallbacks.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/modules/ModulesDispatcher.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/main/views/AudioSelectionWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/VideoHolder.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/WebRTCEchoTest.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/model/ChatConversation.as
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/PhoneOptions.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/FlashCallManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/WebRTCCallManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/FileUploadWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/UsersWindow.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
	bigbluebutton-config/web/index.html
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
 2015-05-17 19:25:26 -03: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
Pedro Beschorner Marin
ecf21c8664 Added a timer to control ICE gathering process 2015-04-24 14:11:17 -03:00
Felipe Cecagno
12cab928de Merge branch '090-guest-role-refactoring' into mconf-live0.6.3 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/MessageNames.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/red5/UsersClientMessageSender.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/redis/UsersMessageToJsonConverter.scala
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/maps/UsersMainEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
	bigbluebutton-web/src/java/org/bigbluebutton/api/domain/User.java
 2015-04-23 14:37:17 -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
Felipe Cecagno
b24debe225 more cleanup 2015-04-20 23:39:02 -03:00
Felipe Cecagno
a47a264fc3 cleanup 2015-04-20 22:56:24 -03:00
Felipe Cecagno
63e6da47de reduced the number of messages exchanged between server and client regarding the guest access; fixed the problem of bbb-web answering the meeting is not running when there's a guest connected 2015-04-20 21:25:37 -03: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
Felipe Cecagno
7dd576b0e1 fixed the issue when the user cancel webrtc, then cancel flash, then join webrtc, and the flash dialog pops up 2015-04-17 13:08:34 -03:00
Felipe Cecagno
af98c4a62c Merge branch 'webrtc-timeout' into mconf-live0.6.2 2015-04-17 12:24:39 -03:00
Felipe Cecagno
25ddb7958d removed the endTime since it's always null 2015-04-17 12:24:12 -03:00
Felipe Cecagno
b2a48b131a Merge branch 'webrtc-timeout' of github.com:pedrobmarin/bigbluebutton into webrtc-timeout 2015-04-17 11:37:20 -03:00
Pedro Beschorner Marin
5fa32ca80e Some cleanup 2015-04-17 11:17:54 -03:00
Pedro Beschorner Marin
51cfa5f5fa Surrounded bye so error can be caught and trigger cancel 2015-04-16 17:01:23 +00: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
1f0ecdfa0e Merge branch 'fix-context-menu' into mconf-live0.6.2 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopViewWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/SharedNotesWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/business/VideoWindowItf.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videodock/views/VideoDock.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
 2015-04-09 18:08:33 -03:00
Felipe Cecagno
0b15b59cae fixed localization for context menu items on presentation window, using the same text as the buttons tooltip 2015-04-09 18:04:04 -03: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
Felipe Cecagno
b7eca98c92 force the browser to update the branding file using ?v=VERSION 2015-04-06 14:23:22 -03: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
Felipe Cecagno
13d15d0761 Merge branch 'issue1534' into mconf-live0.6.2 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml
 2015-04-01 10:19:17 -03:00
Felipe Cecagno
335a9a77a3 better message when the connection to the server has been rejected 2015-04-01 10:16:48 -03:00
Felipe Cecagno
bbd951c6eb cleanup localization files 2015-04-01 10:10:33 -03:00
Mateus Dalepiane
179129750a Include multiple tab warning in connection rejected message 
Included a message to inform the user that a connection rejected is
probably caused by multiple browser tabs joining the same conference.
 2015-04-01 09:53:14 -03:00
Mateus Dalepiane
ade75cc877 Improve logout dialog window 
Now the window ajusts itself to fit the message and the message is centered.
Also, removed reconnect button if the connection is rejected.

Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml
 2015-04-01 09:53:10 -03:00
Felipe Cecagno
77bd320887 Merge branch 'audio-hints-flag' into mconf-live0.6.2 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
 2015-04-01 09:48:00 -03:00
Felipe Cecagno
99b0033dc4 cleanup 2015-04-01 09:42:28 -03: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
Felipe Cecagno
b5b038d912 logout url now is called using target=_parent 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml
 2015-03-29 21:44:24 -03:00
Felipe Cecagno
05fef6e5e5 Merge branch '090-multinotes' into mconf-live0.6.2 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/views/SharedNotesWindow.mxml
 2015-03-29 13:55:34 -03:00
Felipe Cecagno
ac1bd6d7ce fixed once again the issue where the notes updates do not get sent to the server (ref #1531) 2015-03-29 13:53:49 -03: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
Felipe Cecagno
f23ece0e37 Merge branch 'webrtc-timeout' into mconf-live0.6.2 2015-03-26 15:54:34 -03:00
Felipe Cecagno
cef741937b improved the way we calculate the dimension of the cancel button in the audio test dialog 2015-03-26 15:50:51 -03:00
Pedro Beschorner Marin
a2d7f43130 Added a config option to enable/disable WebRTC audio connection browser's hints 2015-03-26 12:38:43 -03:00
Richard Alam
c63c371e7b - fix issue https://code.google.com/p/bigbluebutton/issues/detail?id=1909 2015-03-25 21:58:09 -03: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
Mateus Dalepiane
7a0e75ace3 Merge branch 'mdalepiane/reconnect-webrtc' into mconf-live0.6.2 2015-03-25 12:10:04 -03: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
Mateus Dalepiane
6b33495158 Auto re-connection for WebRTC calls on client 
The client tries to reconnect 3 times before failing and asking if
the user wants to use flash audio or cancel.
 2015-03-24 15:37:43 -03:00
Mateus Dalepiane
2d14eaf531 Fix WebRTC user agent callbacks 
This applies to connect and disconnect websocket events.
 2015-03-24 12:51:31 -03: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
Felipe Cecagno
2df21ae7e2 Merge branch 'webrtc-timeout' into mconf-live0.6.2 2015-03-21 12:38:39 -03:00
Felipe Cecagno
3c307490ef fixed the cancel button visibility when it take a while to enable webrtc but eventually it worked, so the next time the connecting window is presented, the cancel button should be hidden again instead of remain visible 
to test it, apply this patch:

diff --git a/bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js b/bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
index b9b35bb..f497afa 100755
--- a/bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
+++ b/bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
@@ -33,7 +33,7 @@ function joinWebRTCVoiceConference() {
                                BBB.webRTCConferenceCallEnded();
                                break;
                        case 'started':
-                               BBB.webRTCConferenceCallStarted();
+                               setTimeout(function() { BBB.webRTCConferenceCallStarted(); }, 15000);
                                break;
                        case 'connecting':
                                BBB.webRTCConferenceCallConnecting();
@@ -79,7 +79,7 @@ function startWebRTCAudioTest(){
                                BBB.webRTCEchoTestEnded();
                                break;
                        case 'started':
-                               BBB.webRTCEchoTestStarted();
+                               setTimeout(function() { BBB.webRTCEchoTestStarted(); }, 15000);
                                break;
                        case 'connecting':
                                BBB.webRTCEchoTestConnecting();
 2015-03-21 12:38:08 -03: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
Felipe Cecagno
bba8dfd553 Merge branch 'webrtc-timeout' into mconf-live0.6.2 2015-03-20 17:18:46 -03:00
Felipe Cecagno
2de9adafb8 change webrtc timeout to 60 seconds, and show the cancel button after 5 seconds trying to connect 2015-03-20 17:18:29 -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
Pedro Beschorner Marin
7372d12e51 Added a timeout cancel button in WebRTC audio connection 2015-03-18 16:59:26 -03: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
9780df5b13 Merge branch '090-deskshare-window' into mconf-live0.6.2 2015-03-04 12:34:48 -03:00
Felipe Cecagno
8bac97b10c adding the missing pt_BR strings 2015-03-04 12:34:34 -03:00
Felipe Cecagno
43d78b656b Merge branch '090-new-videodock' into mconf-live0.6.2 2015-03-04 11:57:52 -03: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
Felipe Cecagno
bb330cf0a2 Merge branch '090-deskshare-window' into mconf-live0.6.2 
Conflicts:
	bigbluebutton-client/resources/prod/layout.xml
	bigbluebutton-client/resources/prod/lib/deployJava.js
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
 2015-03-02 00:25:02 -03:00
Felipe Cecagno
7fee4ac0d0 improved the desktop sharing publish window preview 2015-03-02 00:23:18 -03:00
Chad Pilkey
815be28d0b Revert "Revert "Added Java check to the configuration notifications"" 
This reverts commit 82545a03f3.
 2015-03-02 00:53:10 +00:00
Felipe Cecagno
87151b5513 cleanup; deskshare view window toolbar appears on top of the deskshare video, no matter the way the window is scrolled 2015-03-01 20:27:17 -03:00
Felipe Cecagno
b88f652bf6 cleanup 2015-03-01 12:34:13 -03:00
Mateus Dalepiane
dfceb138b0 Implemented an auto hiding toolbar to toggle deskshare options 2015-03-01 12:27:20 -03:00
Mateus Dalepiane
9e9bbfc72e All resize operations work as expected 
The toggle button is still missplaced.
 2015-03-01 12:27:20 -03:00
Mateus Dalepiane
114fad22e6 Deskshare fit window/actual size button partially working 2015-03-01 12:27:20 -03:00
Mateus Dalepiane
f3ba92c087 Partially working 2015-03-01 12:27:20 -03: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
Felipe Cecagno
d6f587db7b Merge branch '090-force-listen-only' into mconf-live0.6.2 2015-02-17 21:08:01 -02:00
Felipe Cecagno
6cb8ca807e fixed some edge cases when using forceListenOnly and other problems due to the ability to use webrtc after using flash audio 2015-02-17 21:06:03 -02: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
Felipe Cecagno
538961c2f6 Merge branch '090-listen-only-by-default' into HEAD 2015-02-13 18:26:09 -02: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