Commit Graph

22839 Commits

Author SHA1 Message Date
KDSBrowne
9c3a21641b prevent chat / poll pane being open at the same time 2018-10-24 14:29:51 +00:00
KDSBrowne
abd5e8a224 update styling / fix bugs 2018-10-24 14:17:13 +00:00
Anton Georgiev
e888f5dc14 removed dummy button examples visible without presentation 2018-10-24 14:01:07 +00:00
Anton Georgiev
74c51e37c8 drop obsolete || false check 2018-10-24 12:46:05 +00:00
Anton Georgiev
57dc55b559 drop metadata configs; use userdata configs for autoSwap 2018-10-23 20:44:17 +00:00
Tainan Felipe
2b5c9a32b4 Add intl 2018-10-23 17:34:09 -03:00
Tainan Felipe
60e0446d89 Fix zoom keeps after fit to width 2018-10-23 16:58:13 -03:00
Tainan Felipe
4d7861f0be Add intl message 2018-10-23 16:29:19 -03:00
Richard Alam
a3031ae5c7
Merge pull request #6180 from ritzalam/do-not-eject-voice-user
- check to make sure user is not kicked out of voice conference even…
2018-10-23 14:40:31 -04:00
Tainan Felipe
cf08440a25 Remove function 2018-10-23 15:16:34 -03:00
Tainan Felipe
c53a007438 Remove chages on modifier 2018-10-23 15:15:10 -03:00
Richard Alam
fd36501c84 - check to make sure user is not kicked out of voice conference even when joined using webrtc when
flash client auto-reconnects.
2018-10-23 10:55:51 -07:00
Tainan Felipe
958bd406a6 Merge remote-tracking branch 'upstream/master' into breakout-room-html5 2018-10-23 14:53:46 -03:00
Tainan Felipe
c2538be574 Remove consoles 2018-10-23 14:27:48 -03:00
Tainan Felipe
1bc8ae0b21 add join audio only, and imporov UX 2018-10-23 14:18:09 -03:00
Oswaldo Acauan
f71d32a464 Move from SCSS variables to CSS custom properties (variables) and add custom parameters for theming/skinning
WIP

wip

wip

format

wip

Move from SCSS variables to CSS custom properties (variables) and add custom parameters for theming/skinning
2018-10-23 14:21:58 -02:00
Fred Dixon
f1cdd7107e
Merge pull request #6173 from ffdixon/fix-executable
Fix executable of bbb-conf
2018-10-22 16:41:25 -04:00
Fred Dixon
d067fc8ee4 Fix executable of bbb-conf 2018-10-22 15:40:34 -05:00
Fred Dixon
bd90449671
Merge pull request #6172 from ffdixon/fix-wsUrl-bbb-conf
Update wsUrl for settings.yml
2018-10-22 16:29:50 -04:00
Fred Dixon
1ca0a251f4 Update wsUrl for settings.yml 2018-10-22 15:27:46 -05: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
Anton Georgiev
591adc89e6
Merge pull request #6168 from jfsiebel/configurable-whiteboard-tools-list
Configurable whiteboard tools
2018-10-22 13:00:14 -04:00
Anton Georgiev
dbc5bc11a0
Merge pull request #6110 from BobakOftadeh/user-manage
User manage button
2018-10-22 10:54:18 -04:00
João Francisco Siebel
f936e319de implement configurable whiteboard tools. close #5826 2018-10-19 14:05:56 -03:00
Maxim Khlobystov
1038c6e5b0
Merge pull request #6129 from MaximKhlobystov/pr-build
Travis CI Setup for HTML5
2018-10-18 15:01:56 -04:00
Maxim Khlobystov
5d2278a9a3 Hide some output of build commands. 2018-10-18 14:10:19 -04:00
João Francisco Siebel
252bacb917 Add multiUserPenOnly parameter in yml 2018-10-18 14:03:11 -03:00
KDSBrowne
c191d3b6e8 clean up styles values 2018-10-18 14:59:26 +00:00
KDSBrowne
c8b993a3a9 remove use of router in polling 2018-10-18 14:31:17 +00: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
Jesus Federico
4d122cf859
Merge pull request #6157 from jfederico/bbb-lti-preview-bug-v2.0.x-release
Fix for bug in preview not working for students
2018-10-17 15:58:21 -04:00
Richard Alam
217ff54505
Merge pull request #6159 from riadvice/close-breakout-rooms-fix
Fix breakout rooms buttons visibility for moderators
2018-10-17 15:56:59 -04:00
Richard Alam
f895c09362
Merge pull request #6160 from riadvice/fix-multi-pres
Fix PR #6122
2018-10-17 15:56:47 -04:00
KDSBrowne
defaea03fd add sound notification when poll starts 2018-10-16 22:07:42 +00:00
KDSBrowne
94cdc0aee3 add sound notification when poll starts 2018-10-16 22:06:50 +00:00
Tainan Felipe
bd01d7e4aa to squash 2018-10-16 14:55:20 -03:00
Anton Georgiev
1b9a73a31c use Session.equals syntax 2018-10-16 17:52:18 +00:00
Anton Georgiev
30c43795af work on chat alert 2018-10-16 17:48:27 +00:00
Bobak Oftadeh
062d96cbc1 Merge branch 'user-manage' of https://github.com/BobakOftadeh/bigbluebutton into user-manage-b 2018-10-16 10:34:35 -07:00
KDSBrowne
7b0498eb1a use - as symbol for users who have not responded to poll 2018-10-16 17:31:41 +00:00
Ghazi Triki
df7642117e Fix missing parameter for downloadAndProcessDocument method in ApiController.groovy 2018-10-16 18:31:16 +01:00
Bobak Oftadeh
3a0ce3c57f Altered CSS variables 2018-10-16 10:24:10 -07:00
KDSBrowne
51e14946db fix live results not being reset 2018-10-16 17:22:12 +00:00
Bobak Oftadeh
e3a1210dcf Improved clear status function 2018-10-16 09:14:51 -07:00
Anton Georgiev
b2df10c635 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into remove-react-router 2018-10-16 16:06:37 +00:00
Anton Georgiev
8ebb71322b remove chat url from settings.yml 2018-10-16 15:58:41 +00:00
Bobak Oftadeh
10b096e9b0 Merge branch 'user-manage' of https://github.com/BobakOftadeh/bigbluebutton into user-manage-b 2018-10-16 08:52:14 -07:00
Anton Georgiev
58f8738084 Merge branch 'post-router-style-fix' of github.com:KDSBrowne/bigbluebutton into remove-react-router 2018-10-16 15:51:18 +00:00
Bobak Oftadeh
e582978662 Adjusted dropdown position 2018-10-16 08:38:39 -07:00
KDSBrowne
cb6e988134 add missing items from setting.yml after merge 2018-10-16 15:25:45 +00:00