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

11002 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maxim Khlobystov
b362cb95f3 Polished up the sizing of Settings window. 2015-08-25 14:49:04 -04:00
Ghazi Triki
988d8cf56c Removed lower hand methods in server applications and replace raise hand by emoji status. 2015-08-25 09:46:00 +01:00
Oleksandr Zhurbenko
30a1d0d880 Fixed a bug with publishing a custom poll containing just one answer 2015-08-24 15:59:45 -07:00
Oleksandr Zhurbenko
8b6ebe63b6 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-ui 2015-08-24 15:31:50 -07:00
Oleksandr Zhurbenko
e77c6377be Removed 40px restriction for the width and increased a default font-size for calculations 2015-08-24 15:22:59 -07:00
Maxim Khlobystov
092274e8ef Continued transitioning the mobile views to CSS pixels, corrected the sizes of Settings window's fonts/elements. 2015-08-24 17:20:14 -04:00
Fred Dixon
55516cd1c3 Merge pull request #2745 from kepstin/poll-recording 
Fix poll in recording when there are 0 responders
 2015-08-24 14:49:18 -04:00
Calvin Walton
cc23f30c2b Fix poll in recording when there are 0 responders 
There were a couple of problems:

* A division by 0 when calculating the percentages
* Positioning of the number of results counter was incorrect

Fixes #2739
 2015-08-24 14:42:31 -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
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
bda62afa4d - try to maintain userid when a user reconnects to be able to match the user 2015-08-23 18:22:48 -04:00
Richard Alam
52d2ed1666 - try to fix auto-reconnect for listen only users 2015-09-03 14:04:48 +00:00
Ghazi Triki
c4d240950f Configuration property enableRaiseHand renamed to enableEmojiStatus. 2015-08-23 16:35:10 +01:00
Richard Alam
a63a211143 - change poll config for jedis 
- attempt to reconnect redis pubsub subscriber if disconnected
 2015-08-23 07:09:00 -04:00
Richard Alam
0e2e79fce8 - change redis pool config 
- reconnect to redis if connection to subscribe disconnected
 2015-08-23 04:56:30 -04:00
Richard Alam
442461db88 - configure concurrenthashmap to not use the default 
see https://ria101.wordpress.com/2011/12/12/concurrenthashmap-avoid-a-common-misuse/
 - Noticed that Red5 became slow to response after a while and usin Yourkit saw that
   a lot of threads are blocked in GlobalAudio.getGlobalAudioStream
 2015-08-23 02:22:18 -04:00
Fred Dixon
e464edf890 Merge pull request #2742 from ffdixon/update-bbb-conf 
bbb-conf --clean also cleans logs for bbb-apps-akka and bbb-fsesl-akka
 2015-08-22 23:30:17 -04:00
Fred Dixon
49ece78679 bbb-conf --clean also cleans log files for bbb-apps-akka and bbb-fsesl-akka 2015-08-22 23:29:13 -04:00
Fred Dixon
e52b644301 Merge pull request #2741 from ffdixon/update-bbb-conf 
Added check to ensure PID for red5 matches that in /var/run/red5.pid
 2015-08-22 20:47:59 -04:00
Fred Dixon
ec2cd0567b Added check to ensure PID for red5 matches that in /var/run/red5.pid 2015-08-22 20:46:18 -04: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
4de187d833 Created new logging target ServerLogTarget to store flex logs to server. 2015-08-22 13:02:51 +01:00
Fred Dixon
dc537f1257 Merge pull request #2738 from ffdixon/fix-bbb-conf 
Fix bbb-conf to better parse config.xml
 2015-08-21 17:09:17 -04:00
Fred Dixon
cdf41e874a xMerge remote-tracking branch 'upstream/master' 2015-08-21 16:58:03 -04:00
Fred Dixon
660f1aaecd Fixed error in parsing config.xml in bbb-conf 2015-08-21 16:55:16 -04:00
Fred Dixon
1527c51555 Merge pull request #2737 from ritzalam/redis-pubsub-keepalive 
Redis pubsub keepalive
 2015-08-21 13:46:27 -04:00
Oleksandr Zhurbenko
953a98b038 Added scaling and truncating to the bar with poll buttons with answers 2015-08-21 10:14:56 -07:00
Maxim Khlobystov
21f1bd6a60 Polishing up the font and element sizes for phones and tablets. 2015-08-21 10:59:09 -04:00
Maxim Khlobystov
81a2ce5827 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-client-mobile-view 
Conflicts:
	bigbluebutton-html5/app/client/stylesheets/chat.less
	bigbluebutton-html5/app/client/stylesheets/whiteboard.less
 2015-08-21 09:55:23 -04:00
Richard Alam
39baecef24 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into redis-pubsub-keepalive 2015-08-21 13:46:42 +00:00
Fred Dixon
c70dcfe9df Merge pull request #2736 from riadvice/custom-polling-improve 
Custom polling window simplified.
 2015-08-21 07:28:21 -04:00
Ghazi Triki
49ef1e3618 Custom polling window simplified. 2015-08-21 11:09:45 +01:00
Richard Alam
46ba98f737 - add ping/pong message between different components to verfiy that we have working path 2015-08-20 20:44:40 +00:00
Chad Pilkey
0f667f4c05 Merge pull request #2735 from capilkey/misc-poll-fixes 
Misc poll fixes
 2015-08-20 16:44:02 -04: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
Maxim Khlobystov
88fb41263e Modified the UI styling to start using CSS pixels + separated phone, tablet and desktop views. 2015-08-20 15:45:26 -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
Oleksandr Zhurbenko
39e51604a0 Made a raise hand button transparent 2015-08-20 12:21:48 -07:00
Ghazi Triki
98f33db751 Added new window for adding custom polling choices. 2015-08-20 18:37:15 +01:00
Richard Alam
f7620cb4b0 Merge pull request #2731 from capilkey/make-votes-noticeable 
Make votes noticeable
 2015-08-19 21:16:51 -04:00
Richard Alam
dbe2e1c389 Merge pull request #2730 from OZhurbenko/meteor-ui 
Polling, Sorting and URL Validation
 2015-08-19 21:06:45 -04: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
Oleksandr Zhurbenko
5f6bd654d4 Changed the whole way of how we calculate height and width of text elements, as the previous one didn't work in Firefox. Also, if the number of the votes doesn't fit the box then it's displayed in black on the right. Changed the colors to dark grey 2015-08-19 17:42:38 -07:00
Chad Pilkey
95ca4ad190 added an audio queue when a poll is started 2015-08-19 20:41:02 -04:00