Chad Pilkey
|
01efd0dbf4
|
stop viewers from opening new public chat pods
|
2017-11-24 19:04:31 -05: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
|
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 |
|
Anton Georgiev
|
116f91d6c8
|
exclude pres pod dropdown from layout for viewer
|
2017-11-23 13:53:06 -05:00 |
|
Anton Georgiev
|
2b4950296e
|
handle promoted/demoted moderator in pres pods
|
2017-11-23 11:35:51 -05:00 |
|
Anton Georgiev
|
85605a803d
|
display pres pod dropdown to moderators only
|
2017-11-23 10:59:31 -05:00 |
|
Ghazi Triki
|
7b0d7d23d9
|
Display notification for incoming private messages.
|
2017-11-22 19:16:09 +01: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
|
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 |
|
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
|
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 |
|
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 |
|
Ghazi Triki
|
7bb517082d
|
Open existing group chat when selecting it from the list.
|
2017-11-20 19:43:37 +01:00 |
|
Ghazi Triki
|
04f46b9eb5
|
Correctly send MDIWindowEvent.CLOSE event to ChatEventMapDelegate when a public chat window is closed.
|
2017-11-20 18:28:46 +01:00 |
|
Richard Alam
|
764bc5a00c
|
Merge branch 'fix-private-chat-issues' of https://github.com/ritzalam/bigbluebutton into ritzalam-fix-private-chat-issues
|
2017-11-20 08:51:50 -08:00 |
|
Richard Alam
|
e13a68377c
|
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into synch-with-v2.0
|
2017-11-20 08:42:46 -08:00 |
|
Richard Alam
|
8f9606e270
|
Merge branch 'pass-mute-param' of https://github.com/ritzalam/bigbluebutton into ritzalam-pass-mute-param
|
2017-11-20 08:04:18 -08:00 |
|
Richard Alam
|
f600af5145
|
Merge branch 'cleanup-guest-ui' of https://github.com/ritzalam/bigbluebutton into ritzalam-cleanup-guest-ui
|
2017-11-20 07:41:10 -08:00 |
|
Richard Alam
|
1466636d17
|
Merge branch '2.1-presentation-cleanup' of https://github.com/capilkey/bigbluebutton into capilkey-2.1-presentation-cleanup
|
2017-11-20 07:24:21 -08:00 |
|
Chad Pilkey
|
3235f8423c
|
clean up of akka-app presentpod code (removed ownerId and other redundant date)
|
2017-11-19 14:34:19 -05:00 |
|
Chad Pilkey
|
86e89cfd43
|
remove ownerId and prevPresenterId from PresentationModule
|
2017-11-17 19:29:03 -05:00 |
|
Richard Alam
|
49b08fabc1
|
- disable private chat input box if other user leaves
|
2017-11-17 10:46:53 -08:00 |
|
Richard Alam
|
6ff5d0db42
|
- pass mute param on message so we don't rely on toggling mute/unmute state for users
|
2017-11-17 08:46:18 -08:00 |
|
Richard Alam
|
5a406551de
|
- remove authenicated users list for approval as we only deal with guests
|
2017-11-16 12:14:36 -08:00 |
|
Ghazi Triki
|
f3ee06fc5b
|
Update group chats list.
|
2017-11-16 21:12:18 +01:00 |
|
Ghazi Triki
|
11438c3e74
|
Center FileUploadWindow differently.
|
2017-11-16 19:21:39 +01:00 |
|
Richard Alam
|
90b49bb12e
|
Revert "Delay centering popups as FileUploadWindow cannot be directly centered."
This reverts commit acddb48545 .
|
2017-11-16 08:21:18 -08:00 |
|
Chad Pilkey
|
3377196b5a
|
only take presentation pod presenter on create if user is mod
|
2017-11-15 18:09:47 -05:00 |
|
Chad Pilkey
|
8edfe1037f
|
initialize whiteboard canvas with current presenter id
|
2017-11-15 18:07:48 -05:00 |
|
Ghazi Triki
|
7124d8b12f
|
Show group chat in options tab.
|
2017-11-15 21:51:46 +01:00 |
|
Ghazi Triki
|
929be96030
|
Rename ChatBox to ChatTab.
|
2017-11-15 20:59:24 +01:00 |
|
Ghazi Triki
|
2f07c4a67a
|
Move create group chat button to chat options tab.
|
2017-11-15 20:32:42 +01:00 |
|
Ghazi Triki
|
acddb48545
|
Delay centering popups as FileUploadWindow cannot be directly centered.
|
2017-11-15 18:01:15 +01:00 |
|
Richard Alam
|
16f58a95ee
|
- pass podId on constructor instead of passing every time the method is called.
|
2017-11-14 14:42:56 -08:00 |
|
Richard Alam
|
d61129927e
|
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into synch-with-v2.0
|
2017-11-14 13:55:18 -08:00 |
|
Richard Alam
|
a5269c8eda
|
Merge branch 'center-popups' of https://github.com/riadvice/bigbluebutton into riadvice-center-popups
|
2017-11-14 11:49:01 -08:00 |
|
Anton Georgiev
|
3c0371c911
|
Merge pull request #4666 from riadvice/layout-naming-fallback
Fall back to the layout name if a translation could not be found
|
2017-11-14 15:20:20 -02:00 |
|
Anton Georgiev
|
d95dc9c22c
|
Merge pull request #4665 from riadvice/private-chat
Display red dot in chat tab
|
2017-11-14 14:53:05 -02:00 |
|