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

11147 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chad Pilkey
c7111089dc Merge pull request #2777 from OZhurbenko/meteor-ui 
Whiteboard optimization
 2015-09-10 18:31:29 -04:00
Oleksandr Zhurbenko
41c453c470 cleanup 2015-09-10 15:09:55 -07:00
Oleksandr Zhurbenko
d208da2c31 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-ui 
Conflicts:
	bigbluebutton-html5/app/client/globals.coffee
 2015-09-10 15:01:09 -07:00
Oleksandr Zhurbenko
2feabdc65b Fixed a bug with whiteboard's width in case when poll controllers appeared 2015-09-10 14:50:38 -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
Richard Alam
38be65409b Merge pull request #2771 from riadvice/client-fixes 
Added custom binding to BBBUser emoji properties
 2015-09-10 13:15:30 -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
perroned
7ed87d01c6 Fix issue when screensharing first 2015-09-09 15:41:13 -07:00
Chad Pilkey
9859ea6735 removed warning for Java not being installed with Chrome 42+ 2015-09-09 15:30:03 -07:00
Oleksandr Zhurbenko
f9b2cdb01c Removed unnecessary Tracker.autorun and cleaned up things 2015-09-09 10:24:57 -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
Ghazi Triki
7fdccc4095 Throw a too long chat message and log it and its length. 2015-09-09 17:58:25 +01:00
Oleksandr Zhurbenko
db3b95e990 Added proper scaling for the whiteboard when a polling or bottom presenter buttons templates are rendered or destroyed 2015-09-08 16:57:39 -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
a779e5c3e2 - add logging 2015-09-08 16:08:56 +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
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
perroned
695d14972f Initialize resolutions for verto 2015-09-04 12:55:03 -07:00
perroned
656fec2639 Libraries required for mod_verto 2015-09-04 12:28:09 -07:00
perroned
66f40f6806 Initial verto UI 2015-09-04 12:27:46 -07:00
perroned
8a9a380792 Relocate global audio helpers (WebRTC) 2015-09-04 12:26:55 -07:00
perroned
14884200a5 Fixed typo in variable 2015-09-04 12:26:11 -07:00
perroned
e3d6caeac1 Configuration settings for FreeSWITCH profile password 2015-09-04 12:25:17 -07:00
Richard Alam
e7cd030944 Merge pull request #2764 from ritzalam/fix-validate-token 
Fix validate token
 2015-09-04 15:24:14 -04:00
perroned
343f7c7f5c Configuration settings for Chrome deskshare extension 2015-09-04 12:23:33 -07:00
perroned
6983730bda Configuration settings for external FreeSWITCH server 2015-09-04 12:22:47 -07: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
perroned
56e1782877 Load external JS libraries using HTTPS 2015-09-04 08:48:51 -07:00
perroned
ab4e38e155 (pkg) Force html5 client to use SSL 2015-09-04 08:48:09 -07: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