Commit Graph

22582 Commits

Author SHA1 Message Date
Tainan Felipe
32dd8c4740 migrate to session 2018-10-26 12:16:29 -03:00
Tainan Felipe
fceeca3795 Merge remote-tracking branch 'upstream/master' into breakout-room-html5 2018-10-26 11:52:54 -03:00
Anton Georgiev
9b93cfc985
Merge pull request #6196 from antobinary/fix-chat-toggle
Recover toggle PublicChat
2018-10-26 08:43:09 -04:00
Anton Georgiev
05da6ff047 toggle PublicChat 2018-10-26 12:36:51 +00:00
Anton Georgiev
194140c056
Merge pull request #6123 from zhu/patch-1
Fix compatibility in some old browser
2018-10-25 14:52:52 -04: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
Anton Georgiev
54536ae4db
Merge pull request #6162 from antobinary/remove-react-router
Remove react router
2018-10-25 14:07:35 -04: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
Anton Georgiev
3d2e1069be
Merge pull request #6179 from oswaldoacauan/html5-theming
Add skinning/theming capability for HTML5
2018-10-25 12:51:42 -04:00
Anton Georgiev
35d92c3e6d improve on callbacks when joining client 2018-10-25 15:51:53 +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
a3de0579f3 Remove debug logging 2018-10-24 17:34:28 -02: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
2d1ad1fcd9
Merge pull request #6182 from antobinary/custom-configs
Drop metadata configs; use userdata configs for autoSwap
2018-10-24 13:07:47 -04:00
Anton Georgiev
ffbc11162e fixed linter errors 2018-10-24 15:33:39 +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
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
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
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
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
3a0ce3c57f Altered CSS variables 2018-10-16 10:24:10 -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