Commit Graph

11091 Commits

Author SHA1 Message Date
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
Oleksandr Zhurbenko
0d00fb786b Prevented a whiteboard from unnecessary redrawing and improved scaling 2015-08-28 20:12:44 -07: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
Oleksandr Zhurbenko
621ebc169d Prevented whiteboard's redrawing when one of the shapes is redrawn 2015-08-27 17:55:28 -07: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
Richard Alam
4bc259c8ab - format client log 2015-08-27 21:19:51 +00: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
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
Ghazi Triki
3a11d30115 Fixed emojiStatus is correctly saved in UsersModel. 2015-08-27 21:25:54 +01:00
Richard Alam
4b4365e88a - send log to server 2015-08-27 19:46:21 +00:00
Oleksandr Zhurbenko
ea8fe5d146 Fixed a bug with an endless array which became bigger while cursors' moving and slowed down a whiteboard 2015-08-26 16:12:20 -07:00
Maxim Khlobystov
ec33e1404b Made the notifications look appropriately sized regardless of the device type or screen orientation. 2015-08-26 17:37:27 -04:00
Richard Alam
ebd98168c4 Merge pull request #2748 from capilkey/add-checkbox-chat-sounds
Miscellaneous Client fixes for 1.0
2015-08-26 17:21:44 -04:00
Richard Alam
a2b613e80c Merge pull request #2747 from OZhurbenko/meteor-ui
Polling update
2015-08-26 17:20:15 -04:00
Chad Pilkey
760b7b306a add in an ICE connection timeout set to 60s 2015-08-26 16:56:52 -04: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
Ghazi Triki
2fb8296ff0 - Fixed emojiStatus not set correctly in server.
- Upgraded bbb-common-message version.
2015-08-26 18:51:05 +01:00
Richard Alam
59267f13d8 Merge branch 'client-logging-to-server' of https://github.com/riadvice/bigbluebutton into riadvice-client-logging-to-server 2015-08-26 15:21:18 +00:00
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