Commit Graph

2912 Commits

Author SHA1 Message Date
KDSBrowne
7f396f3590 remove container not being used 2018-10-26 16:06:11 +00:00
KDSBrowne
9adf429b32 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into start-poll-01 2018-10-26 13:23:32 +00:00
KDSBrowne
6a16b379d7 fix actions poll toggle not working when userlist is closed 2018-10-26 12:54:35 +00:00
KDSBrowne
4462e050ee fix polling title misalignment 2018-10-26 12:49:14 +00:00
KDSBrowne
8f24fcfd01 make userlist-poll btn toggle menu 2018-10-26 12:37:29 +00:00
Anton Georgiev
05da6ff047 toggle PublicChat 2018-10-26 12:36:51 +00:00
KDSBrowne
d5eae7c288 remove comment left over from merge 2018-10-26 01:47:48 +00:00
KDSBrowne
0551691684 edit css styles 2018-10-26 01:40:15 +00:00
KDSBrowne
3ced879e41 clean up togglePollMenu() 2018-10-25 22:41:45 +00:00
KDSBrowne
935eb1289d Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into start-poll-01 2018-10-25 18:39:26 +00:00
KDSBrowne
c49b72f926 fix mobile poll response view 2018-10-25 18:33:02 +00:00
Anton Georgiev
c80e379de6
Merge pull request #6104 from Tainan404/zoom-implementation
Add fit-to-width  for html5
2018-10-25 14:31:29 -04:00
KDSBrowne
2b61b8a2a0 fix style conflict 2018-10-25 18:23:43 +00:00
KDSBrowne
188118d9ea Merge branch 'test-merge-anton' into t 2018-10-25 18:19:25 +00:00
Anton Georgiev
14543bb478 adjust chat title 2018-10-25 18:03:25 +00:00
Anton Georgiev
a5c2ddc602 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into remove-react-router 2018-10-25 17:58:00 +00:00
KDSBrowne
5d8c4dc909 change polling title color 2018-10-25 17:48:23 +00:00
KDSBrowne
da30345649 fix style issues after merge 2018-10-25 17:44:03 +00:00
KDSBrowne
95bb36df82 Merge remote-tracking branch 'Upstream/master' into start-poll-01 2018-10-25 17:25:26 +00:00
KDSBrowne
5c62507f0e prevent offline users being displayed in live results 2018-10-25 17:20:32 +00:00
KDSBrowne
ec5af5b855 fix merge issues 2018-10-25 16:54:29 +00:00
KDSBrowne
3f521a6f6a Merge branch 'html5-theming' into test-merge-anton 2018-10-25 16:33:56 +00: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
KDSBrowne
de51ab6fd6 position polling in center screen for mobile 2018-10-25 16:07:24 +00:00
Anton Georgiev
ff837fdd09 drop unnecessary Boolean() wrapper 2018-10-25 15:20:37 +00:00
Oswaldo Acauan
41cfdaaf30 Fix colors and sizes 2018-10-25 10:46:31 -02:00
Tainan Felipe
ab064f47c9 fiz zoom when fit to width out 2018-10-24 16:50:49 -03:00
Oswaldo Acauan
458b2f442f Merge branch 'html5-theming' of github.com:oswaldoacauan/bigbluebutton into css-variables 2018-10-24 17:32:21 -02:00
Oswaldo Acauan
1de297c1e2 Fix line-heights and convert scss calculations to calc() 2018-10-24 17:32:09 -02:00
Anton Georgiev
ef9f248607
Merge branch 'master' into html5-theming 2018-10-24 14:58:59 -04:00
Anton Georgiev
cde6311a5d Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into remove-react-router 2018-10-24 18:26:13 +00:00
Tainan Felipe
69e1404ed1 Fix intl 2018-10-24 14:54:19 -03:00
Oswaldo Acauan
8696b831d3 Change SCSS variables to CSS variables missed while merging with upstream 2018-10-24 15:10:15 -02:00
Anton Georgiev
ffbc11162e fixed linter errors 2018-10-24 15:33:39 +00:00
KDSBrowne
e951b9180f prevent other menus covering polling options 2018-10-24 14:50:47 +00:00
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
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
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
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