Tainan Felipe
|
0d22580b1c
|
Change to count
|
2018-10-26 16:57:37 -03:00 |
|
Felipe Cecagno
|
8e35874854
|
fix rap events
|
2018-10-26 14:28:57 -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 |
|
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 |
|
Richard Alam
|
62e74c365f
|
- when receiving the get users and get voice users response, check if the received users
are in the old users list or they are new ones. Need to remove users not on the new user's list
as they might have left during auto-reconnects.
|
2018-10-25 09:08:56 -07:00 |
|
KDSBrowne
|
de51ab6fd6
|
position polling in center screen for mobile
|
2018-10-25 16:07:24 +00: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 |
|
Felipe Cecagno
|
0947afee58
|
save user mapping to memory db before trying to save on redis to avoid inconsistency on the next event
|
2018-10-24 23:50:51 -03:00 |
|
Felipe Cecagno
|
acf22177ae
|
add compatibility with old messaging format
|
2018-10-24 23:49:56 -03:00 |
|
Anton Georgiev
|
ee28c97aa1
|
Merge pull request #6190 from antobinary/fix-6167
Pulled html5 locales oct 24, 2018
|
2018-10-24 16:39:25 -04:00 |
|
Anton Georgiev
|
1c720be973
|
pulled html5 locales oct 24, 2018
|
2018-10-24 20:36:48 +00:00 |
|