Anton Georgiev
68e02efe80
add missing Meeting const in addUser.js
2018-09-06 22:33:32 +00:00
Anton Georgiev
1462810b96
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.0
2018-09-06 22:06:40 +00:00
Anton Georgiev
a0a46e5338
Merge branch 'akka-add-sync-voice-user' of github.com:jfsiebel/bigbluebutton into test-5983
2018-08-20 15:44:23 +00:00
Joao Siebel
445d710b2a
handle SyncGetVoiceUsersRespMsg on meteor
2018-08-15 13:45:00 -03:00
prlanzarin
71307e7b26
Added support for ALWAYS_ACCEPT guest policy in the HTML5 client
2018-08-10 19:30:17 +00:00
João Francisco Siebel
5a76eec168
remove chat collection and fix group chat messages subscription
2018-08-06 09:05:07 -03:00
Anton Georgiev
eca2e50e1a
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into current
2018-07-03 20:17:42 +00:00
Anton Georgiev
3414948f0e
Merge pull request #5795 from MaximKhlobystov/mod-only-message
...
Moderator only message support.
2018-07-03 11:48:08 -04:00
Maxim Khlobystov
4a7a3cfcf9
Clearing user system messages when adding a user.
2018-07-03 11:45:44 -04:00
Maxim Khlobystov
593a2ab744
Typo.
2018-07-03 11:31:00 -04:00
Maxim Khlobystov
efbc24db6f
Add support for moderator only message.
2018-07-03 11:13:38 -04:00
Richard Alam
d891a4e85f
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-latest-20-branch
2018-06-28 08:30:17 -07:00
Anton Georgiev
79329d036a
set dial-in clientType in html5 client
2018-06-26 20:50:03 +00:00
Anton Georgiev
e2e83e08df
plug clientType in UserJoin* messages, not separate ones
2018-06-26 19:27:42 +00:00
Anton Georgiev
a6c693c93d
add clientType in User and show it in api getMeeting*
2018-06-22 19:19:46 +00:00
Richard Alam
a2eaa9babd
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into 21-and-20-merge-working-branch
...
- some conflicts have been fixed.
The following needs working on:
both modified: ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/services/ChatCopy.as
both modified: ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/services/ChatSaver.as
both modified: ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatTab.mxml
both modified: ../bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatWindowEventHandler.as
both modified: ../bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
both modified: ../bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageSender.as
both modified: ../bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml
Parking as need to work on something else.
2018-06-06 08:23:13 -07:00
Bobak Oftadeh
136fa72a7e
User list UI changes implemented
2018-05-29 12:23:13 -07:00
Anton Georgiev
44cf02424f
Adjust user guesStatus User property to handle join in BBB 2.1
...
Also add muteOnStart Meeting property and some logs for easier work on redis message handling
2018-01-11 15:05:19 -05:00
KDSBrowne
092839228b
make changeRole handle any role
2017-10-25 10:29:03 -07:00
Oleksandr Zhurbenko
015ca3d719
Changed imports and removed 'initializeCursor.js' since it's not needed
2017-10-11 19:00:28 -07:00
Oleksandr Zhurbenko
337f53e72b
Moved files up to api/
2017-10-11 18:09:35 -07:00
Klaus Klein
c627deca36
Move api to api/1.1
2017-06-19 08:57:32 -03:00
Oswaldo Acauan
e6412275a6
Linter auto fix
2017-06-02 19:25:02 +00:00
KDSBrowne
df76d33cba
set files permission to 644
2017-05-16 09:22:59 -07:00
KDSBrowne
6537a0e28c
Fix client lint issues except those which are comment related
2017-05-16 08:37:17 -07:00
Anton Georgiev
684f87e77a
demote html5 moderator user to viewer based on flag
2017-04-27 16:07:27 -04:00
Oswaldo Acauan
b6e80815bd
Fix a bunch of bugs introduced after the refactor
2017-02-23 20:16:10 +00:00
Oswaldo Acauan
74f123cdc9
Refactor of get_users_reply handler
2017-02-23 17:59:56 +00:00
Oswaldo Acauan
6b020d7e3a
WIP. Refactor of get_users_reply handler
2017-02-23 17:46:03 +00:00
