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

11467 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
perroned
7fc72d80ba center fieldset's legends on Firefox 2015-11-02 13:10:15 -08:00
perroned
2aa743a1fd Notify when screensharing has been initiated 2015-11-02 13:09:28 -08:00
Richard Alam
03a7110a92 Merge pull request #2869 from gthacoder/meteor-client 
HTML5 client: UI fixes and code refactoring.
 2015-11-02 14:40:41 -05:00
Richard Alam
ca7b38f081 Merge pull request #2870 from antobinary/audio-fix 
html5client: clear Flash users from Mongo even if they are about to reconnect
 2015-11-02 14:40:23 -05:00
Anton Georgiev
c5207e3110 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into audio-fix 2015-11-02 19:37:41 +00:00
Anton Georgiev
2ca161124e do not store flash client users while reconnecting 2015-11-02 19:37:23 +00:00
perroned
98f1414c5b Hide presenters controls when video is being displayed 2015-11-02 11:08:17 -08:00
Maxim Khlobystov
f4f4a119d9 Got rid of some old unused code related to the raise hand functionality. 2015-11-01 16:08:12 -08:00
Maxim Khlobystov
50e3000b85 Made Raise Hand button invisible in full screen mode. 2015-11-01 15:55:22 -08:00
Maxim Khlobystov
50c74ce5ee Corrected the position of Full Screen button and the size of Raise Hand button to align them together on mobile devices. 2015-11-01 15:49:25 -08:00
Maxim Khlobystov
1c93dfa588 Replaced the FAB trigger's icon with a raised hand + did some code refactoring for the sliding menu and FAB. 2015-11-01 15:34:49 -08:00
Maxim Khlobystov
a23dc18c78 Fixed the issue with unselectable text in Chrome. 2015-10-31 21:20:38 -07:00
Richard Alam
96ec836a9e Merge pull request #2868 from antobinary/audio-fix 
html5client: use upsert to avoid race cond
 2015-10-30 17:34:32 -04:00
Anton Georgiev
39f90d2f8b cleaning up 2015-10-30 21:30:58 +00:00
Anton Georgiev
47cee3138f use UPSERT for chat messages too 2015-10-30 21:27:56 +00:00
Anton Georgiev
a4dd3d63e4 use UPSERT for meetings and users 2015-10-30 20:23:41 +00:00
Anton Georgiev
67b4ab69fb it was trying to reuse username from cache 2015-10-29 22:10:33 +00:00
Richard Alam
e9db96e10d Merge pull request #2862 from antobinary/audio-fix 
html5client:work on fixing the userlist discrepancies (extra users)
 2015-10-29 17:26:45 -04:00
Anton Georgiev
d490dc9ef4 work on fixing the userlist discrepancies (extra users) 2015-10-29 21:23:03 +00:00
Richard Alam
4395432632 Merge pull request #2859 from antobinary/audio-fix 
html5client: user join and lock settings changes
 2015-10-28 12:56:08 -04:00
Anton Georgiev
4b53c3d874 omit users with authToken undef; improve logs 2015-10-28 16:12:40 +00:00
Anton Georgiev
e89c37f8ae lock settings - missed these 2015-10-28 16:00:55 +00:00
Richard Alam
d59aa415cd Merge pull request #2858 from antobinary/audio-fix 
html5client: lock settings fixes
 2015-10-27 17:14:10 -04:00
Anton Georgiev
940dd4b9b2 hide joinAudio with mic icon if permissions prohibit mic 2015-10-27 20:58:41 +00:00
Anton Georgiev
1a7d91dcf2 adapt to the restructured lock settings message format 2015-10-27 20:34:03 +00:00
perroned
2498eb9d32 Merge remote-tracking branch 'bbb/master' into html5client-mod-verto-addition 
Conflicts:
	bigbluebutton-html5/app/client/globals.coffee
 2015-10-27 11:45:43 -07:00
Fred Dixon
f89fc562a2 Merge pull request #2857 from antobinary/audio-fix 
html5client: leave listenOnly audio when exiting (via redis)
 2015-10-27 11:42:52 -04:00
Anton Georgiev
7d624edbb8 leave global audio when exiting 2015-10-26 22:54:49 +00:00
Anton Georgiev
f54fcd9035 improve redis log 2015-10-26 22:53:34 +00:00
Oleksandr Zhurbenko
2f9a990663 Moving options' template to modal 2015-10-23 16:29:24 -07:00
Fred Dixon
a2f03d2df2 Merge pull request #2852 from ffdixon/fix-2835 
Fixed #2835
 2015-10-23 17:51:09 -04:00
Fred Dixon
19c487a5f0 Fixed #2835 2015-10-23 17:46:27 -04:00
Anton Georgiev
8e407df405 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webrtc-desktop-temp-1 
Conflicts:
	akka-bbb-apps/build.sbt
	akka-bbb-fsesl/build.sbt
	bbb-common-message/build.sbt
	bigbluebutton-apps/build.gradle
 2015-10-22 20:46:30 +00:00
Anton Georgiev
e5d6bb2b0e remove shared object 2015-10-22 20:35:39 +00:00
Anton Georgiev
8448296829 display presenter preview when the stream is available, not earlier 2015-10-21 19:48:08 +00:00
Anton Georgiev
44cb8a28c3 use event for ds stop, move out js calls 2015-10-21 19:31:27 +00:00
Anton Georgiev
082be725be end ds on <close> in preview 2015-10-21 18:12:38 +00:00
Anton Georgiev
8785fafb91 remove cursor code. now cursor comes embedded in video 2015-10-21 15:57:00 +00:00
Anton Georgiev
c7e0f0211d remove extra buttons on presenter preview 2015-10-21 15:34:51 +00:00
Ghazi Triki
083aeb42c8 Improved presentation backButton and forwardButton buttons styles. (reverted from commit eb5371d90c with custom update) 2015-10-20 22:31:48 +01:00
Anton Georgiev
08f9cf5b21 change name to startVideo 2015-10-20 19:08:56 +00:00
Anton Georgiev
8a2bc3a420 preview window for presenter displays the stream now 2015-10-20 17:53:10 +00:00
Richard Alam
07a95c6702 Merge pull request #2842 from kepstin/long-wav 
Recording: Also tell ffmpeg to ignore the length of the intermediate wave file
 2015-10-19 14:04:13 -04:00
Ghazi Triki
516740bc88 Removed polling shorcuts from ShortcutHelpWindow. 2015-10-19 18:33:33 +01:00
Chad Pilkey
9da9a8efb2 Merge pull request #2846 from OZhurbenko/master 
Chat improvements
 2015-10-16 17:59:24 -04:00
Oleksandr Zhurbenko
b53d6454b1 Fixed a bug where horizontal scrolling appeared when users got long chat messages in mobile views 2015-10-16 14:49:06 -07:00
Oleksandr Zhurbenko
f963798952 Resetting resized input box after switching from landscape to portrait on desktop 2015-10-16 14:38:20 -07:00
perroned
184a208387 relocate video element inside the whiteboard 2015-10-16 13:18:26 -07:00
perroned
f3fb4cc0ed Fix race condition where presenter controls weren't ready when logging in 2015-10-16 13:17:48 -07:00
Richard Alam
8beff5f717 Merge pull request #2843 from ritzalam/update-deskhare-jar 
- new jar signed with cert that expires on oct 30, 2017
 2015-10-16 15:48:10 -04:00