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
|
ce26a3ed5e
|
Merge branch 'master' into remove-client-side-acl
|
2018-11-12 11:29:43 -05:00 |
|
Tainan Felipe
|
460cbdbcde
|
Re-add settings
|
2018-11-12 09:46:20 -02:00 |
|
João Francisco Siebel
|
076864ffd0
|
merge with master
|
2018-11-09 13:54:33 -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 |
|
João Francisco Siebel
|
016efcc0eb
|
Remove ACL from client side. close #6138
|
2018-11-05 17:30:37 -02:00 |
|
Tainan Felipe
|
fd8a63fbbb
|
Change the method permissions for moderator
|
2018-11-05 10:27:56 -02:00 |
|
KDSBrowne
|
538e248058
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into start-poll-01
|
2018-11-02 21:25:40 +00: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 |
|
Tainan Felipe
|
5ea3ff2a7c
|
Add permissioin on acl to moderator end breakout
|
2018-11-01 15:04:56 -03:00 |
|
Anton Georgiev
|
04883ffcdb
|
handle iframe toggleRecording and toggle self muting
|
2018-11-01 15:03:16 +00:00 |
|
Bobak Oftadeh
|
6bde6b06f5
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-manage-b
|
2018-10-29 14:39:25 -07:00 |
|
Tainan Felipe
|
fceeca3795
|
Merge remote-tracking branch 'upstream/master' into breakout-room-html5
|
2018-10-26 11:52:54 -03:00 |
|
KDSBrowne
|
47218ea351
|
Merge branch 'remove-react-router' of https://github.com/antobinary/bigbluebutton into test-merge-anton
|
2018-10-25 16:18:31 +00:00 |
|
Anton Georgiev
|
cde6311a5d
|
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into remove-react-router
|
2018-10-24 18:26:13 +00:00 |
|
Anton Georgiev
|
57dc55b559
|
drop metadata configs; use userdata configs for autoSwap
|
2018-10-23 20:44:17 +00:00 |
|
Tainan Felipe
|
958bd406a6
|
Merge remote-tracking branch 'upstream/master' into breakout-room-html5
|
2018-10-23 14:53:46 -03:00 |
|
Bobak Oftadeh
|
0cde376e67
|
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into user-manage-b
|
2018-10-22 10:06:18 -07:00 |
|
João Francisco Siebel
|
f936e319de
|
implement configurable whiteboard tools. close #5826
|
2018-10-19 14:05:56 -03:00 |
|
João Francisco Siebel
|
252bacb917
|
Add multiUserPenOnly parameter in yml
|
2018-10-18 14:03:11 -03:00 |
|
KDSBrowne
|
bae71203a5
|
Merge branch 'remove-react-router' of https://github.com/antobinary/bigbluebutton into poll-with-no-router
|
2018-10-17 20:34:05 +00:00 |
|
KDSBrowne
|
51e14946db
|
fix live results not being reset
|
2018-10-16 17:22:12 +00:00 |
|
Anton Georgiev
|
8ebb71322b
|
remove chat url from settings.yml
|
2018-10-16 15:58:41 +00:00 |
|
KDSBrowne
|
cb6e988134
|
add missing items from setting.yml after merge
|
2018-10-16 15:25:45 +00:00 |
|
KDSBrowne
|
45eeb1d400
|
Merge remote-tracking branch 'Upstream/master' into start-poll-01
|
2018-10-16 15:19:24 +00:00 |
|
Bobak Oftadeh
|
0a3568cc74
|
Added mute meeting settings to yml file
|
2018-10-15 15:24:56 -07:00 |
|
João Francisco Siebel
|
68aa29de68
|
rename file and add users-settings subscription
|
2018-09-25 09:37:45 -03:00 |
|
João Francisco Siebel
|
296ef8fb88
|
Merge remote-tracking branch 'upstream/master' into HEAD
|
2018-09-24 14:46:17 -03:00 |
|