Richard Alam
|
2e51c76671
|
Merge branch 'ritzalam-pass-mute-param' into v2.0.x-release
|
2017-11-20 08:18:26 -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
|
e224e12890
|
Merge branch 'riadvice-center-popups' into v2.0.x-release
|
2017-11-20 08:02:54 -08:00 |
|
Richard Alam
|
21ae0e17e6
|
Merge branch 'center-popups' of https://github.com/riadvice/bigbluebutton into riadvice-center-popups
|
2017-11-20 07:58:11 -08:00 |
|
Richard Alam
|
15af7b7557
|
Merge branch 'ritzalam-cleanup-guest-ui'
|
2017-11-20 07:48:01 -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
|
33d0f8c5c4
|
Merge branch 'capilkey-2.1-presentation-cleanup'
Tested uploading and it works.
|
2017-11-20 07:37:05 -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
|
8761f51975
|
Merge pull request #4688 from kepstin/recording-cleanup
Update gems for security fixes, remove some unused.
|
2017-11-17 14:40:17 -05:00 |
|
Richard Alam
|
1623e5b05e
|
- retrieve private chat for user if reconnected
|
2017-11-17 11:37:41 -08:00 |
|
Calvin Walton
|
7362eb1eaf
|
Update gems for security fixes, remove some unused.
|
2017-11-17 14:36:24 -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 |
|
Tainan Felipe
|
881a8e153e
|
change name of the variables for goToSlide
|
2017-11-17 13:54:23 -02:00 |
|
Tainan Felipe
|
221845349e
|
change name of variables in the presentation-toolbar
|
2017-11-17 08:54:23 -02:00 |
|
Tainan Felipe
|
0c37aa96df
|
hchange of slide for slideLabel
|
2017-11-17 08:27:12 -02: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 |
|
Anton Georgiev
|
d4c20b239d
|
Merge pull request #4557 from KDSBrowne/pr-4555-redone
[HTML5] - Pr 4555 redone (style update)
|
2017-11-16 17:20:26 -02:00 |
|
KDSBrowne
|
f4468067aa
|
add margin left to items in userlist
|
2017-11-16 10:50:40 -08:00 |
|
KDSBrowne
|
9412ce7da1
|
Merge remote-tracking branch 'upstream/v2.0.x-release' into pr-4555-redone
|
2017-11-16 10:46:04 -08:00 |
|
Ghazi Triki
|
de97b4fdc9
|
Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into center-popups
# Conflicts:
# bigbluebutton-client/src/org/bigbluebutton/modules/present/managers/PresentManager.as
|
2017-11-16 19:29:21 +01:00 |
|
Ghazi Triki
|
11438c3e74
|
Center FileUploadWindow differently.
|
2017-11-16 19:21:39 +01:00 |
|
Richard Alam
|
76f21f7936
|
Merge pull request #4678 from ritzalam/revert-file-upload-change
Revert "Delay centering popups as FileUploadWindow cannot be directly…
|
2017-11-16 11:27:03 -05:00 |
|
KDSBrowne
|
2784a53570
|
add left margin to items in userlist
|
2017-11-16 08:26:49 -08: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 |
|
Richard Alam
|
739140a0cd
|
Merge pull request #4676 from ritzalam/exempt-mods-from-guest-policy
- determine guest status properly for moderators
|
2017-11-15 17:34:24 -05:00 |
|
Richard Alam
|
a92d4dbd76
|
Merge branch 'riadvice-center-popups' into v2.0.x-release
|
2017-11-15 14:12:01 -08:00 |
|
Richard Alam
|
06640a445b
|
Merge branch 'riadvice-chat-tabs'
|
2017-11-15 14:04:03 -08:00 |
|
Ghazi Triki
|
7124d8b12f
|
Show group chat in options tab.
|
2017-11-15 21:51:46 +01:00 |
|
Richard Alam
|
9329e9316b
|
- determine guest status properly for moderators
|
2017-11-15 12:39:06 -08: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
|
daa72b2008
|
Merge pull request #4673 from ritzalam/synch-with-v2.0
Synch with v2.0
|
2017-11-15 10:37:31 -05:00 |
|
Richard Alam
|
13d8711c53
|
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into synch-with-v2.0
|
2017-11-15 07:35:52 -08:00 |
|
Fred Dixon
|
4e59904455
|
Merge pull request #4672 from antobinary/add-multi-login-html5-flash
Do not send UserLeftVoice on UserLeave - fix for audio state issue on reconnect
|
2017-11-15 08:36:32 -05:00 |
|
Richard Alam
|
b30d16bdb5
|
Merge pull request #4670 from ritzalam/synch-with-v2.0
Synch with v2.0
|
2017-11-14 17:48:51 -05: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 |
|
Anton Georgiev
|
a892d9fdd8
|
do not send UserLeftVoice on UserLeave --fix for audio state issue on reconnect
|
2017-11-14 17:36:08 -05: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 |
|
KDSBrowne
|
37bd382044
|
remove margin-bottom from last userlist item
|
2017-11-14 12:58:54 -08:00 |
|
Richard Alam
|
090906e95a
|
Merge branch 'riadvice-center-popups' into v2.0.x-release
|
2017-11-14 12:02:06 -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
|
51652fc790
|
Merge pull request #4669 from jfsiebel/add-moderator-unmute-config
add moderatorUnmute feature in HTML5 client
|
2017-11-14 16:49:41 -02:00 |
|
Anton Georgiev
|
ee78238348
|
Merge pull request #4583 from jfsiebel/add-moderator-unmute-config
add moderatorUnmute feature in HTML5 client
|
2017-11-14 16:41:33 -02:00 |
|