Commit Graph

772 Commits

Author SHA1 Message Date
Oleksandr Zhurbenko
1ec0c11fe4 Permissions fix 2017-10-11 19:01:07 -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
70b3a14aec Moved meetingDestruction to where it is supposed to be 2017-10-11 18:15:13 -07:00
Oleksandr Zhurbenko
2e61493a0c Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into merge-2.0-1.1-api 2017-10-11 18:12:09 -07:00
Oleksandr Zhurbenko
337f53e72b Moved files up to api/ 2017-10-11 18:09:35 -07:00
Oleksandr Zhurbenko
854ca6b409 Moved voice-users, whiteboard-multi-user, auddio and bbb 2017-10-11 18:07:27 -07:00
Oleksandr Zhurbenko
37fb59ffcc Merged 2.0 and 1.1 users api 2017-10-11 18:02:23 -07:00
Oleksandr Zhurbenko
b8a4dbb278 Merged 2.0 and 1.1 slides api 2017-10-11 17:59:35 -07:00
Oleksandr Zhurbenko
ea029e552e Adjusted naming 2017-10-11 17:56:34 -07:00
Oleksandr Zhurbenko
ad071d4edb Merged 2.0 and 1.1 annotations -> shapes api 2017-10-11 17:52:57 -07:00
Oleksandr Zhurbenko
75315d5b44 Changed the modifier's name 2017-10-11 17:41:50 -07:00
Oleksandr Zhurbenko
0e58027486 Merged 2.0 and 1.1 presentations api 2017-10-11 17:40:51 -07:00
Oleksandr Zhurbenko
d2e1ab842e Merged 2.0 and 1.1 polls api 2017-10-11 17:33:57 -07:00
Oleksandr Zhurbenko
82603d8ad5 Permissions fix 2017-10-11 15:18:48 -07:00
Oleksandr Zhurbenko
eb75c6d9fb Merged 2.0 and 1.1 meetings api 2017-10-11 15:17:42 -07:00
Oleksandr Zhurbenko
48d4736c71 Renamed deskshare to screenshare 2017-10-11 14:53:02 -07:00
Oleksandr Zhurbenko
bfa6541f96 Merged 2.0 and 1.1 screenshare apis 2017-10-11 14:52:19 -07:00
Oleksandr Zhurbenko
3f8e24c12e Merged 2.0 and 1.1 cursor apis 2017-10-11 14:34:23 -07:00
Oleksandr Zhurbenko
47d9b53cc2 Merged 2.0 and 1.1 breakouts, chat, and captions 2017-10-11 14:25:18 -07:00
Anton Georgiev
a850d1c9c1 Merge pull request #4494 from oswaldoacauan/redis-queue-rewrite
[HTML5] Redis class refactor
2017-10-11 17:40:28 -03:00
Anton Georgiev
aa39361360 Merge pull request #4483 from OZhurbenko/presenter-functionality-2x
Fix for the Pencil Mongo additions
2017-10-11 15:22:39 -03:00
Oswaldo Acauan
c08f6a9c4f Fix file permissions 2017-10-11 12:22:08 -03:00
Anton Georgiev
351a0e43cb Merge pull request #4470 from KDSBrowne/xx-07-allow-html5-modorator
[HTML5] -Allow HTML5 Moderator
2017-10-11 09:04:54 -03:00
Oleksandr Zhurbenko
bbe1f99527 Improvements 2017-10-10 16:20:52 -07:00
Oleksandr Zhurbenko
8b5a53a59a Moved pencil_chunk_size to the config
... And adjusted the way we fetch annotation statuses from the config
2017-10-10 14:50:11 -07:00
Oswaldo Acauan
3e5dacdaf1 Change meetingQueue delete 2017-10-10 15:30:45 -03:00
Anton Georgiev
66f8be63d2 Merge pull request #4475 from oswaldoacauan/fix-token-security
[HTML5] Add a check for the passed credentials agains the token in Acl
2017-10-10 12:48:41 -04:00
KDSBrowne
d9ae121130 remove wrapping body in an object 2017-10-10 08:05:16 -07:00
Anton Georgiev
f50fb6aea8 modify format of TURN server config for webrtc 2017-10-10 11:12:35 -03:00
Oleksandr Zhurbenko
1ab85be722 Permissions 2017-10-09 18:55:53 -07:00
Oleksandr Zhurbenko
4d8233fe10 Fix for the pencil Mongo additions 2017-10-09 18:30:29 -07:00
Oswaldo Acauan
96ea918919 Fix file permissions 2017-10-09 17:20:27 -03:00
Oswaldo Acauan
73d4607288 Skip checkToken in client calls 2017-10-09 15:53:45 -03:00
Oswaldo Acauan
7d664c8be7 Add a check for the passed credentials agains the token in Acl 2017-10-09 09:49:07 -03:00
KDSBrowne
584f7e4bc8 add checks to handler 2017-10-06 11:12:33 -07:00
KDSBrowne
d89f0e511f Merge branch 'v2.0.x-release' into xx-07-allow-html5-modorator 2017-10-06 11:02:17 -07:00
KDSBrowne
9da39339cd remove unused checks 2017-10-06 10:56:56 -07:00
KDSBrowne
d70bfdb337 remove code duplication 2017-10-06 10:52:14 -07:00
KDSBrowne
36ebec64c5 change modifier name 2017-10-06 09:16:55 -07:00
KDSBrowne
fc4b0dbcb1 add changeRole handler call to changeRole modifier 2017-10-06 09:10:23 -07:00
KDSBrowne
5c1ff8efbc fix promoted users not being able to execute moderator actions 2017-10-06 08:18:27 -07:00
KDSBrowne
b20ab84abd make changeRole.js return publishUserMessage 2017-10-06 06:31:56 -07:00
Anton Georgiev
6b1a29eab4 Merge pull request #4426 from OZhurbenko/presenter-functionality-2x
HTML5 - Whiteboard/Presentation fixes, improvements, refactoring
2017-10-04 14:05:03 -04:00
Anton Georgiev
0bc3490ecc Merge pull request #4419 from KDSBrowne/xx-03-kick-user-bug
[HTML5] - Handle UserEjectedFromMeetingEvtMsg
2017-10-04 11:47:07 -04:00
KDSBrowne
f635dbf2ae remove import and function call 2017-10-04 08:45:05 -07:00
KDSBrowne
d347864b19 update removeUser modifier props 2017-10-04 08:22:56 -07:00
KDSBrowne
7225590c05 fix userEjected modifier and change if condition 2017-10-04 07:57:16 -07:00
KDSBrowne
e241d6bf68 remove unused voice-user method 2017-10-04 07:39:13 -07:00
Oleksandr Zhurbenko
ab95c87f48 Fixed wb toolbar console warnings cause by improper props validation 2017-10-03 14:28:44 -07:00
KDSBrowne
83d4474b51 remove if statment and unused imports 2017-10-03 13:03:18 -07:00