Commit Graph

22818 Commits

Author SHA1 Message Date
Tainan Felipe
7243d3bbc3 Fix css variable was not working 2018-10-30 13:19:22 -03:00
KDSBrowne
76e3759039 add formated message 2018-10-30 15:57:10 +00:00
Anton Georgiev
fe82032f89
Merge pull request #6205 from Tainan404/fix-cursor-video-dock
Add pointer cursor when hover over the video dropdown
2018-10-30 11:12:01 -04:00
KDSBrowne
ee41c0bd93 adjust variable names / remove duplicate return 2018-10-30 13:17:40 +00:00
Tainan Felipe
c6284a0fbb Add poiter cursor the hover over the video dropdown 2018-10-30 09:47:18 -03:00
Tainan Felipe
a0a2b7605f Rename function breakouts to findBreakouts 2018-10-29 16:36:45 -03:00
Tainan Felipe
07d89a0132 Add intl to breakout room name 2018-10-29 16:29:45 -03:00
KDSBrowne
3fc941bd49 prevent users interacting with elements behind polling modal like view 2018-10-29 16:57:19 +00:00
KDSBrowne
78a5ff6fc9 edit poll pane close btn 2018-10-29 16:14:05 +00:00
KDSBrowne
bba899c4a7 prevent poll closing on poll pane hide 2018-10-29 15:27:50 +00:00
KDSBrowne
ee73ec4dd3 remove left over react-router code 2018-10-28 17:02:54 +00:00
Tainan Felipe
0e1f805c30 remove log 2018-10-26 17:26:24 -03:00
Tainan Felipe
0d22580b1c Change to count 2018-10-26 16:57:37 -03:00
KDSBrowne
7f396f3590 remove container not being used 2018-10-26 16:06:11 +00:00
Tainan Felipe
32dd8c4740 migrate to session 2018-10-26 12:16:29 -03:00
Anton Georgiev
35921df58d
Merge pull request #6198 from antobinary/fix-chat-toggle
Updated package-lock.json
2018-10-26 11:13:17 -04:00
Tainan Felipe
fceeca3795 Merge remote-tracking branch 'upstream/master' into breakout-room-html5 2018-10-26 11:52:54 -03:00
Anton Georgiev
8dfdaa0f29 added "repository" to package.json 2018-10-26 14:35:42 +00:00
Anton Georgiev
4a1de5c924 updated packages to fix vulnerabilities (npm audit) 2018-10-26 14:21:25 +00:00
João Francisco Siebel
b9aff5a6f1 handle empty tool list. close #6171 2018-10-26 11:17:41 -03:00
Anton Georgiev
627972ed02 updated package-lock.json 2018-10-26 14:05:55 +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
Anton Georgiev
9b93cfc985
Merge pull request #6196 from antobinary/fix-chat-toggle
Recover toggle PublicChat
2018-10-26 08:43:09 -04: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
Chad Pilkey
952f777c59
Merge pull request #6195 from bigbluebutton/tack-sip-conn-ids
Track sip conn ids
2018-10-25 19:24:18 -04:00
Richard Alam
e1e07db885 - we still need to remove the connection from the global audio list but not send the global audio left event
to akka-apps
2018-10-25 16:21:47 -07:00
Richard Alam
82bff6d573 - check if the client reconnected and when the old connection cleans up, do not hangup the
user from the voice conference
2018-10-25 15:56:09 -07:00
Richard Alam
446c2e28f4 - allow deploying of sip app to red5 2018-10-25 15:55:34 -07:00
KDSBrowne
3ced879e41 clean up togglePollMenu() 2018-10-25 22:41:45 +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
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
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
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
Chad Pilkey
214e3283df
Merge pull request #6187 from ritzalam/delay-removing-user-when-leaving
Delay removing user when leaving
2018-10-25 13:20:18 -04:00
KDSBrowne
ec5af5b855 fix merge issues 2018-10-25 16:54:29 +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