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

4383 Commits

Author SHA1 Message Date
Anton Georgiev
6cfc16cde5 offer redirect to HTML5 only if available 2015-09-23 21:24:19 +00:00
Richard Alam
ee7ef24397 - change fielname to be the same as on server 2015-09-23 20:04:39 +00:00
Chad Pilkey
e9c0eb23cd rename bbb-client in .project file for better importing 2015-09-21 14:13:32 -07:00
Chad Pilkey
15a2ade0aa Merge remote-tracking branch 'ritzalam/fix-lock-settings' into investigate-locking-more 2015-09-21 13:50:44 -07:00
Chad Pilkey
d0366b2fba Make sure PhoneOptions are initialized before using 2015-09-21 13:46:16 -07:00
Chad Pilkey
6377f86ca1 make sure the user item renderers update when locking changes 2015-09-21 13:45:18 -07:00
Chad Pilkey
a736008046 fix locking being reversed 2015-09-21 13:44:23 -07:00
Richard Alam
11fbefb5ef - make lock settings behave like in 0.9 2015-09-21 20:42:04 +00:00
Richard Alam
5a986f5bc6 - change logging format 2015-09-21 13:55:23 +00:00
Ghazi Triki
57d94bd5e4 The use is able to write a multi-line chat message. 2015-09-17 10:37:56 +01:00
Ghazi Triki
920fc97532 Merge branch 'master' into client-logging-to-server 2015-09-16 21:11:33 +01:00
Richard Alam
c13e17a7d4 Merge pull request #2770 from riadvice/chat-message-limit 
Add a maximum allowed length to chat message
 2015-09-16 15:04:26 -04:00
Ghazi Triki
07d7f389c1 Logging format can be configured in flex client application. 2015-09-16 18:55:09 +01:00
Richard Alam
cc5c26b0bc Merge pull request #2785 from ritzalam/log-flash-capabilities 
Log flash capabilities
 2015-09-16 10:39:52 -04:00
Richard Alam
899b98f81b Merge pull request #2780 from riadvice/puffin-browser 
Enable video and audio sharing for Puffin browser 4.6 and above.
 2015-09-15 16:12:25 -04:00
Richard Alam
2bea0c778c - clean-up by removing some debug logs 2015-09-15 20:04:06 +00:00
Richard Alam
99569d7a2b - log flash player capabilities to aid us in debugging issues 2015-09-15 19:20:36 +00:00
Richard Alam
8afb3b8edf - clean up by removing some logs 2015-09-15 19:20:09 +00:00
Richard Alam
e24b8c7cbe Merge pull request #2781 from riadvice/pepperflash-webcam-fix 
Microphone name automatically set under Pepper flash before getting the browser permission.
 2015-09-15 10:52:43 -04:00
Richard Alam
1eac9dc709 Merge pull request #2783 from ritzalam/capilkey-fix-lock-settings 
fix lock settings
 2015-09-15 10:40:03 -04:00
Richard Alam
643e7b7087 - cleanup 2015-09-15 14:38:41 +00:00
Richard Alam
bbfbdf20e9 - cleanup 2015-09-14 21:25:27 +00:00
Richard Alam
44763bf283 - try to fix lock settings 2015-09-14 20:18:27 +00:00
Richard Alam
247239caeb Merge branch 'figure-out-why-lock-settings-not-working' into capilkey-fix-lock-settings 2015-09-14 15:51:15 +00:00
Richard Alam
8514eec3ba Merge branch 'remove-java-warning-chrome' of https://github.com/capilkey/bigbluebutton into capilkey-fix-lock-settings 2015-09-14 14:21:20 +00:00
Ghazi Triki
405840edc4 Microphone name automatically set under Pepper flash before getting the browser permission. 2015-09-12 13:31:02 +01:00
Ghazi Triki
65f1b72294 Enable video and audio sharing for Puffin browser 4.6 and above. 2015-09-12 12:35:12 +01:00
Chad Pilkey
e364a8c130 correct the vote counts in the accessbile poll message 2015-09-11 15:00:14 -07:00
Chad Pilkey
5eba1622ac remove an unused variable in the poll graphics 2015-09-11 14:59:52 -07:00
Richard Alam
cfa6e30b23 Merge branch 'master' into client-to-server-logging 2015-09-10 17:52:58 +00:00
Richard Alam
977d4ba081 Merge pull request #2773 from ritzalam/update-locales 
- pulling locales from transifex (sept 10, 2015)
 2015-09-10 13:42:23 -04:00
Richard Alam
df19e44bc3 Merge pull request #2774 from kepstin/mixed-content 
Use protocol-relative links to load the 'get flash' button image
 2015-09-10 13:33:58 -04:00
Richard Alam
8a464a4f23 Merge pull request #2772 from capilkey/remove-java-warning-chrome 
removed warning for Java not being installed with Chrome 42+
 2015-09-10 13:27:08 -04:00
Calvin Walton
e7008957c9 Use protocol-relative links to load the 'get flash' button image 
This fixes a mixed content warning when loading the client over https
 2015-09-10 11:53:36 -04:00
Richard Alam
ac838e741a - pulling locales from transifex (sept 10, 2015) 2015-09-10 15:25:00 +00:00
Chad Pilkey
9859ea6735 removed warning for Java not being installed with Chrome 42+ 2015-09-09 15:30:03 -07:00
Ghazi Triki
7441fb9efb Added smart binding to BBBUser "emojiStatus" and "hasEmojiStatus" properties to avoid having a runtime warning. 2015-09-09 18:24:50 +01:00
Richard Alam
f78dc3653c - fix issue where other users get disconnected when a user refreshes browser after a reconnect 2015-09-08 20:27:10 +00:00
Richard Alam
a779e5c3e2 - add logging 2015-09-08 16:08:56 +00:00
Ghazi Triki
f773cfa9f9 Added message too long in client locales. 2015-09-07 16:18:49 +01:00
Ghazi Triki
19dbba500b Chat message longer than "maxMessageLength" cannot be sent. 2015-09-07 16:10:49 +01:00
maxdoumit
3891db93e7 Restream video after disconnect 
This commit will enable the client to restream video in the case of a disconnect.

