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

4881 Commits

Author SHA1 Message Date
Ghazi Triki
9fcaf6c6ca Fixed missing emoji locales and minor improvement for the EmojiGrid padding. 2015-09-01 00:06:47 +01:00
Ghazi Triki
95a093ca0c Update status icons. 2015-08-31 23:47:40 +01:00
Felipe Cecagno
e7ed9fda45 fix connection names 2015-08-31 17:16:07 -03:00
Felipe Cecagno
c8188670da Merge branch 'mconf-live0.6.4-auto-reconnect' into mconf-live0.7.2-auto-reconnect 
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-08-31 16:50:47 -03:00
Pedro Beschorner Marin
f12539fe81 Added pt_BR translation 2015-08-28 16:47:09 +00:00
Pedro Beschorner Marin
2b1a0274eb Merge branch 'auto-reconnect' into mconf-live0.6.4-auto-reconnect 2015-08-28 16:34:21 +00:00
Pedro Beschorner Marin
019089db2e Closing Flash phone connection if user leaves Flash audio 2015-08-28 16:05:40 +00:00
Richard Alam
4bc259c8ab - format client log 2015-08-27 21:19:51 +00:00
Richard Alam
4b4365e88a - send log to server 2015-08-27 19:46:21 +00:00
RafaFP
6545dd89c5 Implemented the feature which changes the name of the locations to Portuguese (Brazilian) when the user changes the locale to Portuguese (Brazilian). 
#ref1745
 2015-08-24 21:26:24 +00:00
Richard Alam
796f71f642 - fix issue where users does not get refreshed after reconnect 2015-08-23 23:03:15 -04:00
Richard Alam
9ea1428191 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into fix-auto0reconnect-listenonly 2015-08-23 20:26:58 -04:00
Richard Alam
52d2ed1666 - try to fix auto-reconnect for listen only users 2015-09-03 14:04:48 +00:00
Ghazi Triki
a05f9ef173 ServerLogTarget is now able to queue logs when the network connection is lost then send them once the network connection si back. 2015-08-22 18:32:52 +01:00
Ghazi Triki
96a27c103c Log level can be configured in flex client application. 2015-08-22 17:15:12 +01:00
Richard Alam
08f50745ee - revert back to original hand icon 2015-08-22 10:00:31 -04:00
Ghazi Triki
f0eed97bb8 Remove status button is correctly displayed. 2015-08-28 19:50:34 +01:00
Ghazi Triki
7ec8c6e3b7 Merge branch 'master' into emoji-status 
Conflicts:
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
 2015-08-28 19:06:48 +01:00
Ghazi Triki
a7d2820c24 Improved emoji feature components. 2015-08-28 19:02:52 +01:00
Ghazi Triki
debafd24ca Displaying custom emoji icons. 2015-08-28 15:56:52 +01:00
Ghazi Triki
66a7f23146 Added userId to EmojiStatusEvent to able to send a request for a different user. 2015-08-28 11:08:18 +01:00
Ghazi Triki
35e8d03949 - Added new EmojiGrid component. 
- Replaced raise hand feature by emoji status in client (WIP)
 2015-08-27 21:31:46 +01:00
Chad Pilkey
760b7b306a add in an ICE connection timeout set to 60s 2015-08-26 16:56:52 -04:00
Chad Pilkey
cd58b764a4 clean up the presentation sizing on page load 2015-08-26 16:56:18 -04:00
Chad Pilkey
7415d5a8d8 move the chrome mic permission window down 50px 2015-08-26 16:55:52 -04:00
Chad Pilkey
0994e90d6d increased the audio dialog font size 2015-08-26 16:50:59 -04:00
Chad Pilkey
2240ff0cd3 added a checkbox for audible chat notifications 2015-08-24 14:34:08 -04:00
Ghazi Triki
b360212612 Custom polling window simplified. 2015-08-24 14:34:08 -04:00
Ghazi Triki
c4d240950f Configuration property enableRaiseHand renamed to enableEmojiStatus. 2015-08-23 16:35:10 +01:00
Ghazi Triki
4de187d833 Created new logging target ServerLogTarget to store flex logs to server. 2015-08-22 13:02:51 +01:00
Ghazi Triki
49ef1e3618 Custom polling window simplified. 2015-08-21 11:09:45 +01:00
Chad Pilkey
f3db6617e5 improve poll label display 2015-08-20 16:37:46 -04:00
Chad Pilkey
fc9fee0858 fix presentation spelling 2015-08-20 16:37:06 -04:00
Chad Pilkey
90cd7ce2bc Merge pull request #2734 from riadvice/polling-multi-choice-window 
Added new window for adding custom polling choices.
 2015-08-20 15:43:36 -04:00
