KDSBrowne
|
7068764bd6
|
fix trigger not closing menu
|
2018-08-01 17:47:03 +00:00 |
|
Anton Georgiev
|
dce2e6c860
|
Merge pull request #5949 from riadvice/pull-from-2.0
Pull from 2.0 and 2.2-dev
|
2018-08-01 13:41:53 -04:00 |
|
Ghazi Triki
|
9b86ae072d
|
Delete unwanted function call.
|
2018-08-01 18:35:29 +01:00 |
|
Ghazi Triki
|
ab750addf8
|
Fix merge issues in WhiteboardCanvas.as
|
2018-08-01 18:24:27 +01:00 |
|
Joao Siebel
|
e3ec9853b3
|
change public chat id for unread messages search
|
2018-08-01 14:03:12 -03:00 |
|
KDSBrowne
|
56ee504bdd
|
prevent console error
|
2018-08-01 16:50:11 +00:00 |
|
Bobak Oftadeh
|
f0d5969b5c
|
Added configurations to the production settings
|
2018-08-01 09:18:54 -07:00 |
|
Anton Georgiev
|
e64dbda4ce
|
add check for logClient to handle media calls
|
2018-08-01 16:06:49 +00:00 |
|
KDSBrowne
|
2993e44a2c
|
remove unneeded callback refs
|
2018-08-01 16:04:28 +00:00 |
|
KDSBrowne
|
b379f8e204
|
change variable name
|
2018-08-01 15:52:22 +00:00 |
|
KDSBrowne
|
165f3eaa8a
|
improve solution so new props dont need to be passed to dropdown component
|
2018-08-01 15:44:27 +00:00 |
|
KDSBrowne
|
78c81880db
|
Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into 5782-move-set-status
|
2018-08-01 15:43:31 +00:00 |
|
Maxim Khlobystov
|
aa8c656d7d
|
Defaulting to desktop when browser detection package fails.
|
2018-08-01 11:10:21 -04:00 |
|
Oswaldo Acauan
|
0ed7c45ec0
|
Fix Acl for cursor/annotations for pods
|
2018-08-01 10:21:44 -03:00 |
|
Oswaldo Acauan
|
3c2bb8748a
|
Fix Acl for cursor/annotations for pods
|
2018-08-01 10:21:33 -03:00 |
|
Anton Georgiev
|
35c497a6ad
|
Update index_html5_vs_flash.html
|
2018-08-01 07:50:25 -04:00 |
|
Ghazi Triki
|
26d56d34d6
|
Fix merge conflicts.
|
2018-08-01 12:14:55 +01:00 |
|
Bobak Oftadeh
|
78bcec7553
|
Implemented adjustments to logClient
|
2018-07-31 15:28:03 -07:00 |
|
Fred Dixon
|
1d783b9372
|
Update bigbluebutton-release
|
2018-07-31 17:16:52 -04:00 |
|
Anton Georgiev
|
321e4bcbad
|
Merge pull request #5947 from antobinary/test-5946
Pulled locales for HTML5 client 2018-07-31
|
2018-07-31 16:32:13 -04:00 |
|
Anton Georgiev
|
19c36acd2c
|
pulled locales for HTML5 client 2018-07-31
|
2018-07-31 20:30:13 +00:00 |
|
Anton Georgiev
|
1e10c4b717
|
Merge pull request #5946 from lfzawacki/fix-websocket-error
Correctly handle a websocket error
|
2018-07-31 16:26:50 -04:00 |
|
Lucas Fialho Zawacki
|
db4687e396
|
Correctly handle a websocket error
|
2018-07-31 17:11:49 -03:00 |
|
Joao Siebel
|
03389a8adc
|
fix unread message counter for private chats
|
2018-07-31 14:13:36 -03:00 |
|
Anton Georgiev
|
78847f89ad
|
attempt to pull 2.0 into 2.2
|
2018-07-31 16:18:23 +00:00 |
|
Fred Dixon
|
177aa04cbe
|
Merge pull request #5942 from fcecagno/mp4-recording
Use video_formats property in the presentation rap scripts
|
2018-07-31 11:36:26 -04:00 |
|
Fred Dixon
|
e13aeaaced
|
Merge pull request #5943 from fcecagno/webhooks-new-events
Add new events to webhooks
|
2018-07-31 11:36:11 -04:00 |
|
Felipe Cecagno
|
a714a7c798
|
include mappings for presentation, emoji, webcam and screenshare events
|
2018-07-31 12:12:32 -03:00 |
|
Felipe Cecagno
|
ec7356eb17
|
use video_formats prop while processing presentation
|
2018-07-31 11:37:02 -03:00 |
|
Tainan Felipe
|
05d04b63cb
|
remove jquery-json.js
|
2018-07-31 09:00:27 -03:00 |
|
Anton Georgiev
|
b99cc7f413
|
Merge pull request #5923 from MaximKhlobystov/client-logging-error
Fix for the client logging error
|
2018-07-30 14:10:16 -04:00 |
|
Maxim Khlobystov
|
57f8d66b35
|
Setting the correct validUser value.
|
2018-07-30 14:02:46 -04:00 |
|
Richard Alam
|
59a08d7da6
|
Merge pull request #5939 from ritzalam/user-inactivity-timer
- fix tracking of user inactivity
|
2018-07-30 13:55:36 -04:00 |
|
Richard Alam
|
a57f389f4a
|
- fix tracking of user inactivity
|
2018-07-30 10:53:29 -07:00 |
|
Richard Alam
|
fcd5c2a135
|
Merge pull request #5938 from ritzalam/user-inactivity-timer
- try to make comment clearer on purpose of value setting
|
2018-07-30 13:01:46 -04:00 |
|
Richard Alam
|
119d1aecf3
|
- try to make comment clearer on purpose of value setting
|
2018-07-30 10:00:12 -07:00 |
|
Tainan Felipe
|
80eeea2ac6
|
remove bbblogger
|
2018-07-30 13:57:06 -03:00 |
|
Richard Alam
|
56ed76ccd6
|
Merge branch 'riadvice-user-inactivity-refactor' into v2.2-dev
|
2018-07-30 09:36:12 -07:00 |
|
Richard Alam
|
804d1e2cc6
|
- change the log to be specific on what the method does.
|
2018-07-30 09:34:32 -07:00 |
|
Anton Georgiev
|
53e5a64885
|
Merge pull request #5928 from lfzawacki/the-new-adventures-of-logger-and-loggy
Additions to video, listen-only and screenshare logging
|
2018-07-30 11:53:33 -04:00 |
|
Richard Alam
|
524ee0dd2a
|
Merge branch 'user-inactivity-refactor' of https://github.com/riadvice/bigbluebutton into riadvice-user-inactivity-refactor
|
2018-07-30 07:11:32 -07:00 |
|
Anton Georgiev
|
475b6d8def
|
Merge pull request #5918 from Tainan404/issue-5672
Fix ios scrolling when drawing
|
2018-07-30 06:51:18 -04:00 |
|
Ghazi Triki
|
dffeeb8daf
|
Update user last activity time when he sends a message.
|
2018-07-30 11:43:19 +01:00 |
|
Fred Dixon
|
7db3091fa5
|
Merge pull request #5931 from prlanzarin/listen-only-permission-fix
[HTML5] Attempt to fix SIP.js listen only permission problems
|
2018-07-28 18:53:28 -04:00 |
|
Fred Dixon
|
a90b9b882e
|
Merge pull request #5933 from prlanzarin/screenshare-fix-recording
Fixed screenshare recording
|
2018-07-28 18:52:49 -04:00 |
|
Fred Dixon
|
0c0e8999f1
|
Merge pull request #5907 from riadvice/v2.0-bbb-conf
Clean bbb-conf from unused variables
|
2018-07-28 10:41:45 -04:00 |
|
Fred Dixon
|
ebf4968253
|
Merge pull request #5875 from fcecagno/fix-webhooks
Fix webhooks
|
2018-07-28 09:36:32 -04:00 |
|
Tainan Felipe
|
0c2866ccfb
|
move ReconnectingWebSocket to npm packages
|
2018-07-27 17:42:45 -03:00 |
|
James Jung
|
006ddf64cd
|
Correct variables
|
2018-07-27 14:35:16 -04:00 |
|
Ghazi Triki
|
ffb6d6e593
|
Update last user activity depending on his actions.
|
2018-07-27 19:00:15 +01:00 |
|