A _restream variable has been added to the VideoEventMapDelegate.as, that will dictate if the stream needs to be restream.
The setting are stored also stored so ensure that no user interaction is needed to restream the video.

VideoEventMapDelegate.as now listens to BBBEvent.RECONNECT_CONNECTION_ATTEMPT_SUCCEEDED_EVENT, and will restream the video in the case _restream is true.

_restream is set to true when the user shares his camera, and set to false when the user manually closes his camera.
 2015-09-06 22:21:55 -04:00
Richard Alam
dbbb4139d2 Merge pull request #2766 from capilkey/misc-client-changes-100 
Misc client changes 100
 2015-09-04 19:14:24 -04:00
Chad Pilkey
3433f88fae Lower the volume for the poll start ping 2015-09-04 17:53:32 -04:00
Chad Pilkey
94d5c9f92e Make the accessible poll results work with custom polls 2015-09-04 17:52:59 -04:00
Chad Pilkey
8e9376947b Only allow the presenter to start a custom poll from chat 2015-09-04 17:51:41 -04:00
Chad Pilkey
e2bb124bb4 check for null in the emojistatus in BBBUser 2015-09-04 17:49:55 -04:00
Chad Pilkey
b2693753c6 added a widescreen video profile 2015-09-04 17:49:22 -04:00
Richard Alam
79e8a340e1 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into client-to-server-logging 2015-09-04 21:01:57 +00:00
Richard Alam
2f7e9a3171 Merge pull request #2765 from ritzalam/display-welcome-message-on-reconnect 
- welcome message isn't being displayed after reconnect.
 2015-09-04 16:54:36 -04:00
Richard Alam
b0fc984473 - welcome message isn't being displayed after reconnect. 2015-09-04 20:52:39 +00:00
Richard Alam
82e9f4ea49 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into client-to-server-logging 2015-09-04 19:56:38 +00:00
Richard Alam
53ff3966a3 - wait for validate token before signalling connection success to bbb-apps 2015-09-04 19:20:56 +00:00
Richard Alam
93c9b6df46 Merge pull request #2763 from ritzalam/fix-auto0reconnect-listenonly 
Fix auto reconnect listenonly
 2015-09-04 11:23:54 -04:00
Richard Alam
81c00f20d4 Merge pull request #2762 from riadvice/pepperflash-webcam-fix 
Webcam name automatically set under Pepperflash before giving WebRTC video permission
 2015-09-04 11:11:30 -04:00
Ghazi Triki
803673e5cb Webcam name automatically set under Pepper flash before giving WebRTC video permission. 2015-09-03 23:06:22 +01:00
Ghazi Triki
fb205b1c35 Make VideoDock inherit from CustomMdiWindow to remove the right click "close" context menu item. 2015-09-03 20:26:05 +01:00
Fred Dixon
1b882a2062 Changed wording of Network Failure 2015-09-03 05:58:45 -04:00
Ghazi Triki
3906247dc7 Removed smile eomji status. 2015-09-02 13:08:06 +01:00
Ghazi Triki
c5a3b713ba Improved EmojiGrid layout. 2015-09-02 10:07:40 +01:00
Chad Pilkey
afb52d53c2 applied the text styling to the mock text in WebRTCEchoTest 2015-09-01 13:02:02 -04:00
Ghazi Triki
c255b94f85 Clicking on the same status icon again raises a "none" status event. 2015-09-01 00:11:00 +01:00
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
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
Anton Georgiev
eb57aa7da1 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webrtc-desktop-share-merging 2015-08-24 14:31:00 +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
Anton Georgiev
1939dac06c Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webrtc-desktop-share 
Conflicts:
	akka-bbb-apps/build.sbt
	akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/RedisMessageReceiver.java
	akka-bbb-apps/src/main/scala/org/bigbluebutton/Boot.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingMessageHandler.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingModel.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/WhiteboardApp.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/recorders/WhiteboardEventRedisRecorder.scala
	akka-bbb-fsesl/build.sbt
	bbb-common-message/build.sbt
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/WhiteboardKeyUtil.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/redis/RedisPubSubMessageHandler.java
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/managers/DeskshareManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/managers/PublishWindowManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/managers/ViewerWindowManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/services/DeskshareService.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopViewWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/ToolbarButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
 2015-08-21 20:15:37 +00: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
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
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
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
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
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
Anton Georgiev
3bb0600ac9 start/stop/restart desktop sharing fr flash client 2015-08-13 21:47:53 +00: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
Anton Georgiev
6855e6b6d4 strip html UI for DeskShare 2015-08-13 20:14:50 +00:00
Richard Alam
bd1cf9183f - return empty string instead of null to prevent NPE 2015-08-12 17:26:06 +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
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
Richard Alam
cacfbf7e35 - update jar to latest red5 2015-08-10 21:32:00 +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
Richard Alam
15a368f444 - remove some printlns to lessen noise 2015-08-07 21:37:16 +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
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
Anton Georgiev
d360e90aef make better use of available viewing space 2015-08-05 16:25:00 +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
Anton Georgiev
57687b11db update verto_extension[_share] 2015-08-05 14:48:47 +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
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
Anton Georgiev
9f1f43b850 add logs 2015-07-28 19:59:43 +00: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