Commit Graph

10690 Commits

Author SHA1 Message Date
Chad Pilkey
08b0ffda1a improved the poll graphic scaling 2015-08-11 11:58:16 -04:00
Chad Pilkey
445b37616d changed quick poll regex to match only one character 2015-08-07 13:13:13 -04:00
Chad Pilkey
4cf5fa640b Merge remote-tracking branch 'upstream/development' into change-poll-label 2015-08-04 12:12:02 -04:00
Richard Alam
fdfd382a28 Merge pull request #712 from riadvice/tab-indexer
Added TabIndexer class for automating tab indexation.
2015-08-04 11:07:50 -04: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
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
Richard Alam
3c52404140 Merge pull request #732 from riadvice/typo-fix
Added missing comma in a LOGGER call for VideoEventMapDelegate class.
2015-07-30 15:41:43 -04:00
Ghazi Triki
4e6a215033 Added missing comma in a LOGGER call for VideoEventMapDelegate class. 2015-07-30 20:33:35 +01:00
Richard Alam
f7208a648d Merge pull request #710 from riadvice/as3-logging
Better logging for the Flex client
2015-07-30 13:25:51 -04: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
Richard Alam
8a09f6aaf7 Merge pull request #731 from bigbluebutton/pedrobmarin-development-auto-reconnect
merge auto reconnect feature
2015-07-28 17:13:21 -04:00
Richard Alam
856029fc2b Merge pull request #730 from ritzalam/fix-webrtc-user-on-reconnect
- mic icon not showing up beside user's name when reconnect occurs i…
2015-07-28 17:05:54 -04:00
Richard Alam
335b87b8bf - mic icon not showing up beside user's name when reconnect occurs if user is joined using webrtc 2015-07-28 21:04:18 +00:00
Richard Alam
1d3faae800 Merge pull request #728 from ritzalam/keep-track-of-user-connections
- keep track of user's number of connections to red5 to manage auto-…
2015-07-28 15:54:38 -04:00
Richard Alam
6297a60b7a - assign a presenter when there is none 2015-07-28 19:53:46 +00:00
Richard Alam
667a619c4a Merge branch 'development' of https://github.com/bigbluebutton/bigbluebutton into development 2015-07-28 18:52:46 +00:00
Richard Alam
2aaf36a0df Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into development 2015-07-28 18:52:07 +00:00
Richard Alam
cbca7a9d21 Merge pull request #729 from ritzalam/add-missing-info-to-poll-result-recording
- poll results recording has missing data required for processing
2015-07-28 14:51:45 -04:00
Richard Alam
becfad11d6 - poll results recording has missing data required for processing 2015-07-28 18:48:47 +00:00
Chad Pilkey
963affb333 Merge pull request #726 from gthacoder/meteor-client-swipe-gesture
HTML5 client: horizontal pan gesture on mobile devices.
2015-07-28 14:35:16 -04:00
Richard Alam
df71d8a689 - keep track of user's number of connections to red5 to manage auto-reconnect 2015-07-28 18:29:00 +00:00
Maxim Khlobystov
9a7e52274e Made the vertical centering of the navbar title work in Firefox. 2015-07-28 14:15:43 -04:00
Maxim Khlobystov
37dcd5f652 Made sure the screen is never darkened when both menus are closed on a mobile device. 2015-07-27 17:28:00 -04:00
Maxim Khlobystov
acc1c3183f Cleaning up (minimized session calls). 2015-07-27 17:21:25 -04:00
Richard Alam
6775aa0ec6 Merge pull request #725 from pedrobmarin/pedrobmarin-development-auto-reconnect
loading bar and webrtc phone button
2015-07-27 16:23:57 -04:00
Maxim Khlobystov
fd000912d8 Set the right-hand menu to open/close during a pan gesture. 2015-07-27 16:14:29 -04:00
Richard Alam
1add049668 Merge pull request #724 from ritzalam/fix-webcam-auto-reconnect-issue
Fix webcam auto reconnect issue
2015-07-27 16:06:20 -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
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
Maxim Khlobystov
c89828c898 Allowed users to click the left hamburger button or apply a pan gesture in any combination. 2015-07-27 11:54:46 -04: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
Maxim Khlobystov
5675f5bfc0 Added animations to the opacity of the opened menu's background + improved synchronization between opening left-hand menu manually and triggering it with a button. 2015-07-26 21:51:18 -04:00
Maxim Khlobystov
4ea901b5dd Made the click event work faster on mobile devices. 2015-07-26 16:03:14 -04:00