Ghazi Triki
98f33db751 Added new window for adding custom polling choices. 2015-08-20 18:37:15 +01:00
Chad Pilkey
f5659af65c increased the font size of the vote button text 2015-08-19 21:04:39 -04:00
Chad Pilkey
fc460c393d Merge remote-tracking branch 'upstream/master' into variable-wb-poll-size 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
 2015-08-19 20:52:59 -04:00
Chad Pilkey
95ca4ad190 added an audio queue when a poll is started 2015-08-19 20:41:02 -04:00
Chad Pilkey
bdfc6977f9 Made the vote buttons more visible 2015-08-19 20:12:43 -04:00
RafaFP
8f636d158a Apply lock settings button tooltip fixed in en_US and pt_BR locales. 
#ref 1753
 2015-08-19 18:38:17 +00:00
Fred Dixon
c875be4c1d Merge pull request #2727 from capilkey/variable-wb-poll-size 
Variable wb poll size
 2015-08-19 14:15:02 -04:00
RafaFP
337ed313ed When a locked viewer is promoted to moderator the locker icon will now be removed. 
The locker settings are kept for the user (his locker settings are restored once he is demoted).
 #ref 1744
 2015-08-19 17:30:40 +00:00
Chad Pilkey
f84d479f9b fixed the poll display so that vote count is always visible 2015-08-19 13:13:13 -04:00
Ghazi Triki
7835bfb80c Webcam, desktop and micrphone sharing are disabled when Puffin browser is detected. 2015-08-19 09:51:35 +01:00
Ghazi Triki
f0ed185c71 determineBrowser function in bbb_blinker.js detects Puffin mobile browser. 2015-08-18 22:57:34 +01:00
Pedro Beschorner Marin
e30654f721 Reverting empty tags regex. It was affecting the text formatting buttom status. 2015-08-18 17:24:38 +00:00
Chad Pilkey
8d232ac103 Changed the poll graphic to use dark-grey instead of black 2015-08-18 12:02:29 -04:00
Richard Alam
2e7238ae74 Merge pull request #2725 from ritzalam/implement-custom-poll 
Implement custom poll
 2015-08-17 18:42:25 -04:00
Richard Alam
5472548118 - allow custom polling through chat message 2015-08-17 22:40:31 +00:00
Pedro Beschorner Marin
32bce9ad71 Trying to fix empty flags bug #1742 2015-08-17 19:25:16 +00:00
Chad Pilkey
78e71785c6 Merge pull request #2723 from capilkey/fix-pollresultmodal-dottimer 
fixed a null pointer issue with PollResultsModal dotTimer
 2015-08-14 19:10:35 -04:00
