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

4056 Commits

Author SHA1 Message Date
Felipe Cecagno
83ae244485 Merge branch 'mconf-live0.7.1-ssl' into mconf-live0.7.3 2015-10-19 11:49:36 -02:00
RafaFP
1240a7eff4 Improved the Shared Notes window to properly support mouse Context Menu Paste (was an issue, would not trigger the formatting corrections for pasted data). 
Solved a bug where pasted text would cause kerning to change and eventually cause loss of consistency.
Kerning would become a nested tag, breaking consistency when left empty.
ref #1742
 2015-10-19 11:49:13 -02:00
Pedro Beschorner Marin
de00dc2fe3 Fixed text style when keyboard input with multiple lines selected 2015-10-19 11:49:13 -02:00
Pedro Beschorner Marin
7f4f704cf1 Refresh font type, size and color when user delete or backspace a paragraph the same way Flash handles alignment fixing 2015-10-19 11:49:13 -02:00
Pedro Beschorner Marin
b36be98745 Fixed array out of bounds exception 2015-10-19 11:49:13 -02:00
Pedro Beschorner Marin
33cba3d440 Text type, color and size will work the same as alignment 2015-10-19 11:49:13 -02:00
Pedro Beschorner Marin
da292fe3ed Cleaning (some) text formatting when enter key is pressed 2015-10-19 11:49:13 -02:00
Pedro Beschorner Marin
743b5f5197 Avoid formatting empty lines when selected 2015-10-19 11:49:13 -02:00
Pedro Beschorner Marin
96a000ed99 Adding new RichTextEditor mxml 2015-10-19 11:49:13 -02:00
Felipe Cecagno
385b043146 Merge branch 'mconf-live0.7.3' of github.com:RafaFP/bigbluebutton into mconf-live0.7.3 2015-10-19 11:25:39 -02:00
Felipe Cecagno
1f9ed04243 Merge branch 'mconf-live0.7.3' of github.com:pedrobmarin/bigbluebutton into mconf-live0.7.3 2015-10-19 11:25:06 -02:00
Ghazi Triki
eb5371d90c Improved presentation backButton and forwardButton buttons styles. 2015-10-10 12:37:32 +01:00
Richard Alam
197669ebc4 - add a timeout when to expect response to validate token. If we don't get a response, 
log it. This might mean that we run into issue where the reply from server isn't
   getting propagated back into the client.
 2015-10-08 18:28:25 +00:00
Richard Alam
e53ed90859 Merge pull request #2823 from ritzalam/fix-demo11-api-example 
- convert all external ids in js api into internal user ids as using…
 2015-10-06 15:00:33 -04:00
Richard Alam
a2cf908425 - convert all extarnal ids in js api into internal user ids as using external user ids breaks when 
a user joins twice into the meeting
 2015-10-06 17:57:39 +00:00
Chad Pilkey
6f69330b77 Added scrolling dots to the reconnect popup 2015-10-05 12:26:44 -07:00
Richard Alam
93ba04ce4c Merge pull request #2814 from capilkey/fix-2810 
Fix 2810
 2015-10-05 11:32:34 -04:00
Chad Pilkey
81ced7193b Only show annotations for the current whiteboard 2015-10-02 15:03:40 -07:00
Chad Pilkey
04ce742fd7 Make sure whiteboard text is published to the correct whiteboardID 2015-10-02 15:02:13 -07:00
Richard Alam
5dd139f2f4 - do not user external user id to find user 2015-09-30 20:07:05 +00:00
Richard Alam
93dd5186b4 - user internal user id for user in the voice conf 2015-09-30 18:55:17 +00:00
Chad Pilkey
0627afa2e5 Add a default message length to avoid issues of missing property 2015-09-24 14:17:07 -07:00
Chad Pilkey
4c4d35a760 Merge pull request #2787 from riadvice/chat-message-limit 
The use is able to write a multi-line chat message.
 2015-09-24 17:15:43 -04:00
Richard Alam
ee7ef24397 - change fielname to be the same as on server 2015-09-23 20:04:39 +00:00
RafaFP
7e4946865a Fixed the buttons delay on disappearing and killed the connection for good if on flash microphone. 
refs #1800
 2015-09-21 22:22:00 +00: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
Pedro Beschorner Marin
eac7c9c4d4 Ejecting voice user after a Flash mic reconnection 2015-09-18 15:19:07 +00:00
Pedro Beschorner Marin
655ed560ed Better control for bigbluebutton reconnection 2015-09-17 18:24:30 +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
Pedro Beschorner Marin
6ee634d53e Fixed missing reconnected user name in users list 2015-09-16 20:11:10 +00: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
Pedro Beschorner Marin
d53b1d058e Fixed deskshare reconnection issue #1802 2015-09-16 16:03:47 +00: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
Felipe Cecagno
b17719e8cf added proxyType to best on some connections preparing the client to use rtmps 2015-09-12 19:59:32 -03: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
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
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
Felipe Cecagno
8288d52d1c Merge branch '090-multinotes-rich-text' of github.com:pedrobmarin/bigbluebutton into mconf-live0.7.3 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/views/SharedNotesWindow.mxml
 2015-09-07 23:44:37 -03:00
Felipe Cecagno
ac4f58c997 Merge branch 'fix-issue-1716' of github.com:pedrobmarin/bigbluebutton into mconf-live0.7.3 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/views/SharedNotesWindow.mxml
 2015-09-07 23:26:00 -03:00
Felipe Cecagno
a7b220e207 Merge branch '090-multinotes' into mconf-live0.7.3 2015-09-07 23:19:16 -03: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
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
Felipe Cecagno
d5c0047611 Merge branch 'feature-1733' into mconf-live0.7.3 2015-09-03 15:23:15 -03:00
Felipe Cecagno
6dbf18c2e5 cleanup 2015-09-03 15:22:54 -03:00
Felipe Cecagno
3c4055ec01 removed extra add_circle_outline icon from previous commit (use css style instead) 2015-09-03 15:16:16 -03:00
Felipe Cecagno
c99e3fbfb4 Merge branch 'feature-1745' into mconf-live0.7.3 2015-09-03 14:24:33 -03:00
Felipe Cecagno
7063cfa833 included the "Default language" option to the list of languages 2015-09-03 14:04:29 -03:00
Felipe Cecagno
40ce5f8877 changed the logic we store locales on ResourceUtil, so we can do a better job changing the language names and ordering them 2015-09-03 12:42:16 -03: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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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