Bobak Oftadeh
|
91592a5d80
|
cleaned up code for moderator menu
|
2018-11-12 09:40:18 -08:00 |
|
bobakoftadeh
|
c33723ac14
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-manage-C
|
2018-11-12 09:15:55 -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 |
|
bobakoftadeh
|
87f63baa5a
|
Improved interface for lock settings modal
|
2018-11-09 16:25:15 -08: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
|
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 |
|
bobakoftadeh
|
020ac800af
|
Implemented functionality of lock settings
|
2018-11-08 10:55:12 -08: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 |
|
bobakoftadeh
|
856459e989
|
Merge branch 'user-manage-b' of https://github.com/BobakOftadeh/bigbluebutton into user-manage-C
|
2018-11-06 13:47:38 -08:00 |
|
Bobak Oftadeh
|
edc941da9e
|
Implementation of lock-view modal menu
|
2018-11-06 13:39:07 -08: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 |
|
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 |
|
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
|
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 |
|