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

10959 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Chad Pilkey
9859ea6735 removed warning for Java not being installed with Chrome 42+ 2015-09-09 15:30:03 -07:00
Richard Alam
d009c6940e Merge pull request #2769 from ritzalam/fix-users-get-kicked-when-user-refresh 
- fix issue where other users get disconnected when a user refreshes…
 2015-09-08 16:51:09 -04: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
ab7ff09f9f Merge pull request #2767 from maxdoumit/restream_after_video_disconnect 
Restream video after disconnect
 2015-09-08 10:38:31 -04: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
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
e7cd030944 Merge pull request #2764 from ritzalam/fix-validate-token 
Fix validate token
 2015-09-04 15:24:14 -04:00
Richard Alam
96f1717e46 - add a bit of logging so we can see if validate token succeeded or not 2015-09-04 19:21:28 +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
4b9e96cea2 - inject user join as message to prevent race condition of messages 2015-09-04 19:20:25 +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
Richard Alam
bc21146fa4 Merge pull request #2761 from riadvice/flex-gui-fixes 
Remove VideoDock "close" context menu item.
 2015-09-04 11:06:32 -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
Chad Pilkey
4df8c88b94 Swapped Yes/No and True/False in poll answers 2015-09-03 15:34:47 -04: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
069f7c54b3 Merge pull request #2760 from ffdixon/update-connection-dialog 
Changed wording of Network Failure
 2015-09-03 06:00:28 -04:00
Fred Dixon
1b882a2062 Changed wording of Network Failure 2015-09-03 05:58:45 -04:00
Richard Alam
ddc726a6ce Merge pull request #2757 from ritzalam/manage-redis-pubsub-connection 
Manage redis pubsub connection
 2015-09-02 10:26:47 -04:00
Richard Alam
56d0077747 Merge pull request #2755 from ritzalam/change-conc-hashmap-init-values 
- configure concurrenthashmap to not use the default
 2015-09-02 10:08:14 -04:00
Fred Dixon
c84917c2fe Merge pull request #2759 from riadvice/emoji-status 
Removed smile eomji status.
 2015-09-02 08:10:08 -04:00
Ghazi Triki
3906247dc7 Removed smile eomji status. 2015-09-02 13:08:06 +01:00
Fred Dixon
754263b670 Merge pull request #2758 from riadvice/emoji-status 
Improved EmojiGrid layout.
 2015-09-02 07:14:40 -04:00
Ghazi Triki
c5a3b713ba Improved EmojiGrid layout. 2015-09-02 10:07:40 +01:00
Fred Dixon
a476d073bb Merge pull request #2754 from capilkey/fix-webrtc-conneting-textwidth 
Applied the text styling to the mock text in WebRTCEchoTest
 2015-09-01 13:07:20 -04:00
Chad Pilkey
afb52d53c2 applied the text styling to the mock text in WebRTCEchoTest 2015-09-01 13:02:02 -04:00
Richard Alam
2b7542aaed Merge pull request #2753 from riadvice/emoji-status 
Improvements for the user status icon feature
 2015-08-31 20:05:20 -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
Fred Dixon
75241fc86b Merge pull request #2752 from ritzalam/revert-back-hand-icon 
- revert back to original hand icon
 2015-08-31 17:03:56 -04:00
Richard Alam
c7e3788af1 Merge pull request #2751 from riadvice/emoji-status 
Implementation of emoji status for users
 2015-08-31 12:46:40 -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
Richard Alam
7953086be9 Merge pull request #2749 from gthacoder/meteor-client-mobile-view 
Phone/Tablet Views.
 2015-08-27 18:02:57 -04:00
Maxim Khlobystov
89b4bac21a Made the userlist hidden by default on phones. 2015-08-27 17:47:40 -04:00
Maxim Khlobystov
4ecf1ea16a Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-client-mobile-view 
Conflicts:
	bigbluebutton-html5/app/client/stylesheets/whiteboard.less
 2015-08-27 17:19:43 -04:00
Maxim Khlobystov
5be21ee80a Made sure the width and position of the Settings window are set appropriately on any device. 2015-08-27 17:11:59 -04:00