Chad Pilkey
b851428443 fixed a null pointer issue with PollResultsModal dotTimer 2015-08-14 18:58:44 -04:00
RafaFP
b71e9e9545 User can now set a name to the custom layouts he creates. If the name is left empty, the default name is given as it was before (Custom Layout #). 
#ref 1733
 2015-08-14 21:13:32 +00:00
Richard Alam
88963ee103 Merge pull request #2722 from capilkey/make-modal-more-alive 
Improvements to PollResultsModal
 2015-08-13 18:31:56 -04:00
Chad Pilkey
3c80e1fd6b listen for the PollStoppedEvent in PollResultsModal 2015-08-13 18:20:13 -04:00
Chad Pilkey
0dc0b7221c increase the size of the responders label 2015-08-13 17:20:15 -04:00
Chad Pilkey
7125687951 Make it clear that PollingResultsModal is live 2015-08-13 17:19:25 -04:00
Pedro Beschorner Marin
c4fecdf1d7 Cleanup 2015-08-13 18:45:34 +00:00
Pedro Beschorner Marin
5d281f0636 Refreshing cursor position and selected text area 2015-08-12 18:29:41 +00:00
Richard Alam
bd1cf9183f - return empty string instead of null to prevent NPE 2015-08-12 17:26:06 +00:00
Pedro Beschorner Marin
f1c81e9328 Implementing Rich Text patchable methods 2015-08-12 02:05:27 +00:00
RafaFP
86a6983395 Tooltips in pt_BR and en_US locales changed to properly represent the funcion of the headset button. #ref 1723 2015-08-11 20:51:48 +00:00
Richard Alam
ca2de434d5 Merge pull request #757 from capilkey/misc-polling-changes 
Misc polling changes
 2015-08-11 16:39:11 -04:00
Chad Pilkey
bfd6e15ad7 moved stuff around in PollResultsModal 2015-08-11 15:35:12 -04:00
Pedro Beschorner Marin
f6643f07d6 Trying to resolve issue http://dev.mconf.org/redmine/issues/1712 2015-08-11 17:20:04 +00:00
Chad Pilkey
e063eedab7 quick poll matches true/false, yes/no 2015-08-11 12:55:30 -04:00
Chad Pilkey
6e3ea8dbb0 make sure the poll whiteboard object clears on redraw 2015-08-11 11:58:50 -04:00
Chad Pilkey
08b0ffda1a improved the poll graphic scaling 2015-08-11 11:58:16 -04:00
RafaFP
cd2821993b Viewer can now mute/unmute his microphone from the users window. 
Improved code and reverted .properties to the correct file.

refs #1722
 2015-08-11 13:38:26 +00:00
Richard Alam
cacfbf7e35 - update jar to latest red5 2015-08-10 21:32:00 +00:00
Pedro Beschorner Marin
9e5928c36e Setting RichTextEditor as a customized component 2015-08-10 15:37:34 +00:00
Richard Alam
6070a42985 Merge branch 'development' into prepare-merge-with-latest-red5 2015-08-10 15:36:39 +00:00
Richard Alam
987397250c - stop poll when presenter change happens while poll is running 2015-08-10 15:21:38 +00:00
Richard Alam
a2e2ef73cf - presentation sync broke on svg conversion changes 2015-08-10 14:29:14 +00:00
Pedro Beschorner Marin
78c91bc183 Reverting to CHANGE event at rich text editor send listener 2015-08-09 19:09:28 +00:00
RafaFP
69c9fc947e Viewer can now mute/unmute his microphone from the users window. 
refs #1722
 2015-08-09 17:36:31 +00:00
Richard Alam
15a368f444 - remove some printlns to lessen noise 2015-08-07 21:37:16 +00:00
Pedro Beschorner Marin
87fefeacda Removed bullets 2015-08-07 19:03:37 +00:00
Pedro Beschorner Marin
b52d96c8ba Unbinding Rich Text from the patchable component 2015-08-07 18:04:44 +00:00
Fred Dixon
7d571de04b Merge pull request #745 from capilkey/change-quickpoll-regex 
changed quick poll regex to match only one character
 2015-08-07 13:16:57 -04:00
Chad Pilkey
445b37616d changed quick poll regex to match only one character 2015-08-07 13:13:13 -04:00
Richard Alam
576d027c8d - allow to externally log auto-reconnects 2015-08-07 17:02:32 +00:00
Ghazi Triki
1c6205d68e MainApplicationShell height fix to remove the script execution timeout in GraphicsWrapper. 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
 2015-08-07 10:00:15 -03:00
Richard Alam
fbc3dc54f3 - add timestamps on client side log to correlate webcam stopping 2015-08-06 15:11:41 +00:00
Richard Alam
1f3cff06b3 - add more information on the logs to track down webcam disconnections 2015-08-05 19:55:12 +00:00
Ghazi Triki
0e42974ed2 Merge branch 'development' into fix-mdi-resize 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
 2015-08-05 17:13:13 +01:00
Pedro Beschorner Marin
a3122d160a Changed the focus listener for a timer 2015-08-05 16:05:39 +00:00
Pedro Beschorner Marin
fb8bab91d7 Using the shared note focus listener to check if the current document messege has updated the client notes 2015-08-04 18:53:25 +00:00
Pedro Beschorner Marin
bb8b78e7b6 Avoid editing note while it is not ready to 2015-08-04 18:23:32 +00:00
Chad Pilkey
4cf5fa640b Merge remote-tracking branch 'upstream/development' into change-poll-label 2015-08-04 12:12:02 -04:00
Ghazi Triki
f6bbe498ee MainApplicationShell height fix to remove the script execution timeout in GraphicsWrapper. 2015-08-02 15:30:08 +01:00
Chad Pilkey
b282dbd7bf cleaned up some event listeners in UsersWindow menu 2015-07-31 18:15:37 -04:00
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