Bobak Oftadeh
|
bafa4c15cc
|
Added log message when meeting is muted
|
2018-11-15 14:07:47 -08:00 |
|
Bobak Oftadeh
|
5fb58cd604
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-manage-b
|
2018-11-15 12:55:57 -08:00 |
|
Chad Pilkey
|
d3f0176745
|
Merge pull request #6248 from ritzalam/merge-v20-master-nov14
Merge v20 to master nov14
|
2018-11-15 15:50:21 -05:00 |
|
Richard Alam
|
d1dad75898
|
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-v20-master-nov14
|
2018-11-14 08:47:21 -08:00 |
|
Chad Pilkey
|
1603564bfa
|
Merge pull request #6247 from ritzalam/fix-meeting-not-ending-issue
Fix issue: Meeting doesn't end when last user leaves
|
2018-11-13 16:16:33 -05:00 |
|
Richard Alam
|
ddc391b3d9
|
- fix issue where meeting doesn't end when lasr user leaves or when meetign is never joined.
- the client to server rtt message is always updating the meeting activity. This prevents the meeting
from ending due to inactivity.
|
2018-11-13 13:01:16 -08:00 |
|
Anton Georgiev
|
2513409f3a
|
Merge pull request #6215 from antobinary/iframe-outside-commands
Handle iframe toggle recording and toggle self muting
|
2018-11-13 13:46:12 -05:00 |
|
Anton Georgiev
|
d15305e352
|
comment out MYDOMAIN config lines and add description
|
2018-11-13 18:07:44 +00:00 |
|
Anton Georgiev
|
23e3034b70
|
add missing functions for toggling
|
2018-11-13 17:23:31 +00:00 |
|
Anton Georgiev
|
a0fc60ca93
|
remove unused css
|
2018-11-13 17:16:47 +00:00 |
|
Anton Georgiev
|
fea8c267cc
|
improve on listeners for state outside iframe
|
2018-11-13 17:14:30 +00:00 |
|
Anton Georgiev
|
e3729a7bf3
|
better updates
|
2018-11-12 22:09:04 +00:00 |
|
Anton Georgiev
|
1528911a8e
|
Merge pull request #6241 from KDSBrowne/fix-dropdown-FF
Fix dropdown menus not closing in FireFox
|
2018-11-12 14:18:49 -05:00 |
|
Anton Georgiev
|
98ac77dc03
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into iframe-outside-commands
|
2018-11-12 17:01:06 +00:00 |
|
KDSBrowne
|
f9ec2c3759
|
fix null event error in firefox
|
2018-11-12 16:45:37 +00:00 |
|
bobakoftadeh
|
04421e631b
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-mange-b
|
2018-11-12 08:40:47 -08:00 |
|
Anton Georgiev
|
efa1bc5ef8
|
Merge pull request #6226 from jfsiebel/remove-client-side-acl
Remove ACL from client
|
2018-11-12 11:31:53 -05:00 |
|
Anton Georgiev
|
ce26a3ed5e
|
Merge branch 'master' into remove-client-side-acl
|
2018-11-12 11:29:43 -05:00 |
|
Anton Georgiev
|
10e9cb9c37
|
Merge pull request #6224 from Tainan404/breakout-room-html5
Change the method permissions for moderator
|
2018-11-12 11:25:51 -05:00 |
|
Anton Georgiev
|
74879b76be
|
Merge pull request #6236 from MaximKhlobystov/long_build
Make sure Travis CI doesn't fail when command doesn't produce output for too long
|
2018-11-12 07:30:10 -05:00 |
|
Tainan Felipe
|
460cbdbcde
|
Re-add settings
|
2018-11-12 09:46:20 -02:00 |
|
Maxim Khlobystov
|
478349606c
|
Prevent Travis from failing when there is no output for 10 minutes
|
2018-11-09 15:27:57 -05:00 |
|
João Francisco Siebel
|
076864ffd0
|
merge with master
|
2018-11-09 13:54:33 -02:00 |
|
Tainan Felipe
|
164835d49b
|
Merge branch 'master' into breakout-room-html5
|
2018-11-09 13:49:15 -02:00 |
|
Anton Georgiev
|
adbe9bb546
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into iframe-outside-commands
|
2018-11-08 19:34:57 +00:00 |
|
Anton Georgiev
|
81122251f4
|
Merge pull request #6231 from KDSBrowne/remove-recording-label
Remove visible recording label
|
2018-11-08 14:17:54 -05:00 |
|
KDSBrowne
|
718942668e
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into remove-recording-label
|
2018-11-08 19:15:17 +00:00 |
|
KDSBrowne
|
32dd7ce944
|
use calc() instead of new variables
|
2018-11-08 19:13:14 +00:00 |
|
Anton Georgiev
|
423d3a5819
|
Merge pull request #6225 from Tainan404/add-meteor-disconnect
Add meteor disconnect
|
2018-11-08 14:03:04 -05:00 |
|
Anton Georgiev
|
9555cd68b8
|
Merge pull request #6105 from KDSBrowne/start-poll-01
Add start, stop and publish a poll for Presenter
|
2018-11-08 13:52:36 -05:00 |
|
KDSBrowne
|
565b55e8e7
|
remove unused styles
|
2018-11-07 13:00:21 +00:00 |
|
KDSBrowne
|
10d5d0706e
|
remove visible recording label / add missing formatted string / fix recording icon
|
2018-11-07 02:20:19 +00:00 |
|
Tainan Felipe
|
060435d54e
|
Rename from Breakout-room to breakout-room
|
2018-11-06 13:42:30 -02:00 |
|
Anton Georgiev
|
471a847f0f
|
Merge pull request #6227 from ritzalam/change-meetingid-to-meetingID
- change meetingid param to meetingID so it's consistent with how ot…
|
2018-11-05 15:09:38 -05:00 |
|
Richard Alam
|
5f8803917c
|
- change meetingid param to meetingID so it's consistent with how other params are spelled.
|
2018-11-05 12:03:35 -08:00 |
|
João Francisco Siebel
|
016efcc0eb
|
Remove ACL from client side. close #6138
|
2018-11-05 17:30:37 -02:00 |
|
KDSBrowne
|
c552b3522c
|
prevent breakout and poll pane both open
|
2018-11-05 17:52:06 +00:00 |
|
Richard Alam
|
eaf41f719d
|
Merge pull request #6220 from riadvice/meetingid-for-end-meeting-callback
Add `meetingid` GET parameter to endCallbackUrl
|
2018-11-05 12:23:13 -05:00 |
|
Tainan Felipe
|
958e7b06ba
|
Remove the intl id
|
2018-11-05 14:02:04 -02:00 |
|
Tainan Felipe
|
50d8995600
|
Add the meteor disconnect on meeting ended and error screen
|
2018-11-05 13:51:39 -02:00 |
|
Tainan Felipe
|
1768c49169
|
Add the meteor disconnect on meeting ended and error screen
|
2018-11-05 13:48:57 -02:00 |
|
Tainan Felipe
|
fd8a63fbbb
|
Change the method permissions for moderator
|
2018-11-05 10:27:56 -02:00 |
|
Fred Dixon
|
18c3836886
|
Merge pull request #6222 from fcecagno/webhooks-on-1.1
Fix webhooks
|
2018-11-03 23:42:58 -04:00 |
|
Felipe Cecagno
|
f2c4cb7165
|
add external meeting id to rap-archive-started from mapping
|
2018-11-04 00:27:01 -03:00 |
|
Ghazi Triki
|
0f41551530
|
Add meetingid GET parameter to endCallbackUrl.
|
2018-11-03 17:06:16 +01:00 |
|
KDSBrowne
|
8378606889
|
move presenter and poll check to UserPolls
|
2018-11-02 21:43:49 +00:00 |
|
Richard Alam
|
ccf79b8bca
|
Merge pull request #6214 from riadvice/merge-2.x-release-into-master
Merge 2.0-RC7 release into master
|
2018-11-02 17:39:48 -04:00 |
|
KDSBrowne
|
538e248058
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into start-poll-01
|
2018-11-02 21:25:40 +00:00 |
|
Ghazi Triki
|
ff80b30df1
|
Merge remote-tracking branch 'bigbluebutton/master' into merge-2.x-release-into-master
# Conflicts:
# bigbluebutton-html5/imports/ui/services/audio-manager/index.js
|
2018-11-02 21:02:02 +01:00 |
|
Ghazi Triki
|
827a900d9a
|
Update MainApplicationShell code style.
|
2018-11-02 20:58:12 +01:00 |
|