Oswaldo Acauan
|
e76459be65
|
Merge remote-tracking branch 'upstream/v2.0.x-release' into patch-3
|
2017-10-24 11:11:18 -02:00 |
|
Oswaldo Acauan
|
fda223e81d
|
Merge remote-tracking branch 'upstream/v2.0.x-release' into patch-3
|
2017-10-24 11:01:58 -02:00 |
|
Oswaldo Acauan
|
45d604c63d
|
Refactor logger from client to server
|
2017-10-24 10:58:46 -02:00 |
|
Oswaldo Acauan
|
28c19ec82d
|
Merge remote-tracking branch 'upstream/v2.0.x-release' into toast-notifications
|
2017-10-24 07:57:52 -02:00 |
|
Anton Georgiev
|
eb9dd49b75
|
Merge pull request #4551 from Tainan404/fix-errors-linter
[HTML5] Fix issue introduced on #4488
|
2017-10-23 15:53:32 -02:00 |
|
Tainan Felipe
|
5ac96e6979
|
solve merge issues
|
2017-10-23 13:47:14 -02:00 |
|
Oswaldo Acauan
|
1dcfb9e3fa
|
Merge remote-tracking branch 'upstream/v2.0.x-release' into toast-notifications
|
2017-10-23 13:31:33 -02:00 |
|
Anton Georgiev
|
4566d82a2a
|
Merge pull request #4488 from Tainan404/fix-errors-linter
[HTML5] Fix errors linter
|
2017-10-23 12:27:38 -02:00 |
|
Oswaldo Acauan
|
a26e20d76b
|
Fix wrong prop name record => recording
|
2017-10-20 17:00:34 -02:00 |
|
Oswaldo Acauan
|
cbc3ea9e36
|
Add handlers for recording messages
|
2017-10-19 08:44:41 -02:00 |
|
Joao Siebel
|
da9e2ef3a4
|
Fix function name in updateVoiceUser
|
2017-10-18 10:30:33 -02:00 |
|
Oswaldo Acauan
|
0dd371087b
|
Fix logClient method name
|
2017-10-13 11:49:48 -03:00 |
|
Tainan Felipe
|
873d227819
|
Merge remote-tracking branch 'upstream/v2.0.x-release' into fix-errors-linter
|
2017-10-13 10:35:38 -03:00 |
|
Oleksandr Zhurbenko
|
430ddc0d3b
|
Removing unnecessary 2x from the collections, publishers, subscriptions and logs
|
2017-10-12 12:07:02 -07:00 |
|
Tainan Felipe
|
4bda76c5bb
|
Merge remote-tracking branch 'upstream/v2.0.x-release' into fix-errors-linter
|
2017-10-12 15:36:52 -03:00 |
|
Tainan Felipe
|
e74c44dd9d
|
fix errors linter
|
2017-10-12 14:02:46 -03:00 |
|
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 |
|
Tainan Felipe
|
d6a6ff5eca
|
remove .scss extension and changed path
|
2017-10-11 14:54:00 -03:00 |
|
Oswaldo Acauan
|
c08f6a9c4f
|
Fix file permissions
|
2017-10-11 12:22:08 -03:00 |
|
Tainan Felipe
|
a667e3d05b
|
Merge remote-tracking branch 'upstream/v2.0.x-release' into fix-errors-linter
|
2017-10-11 11:46:16 -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 |
|
Tainan Felipe
|
50cc876cf7
|
fix errors linter
|
2017-10-10 19:08:51 -03: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 |
|
Tainan Felipe
|
5393051d9d
|
fix errors linter
|
2017-10-10 10:06:34 -03:00 |
|
Oleksandr Zhurbenko
|
1ab85be722
|
Permissions
|
2017-10-09 18:55:53 -07:00 |
|