Commit Graph

19328 Commits

Author SHA1 Message Date
Richard Alam
5bf8258074 - make max file uploaded presentation 2017-11-27 14:03:50 -08:00
Richard Alam
1378a75bdd Merge branch 'riadvice-flex-improve' 2017-11-27 08:17:45 -08:00
Richard Alam
8a782ff163 Merge branch 'flex-improve' of https://github.com/riadvice/bigbluebutton into riadvice-flex-improve 2017-11-27 08:05:56 -08:00
Ghazi Triki
bdadfa9410 UI and style improvements. 2017-11-27 16:55:52 +01:00
Richard Alam
ea3cba1bf5 Merge branch 'capilkey-hide-chatpod-create-viewers' 2017-11-27 07:49:52 -08:00
Ghazi Triki
664e47b40b Code cleanup. 2017-11-26 16:25:04 +01:00
Ghazi Triki
57f5719e22 Fix guest tooltips. 2017-11-25 18:32:03 +01:00
Chad Pilkey
26ac1b7813 stop viewers from trying to init lock settings 2017-11-24 19:05:43 -05:00
Chad Pilkey
ec87fce8b4 fix startup race condition in LayoutManager on client load 2017-11-24 19:05:25 -05:00
Chad Pilkey
01efd0dbf4 stop viewers from opening new public chat pods 2017-11-24 19:04:31 -05:00
Ghazi Triki
6afa2898ba Fix WaitingWindow popup unlock. 2017-11-24 19:23:51 +01:00
Richard Alam
fe7e568708
Merge pull request #4720 from capilkey/fix-layoutname-fallback
Fix layout name fallback
2017-11-23 16:51:25 -05:00
Richard Alam
94de542226
Merge pull request #4721 from ritzalam/private-chat-name
Display name of user when doing private chat
2017-11-23 16:50:56 -05:00
Richard Alam
682bc6cd97 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2017-11-23 13:50:29 -08:00
Richard Alam
1bcd4657f1 Merge branch 'riadvice-guest-options' 2017-11-23 13:49:53 -08:00
Richard Alam
caaf082e2e Merge branch 'guest-options' of https://github.com/riadvice/bigbluebutton into riadvice-guest-options 2017-11-23 13:45:07 -08:00
Ghazi Triki
a8ba5904c6 Improve guest box padding. 2017-11-23 22:39:30 +01:00
Richard Alam
dcb933a986 - fix display of private chat name 2017-11-23 13:36:43 -08:00
Ghazi Triki
de500c3dbd Add a new button to display pending guests. 2017-11-23 22:30:05 +01:00
Chad Pilkey
df910730c8 fix layout name fallback 2017-11-23 15:44:42 -05:00
Richard Alam
81aa832448
Merge pull request #4716 from ritzalam/synch-with-v2.0
Synch with v2.0
2017-11-23 14:15:33 -05:00
Chad Pilkey
34b0621fec
Merge pull request #4718 from antobinary/pods_vol5
Show presentation pods dropdown only to moderators
2017-11-23 13:57:15 -05:00
Anton Georgiev
116f91d6c8 exclude pres pod dropdown from layout for viewer 2017-11-23 13:53:06 -05:00
Chad Pilkey
a5819ede27
Merge pull request #4713 from ritzalam/filter-delayed-messages
Filter delayed messages
2017-11-23 12:01:26 -05:00
Anton Georgiev
2b4950296e handle promoted/demoted moderator in pres pods 2017-11-23 11:35:51 -05:00
Richard Alam
99367b171b - handle delayed messages in cases where lock settings are being changed 2017-11-23 08:16:34 -08:00
Anton Georgiev
85605a803d display pres pod dropdown to moderators only 2017-11-23 10:59:31 -05:00
Richard Alam
b1b04939bd - add comment on why we filter delayed messages after switching presenter 2017-11-22 14:14:22 -08:00
Richard Alam
3a29ecdc49 - filter delayed presentation messages after swithching presenter 2017-11-22 14:10:33 -08:00
Richard Alam
ace9fdd2b7 - handle delayed wb messages when switching from multi-user to single-user 2017-11-22 13:35:57 -08:00
Richard Alam
dde04b69be Merge branch 'master' into filter-delayed-messages 2017-11-22 10:46:29 -08:00
Richard Alam
204fe83564 Merge branch 'riadvice-chat-tabs' 2017-11-22 10:45:17 -08:00
Ghazi Triki
7b0d7d23d9 Display notification for incoming private messages. 2017-11-22 19:16:09 +01:00
Anton Georgiev
6d6cf78003
Update index_html5_vs_flash.html 2017-11-22 12:06:27 -05:00
Richard Alam
80212aa218 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into synch-with-v2.0 2017-11-22 08:04:29 -08:00
Richard Alam
b8684d74d6 Merge branch 'riadvice-meeting-name-display' into v2.0.x-release 2017-11-22 07:56:39 -08:00
Richard Alam
ec9b0d038a Merge branch 'meeting-name-display' of https://github.com/riadvice/bigbluebutton into riadvice-meeting-name-display 2017-11-22 07:52:09 -08:00
Richard Alam
e3fc2b7088 - add the current presenter into the old presenter list when switching presenters 2017-11-21 15:07:54 -08:00
Richard Alam
e6b9946ba7 - do not eject old presenter messages in cases where delayed messages arrive in akka-apps 2017-11-21 14:42:33 -08:00
Ghazi Triki
1bfeec88bc Fix meeting label width. 2017-11-21 17:45:01 +01:00
Richard Alam
59b5e376ec
Merge pull request #4707 from ritzalam/synch-with-v2.0
Synch with v2.0
2017-11-21 11:24:50 -05:00
Richard Alam
e77b3c1e04 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into synch-with-v2.0 2017-11-21 08:10:29 -08:00
Richard Alam
4510e4289a Merge branch 'riadvice-fix-labels' into v2.0.x-release 2017-11-21 08:09:37 -08:00
Richard Alam
2d5518059e Merge branch 'riadvice-chat-tabs' 2017-11-21 07:56:21 -08:00
Richard Alam
bdba583efa Merge branch 'chat-tabs' of https://github.com/riadvice/bigbluebutton into riadvice-chat-tabs 2017-11-21 07:45:23 -08:00
Ghazi Triki
0204564eda Update font color. 2017-11-21 16:36:31 +01:00
Ghazi Triki
97a738d1af Use a Text component for long ProgresBar label. 2017-11-21 16:24:22 +01:00
Fred Dixon
31be070508
Merge pull request #4702 from riadvice/center-popups
Fix record confirmation popup position.
2017-11-21 08:34:36 -05:00
Ghazi Triki
830263e436 Open group chat after closing it. 2017-11-21 08:52:00 +01:00
Ghazi Triki
a90e3ec325 Fix record confirmation popup position. 2017-11-20 22:16:24 +01:00