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 |
|
Maxim Khlobystov
|
9b27c89bc8
|
Adjustments to the autoShareWebcam
|
2018-11-07 16:45:52 -05:00 |
|
Maxim Khlobystov
|
a2c490f4f6
|
Stopping the tracks to avoid fetching two cameras at the same time + Making the constraints less restricted
|
2018-11-07 16:16:36 -05:00 |
|
Maxim Khlobystov
|
91dad9d882
|
Fixing some linter error
|
2018-11-07 14:30: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 |
|
Maxim Khlobystov
|
9f67ce4106
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webcam-choice
|
2018-11-06 18:17:52 -05:00 |
|
Maxim Khlobystov
|
90f38561c3
|
Add Webcam Settings to choose a camera
|
2018-11-06 18:10:56 -05: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 |
|
Ghazi Triki
|
a52e907593
|
Fix API calls.
|
2018-11-02 20:57:54 +01:00 |
|
Ghazi Triki
|
2ca74819ce
|
Improve freemaker templates.
|
2018-11-02 20:57:33 +01:00 |
|
Richard Alam
|
0ce0845ca7
|
Merge pull request #6219 from riadvice/fix-meta-storage
Fix storing meeting metadata
|
2018-11-02 12:58:56 -04:00 |
|
Ghazi Triki
|
56a7038d8a
|
Fix storing meeting metadata
|
2018-11-02 17:51:15 +01:00 |
|
Bobak Oftadeh
|
a97a1ece37
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-manage-b
|
2018-11-02 09:17:07 -07:00 |
|
Anton Georgiev
|
bada73b7e7
|
Merge pull request #6178 from Tainan404/breakout-room-html5
Add presenter POV for breakout room on HTML5.
|
2018-11-02 11:16:33 -04:00 |
|
Anton Georgiev
|
6c8722969c
|
Merge pull request #6206 from Tainan404/fix-cursor-video-dock
Apply transparency on connecting animation on video item.
|
2018-11-02 11:02:15 -04:00 |
|
Anton Georgiev
|
357f341a3e
|
Merge branch 'master' into breakout-room-html5
|
2018-11-02 09:26:09 -04:00 |
|
Anton Georgiev
|
50bc9135e0
|
Merge pull request #6217 from bigbluebutton/revert-6081-full-width-cameras
Revert "Make it so that cameras use the full space of the video window"
|
2018-11-02 09:24:33 -04:00 |
|
Ghazi Triki
|
0ff63f9cde
|
Remove HTML escaping in freemaker templates, it is automatic since version 2.3.24 and fixed metadata display.
|
2018-11-01 21:52:53 +01:00 |
|
Anton Georgiev
|
cc453e027d
|
Merge pull request #6201 from capilkey/html5-delay-echo-test
[HTML5] delay the notfication that the echo test is connected
|
2018-11-01 16:06:53 -04:00 |
|
Anton Georgiev
|
70ac42f6bb
|
Merge pull request #6199 from jfsiebel/configurable-whiteboard-tools-improvement
Configurable whiteboard tools improvement
|
2018-11-01 16:01:21 -04:00 |
|
Anton Georgiev
|
4940b45bb1
|
Merge pull request #6210 from jfsiebel/configurable-shortcut-list
Configurable available shortcuts
|
2018-11-01 15:56:44 -04:00 |
|
Anton Georgiev
|
41c7791272
|
Merge pull request #6192 from Tainan404/fix-presentation-hover
Remove behavior that add opacity when hover the presentation area.
|
2018-11-01 14:50:47 -04:00 |
|
KDSBrowne
|
9e483a181e
|
move live-result sort to service
|
2018-11-01 18:20:35 +00:00 |
|
Tainan Felipe
|
5ea3ff2a7c
|
Add permissioin on acl to moderator end breakout
|
2018-11-01 15:04:56 -03:00 |
|
Tainan Felipe
|
d87b231dfe
|
Allow moderator end all breakouts
|
2018-11-01 14:55:35 -03:00 |
|
Anton Georgiev
|
615fca3a48
|
add demo_iframe.jsp for #6215
|
2018-11-01 17:52:03 +00:00 |
|
Tainan Felipe
|
5aa86f8ccb
|
Clear setIntervel when unmount the component
|
2018-11-01 13:53:27 -03:00 |
|