Calvin Walton
|
08125c227b
|
Revert "Fix loading slide images in presentation format"
This reverts commit 4346b0fc9e.
|
2019-02-12 14:36:36 -05:00 |
|
Anton Georgiev
|
51e3cac2ff
|
Merge pull request #6761 from capilkey/fix-html5-ismoderator-check
Fix ActionBar moderator check
|
2019-02-12 14:30:23 -05:00 |
|
Ghazi Triki
|
78232d8b92
|
Remove RedisStorageService commands logging and use transactions for multiple commands.
|
2019-02-12 20:04:47 +01:00 |
|
Anton Georgiev
|
1a180bccd9
|
Merge pull request #6735 from antobinary/record-indicator
Recording toggle - allow clicking on the text && Restyling
|
2019-02-12 11:35:56 -05:00 |
|
Fred Dixon
|
ef52de0bbd
|
Merge pull request #6765 from ffdixon/fix-bbb-conf-18
Properly assign kurento[0].url in default.yaml
|
2019-02-11 23:59:48 -08:00 |
|
Fred Dixon
|
915393ba1a
|
Properly assign kurento[0].url in default.yaml
|
2019-02-12 01:58:47 -06:00 |
|
Chad Pilkey
|
b7ab7d2306
|
fix actionbar moderator check
|
2019-02-11 15:35:36 -08:00 |
|
Anton Georgiev
|
e7383f78ee
|
Merge pull request #6760 from BobakOftadeh/fix-remove-presentations
Fix remove presentation feature
|
2019-02-11 18:19:02 -05:00 |
|
bobakoftadeh
|
9c81a06e68
|
Fix removing presentation feature
|
2019-02-11 23:02:32 +00:00 |
|
Chad Pilkey
|
82721ed115
|
Merge pull request #6759 from ritzalam/fix-api-array-responses
- fix json response format for stuns and enter api
|
2019-02-11 17:44:41 -05:00 |
|
Richard Alam
|
e85e48c64a
|
- fix json response format for stuns and enter api
|
2019-02-11 14:38:15 -08:00 |
|
Anton Georgiev
|
38b743b895
|
Merge pull request #6711 from jfsiebel/sync-lock-settings-status
Sync meeting lock settings status
|
2019-02-11 17:34:44 -05:00 |
|
Anton Georgiev
|
094e4c90f4
|
Merge pull request #6758 from bigbluebutton/revert-6729-issue-6565
Revert "Fix error when user is not moderator"
|
2019-02-11 17:18:14 -05:00 |
|
Anton Georgiev
|
a61e3e17d3
|
Revert "Fix error when user is not moderator"
|
2019-02-11 17:14:35 -05:00 |
|
Anton Georgiev
|
208e806ced
|
Merge pull request #6733 from vitormateusalmeida/issue-6665
Fix sidebar elements appearance
|
2019-02-11 11:55:04 -05:00 |
|
Anton Georgiev
|
1b37c284a4
|
Merge pull request #6698 from vitormateusalmeida/issue-6601
Fix chat input between chats
|
2019-02-11 10:39:39 -05:00 |
|
Fred Dixon
|
6f7ffdf83d
|
Increase timeout for waiting for bbb-web to startup
|
2019-02-10 23:03:18 -08:00 |
|
Fred Dixon
|
e26df7cf06
|
Merge pull request #6754 from riadvice/fix-stun-turn
Fix API stuns call
|
2019-02-10 22:57:08 -08:00 |
|
Ghazi Triki
|
b2a4b1efbe
|
Fix API stuns call.
|
2019-02-11 07:56:13 +01:00 |
|
Fred Dixon
|
0c09e63d21
|
Merge pull request #6753 from ffdixon/fix-bbbconf-17
Clear previous SIP errors in sip.log
|
2019-02-10 22:24:53 -08:00 |
|
Fred Dixon
|
d2119bd29e
|
Clear previous SIP errors in sip.log
|
2019-02-11 00:23:10 -06:00 |
|
Fred Dixon
|
d2ff73145d
|
Merge pull request #6752 from ffdixon/fix-bbb-web-17
Restored declaration for PROTOCOL_RTMP
|
2019-02-10 20:41:19 -08:00 |
|
Fred Dixon
|
2e86350807
|
Restored declaration for PROTOCOL_RTMP
|
2019-02-10 22:40:36 -06:00 |
|
Fred Dixon
|
5bedb78fe0
|
Merge pull request #6751 from ffdixon/fix-bbb-conf-17
Use lowercase for http/https
|
2019-02-10 20:35:28 -07:00 |
|
Fred Dixon
|
96911bc2de
|
Use lowercase for http/https
|
2019-02-10 21:34:43 -06:00 |
|
Richard Alam
|
0120a7a114
|
Merge pull request #6750 from ritzalam/retry-callbacks
- retry end meeting callback in 30ms, 1min, 2min, and 5min if failing
|
2019-02-10 21:38:56 -05:00 |
|
Richard Alam
|
533fac76a2
|
Merge pull request #6746 from ritzalam/improve-logging
Improve logging
|
2019-02-10 21:37:50 -05:00 |
|
Richard Alam
|
bd3fb3f9f7
|
- retry end meeting callback in 30ms, 1min, 2min, and 5min if failing
|
2019-02-10 10:37:01 -08:00 |
|
Fred Dixon
|
783ee16ca9
|
Merge pull request #6749 from ffdixon/fix-bbb-conf-16
Update bbb-conf to now call apply-config.sh (if available)
|
2019-02-10 10:52:12 -07:00 |
|
Fred Dixon
|
760e9355e2
|
First implementation of a script to apply local changes between restats
|
2019-02-10 11:48:50 -06:00 |
|
Fred Dixon
|
fa42627441
|
Refactored bbb-conf to better read data from configuration files. Removed some old code.
|
2019-02-10 11:48:17 -06:00 |
|
Richard Alam
|
7185eae79b
|
- make easy to collect data from logs
|
2019-02-09 19:09:32 -08:00 |
|
Richard Alam
|
2408951946
|
- put log into single line
|
2019-02-09 09:43:29 -08:00 |
|
Richard Alam
|
4e32514e03
|
Merge branch 'riadvice-akka-transcode-update'
|
2019-02-09 09:21:46 -08:00 |
|
Richard Alam
|
3941e6bb54
|
- make executable
|
2019-02-09 09:21:22 -08:00 |
|
Richard Alam
|
733923de99
|
Merge branch 'akka-transcode-update' of https://github.com/riadvice/bigbluebutton into riadvice-akka-transcode-update
|
2019-02-09 09:04:04 -08:00 |
|
Richard Alam
|
3e286f1ed6
|
Merge pull request #6473 from zhu/patch-3
Fix convert jpg with orientation metadata
|
2019-02-09 12:03:03 -05:00 |
|
Richard Alam
|
b3e78b89ed
|
Merge branch 'pedrobmarin-authenticate-sfu-pad-connections'
|
2019-02-09 09:01:12 -08:00 |
|
Richard Alam
|
4c5bd2df7e
|
- set the bbb-web port to 8090
|
2019-02-09 08:36:27 -08:00 |
|
Richard Alam
|
7c76930feb
|
Merge branch 'authenticate-sfu-pad-connections' of https://github.com/pedrobmarin/bigbluebutton into pedrobmarin-authenticate-sfu-pad-connections
|
2019-02-09 08:27:12 -08:00 |
|
Richard Alam
|
bce0b62c11
|
Merge pull request #6742 from capilkey/2.2-fix-flash-browser-detection
Use bowser for browser detection - 2.2 Edition
|
2019-02-09 10:07:58 -05:00 |
|
Fred Dixon
|
482cf4463d
|
Merge pull request #6743 from riadvice/fix-bbb-video-broadcast
Update video-broadcast/build.gradle
|
2019-02-09 00:12:04 -07:00 |
|
Ghazi Triki
|
5b7acbb050
|
Update video-broadcast/build.gradle
|
2019-02-09 08:11:07 +01:00 |
|
Chad Pilkey
|
269cb3d911
|
[Flash] add the raw UA to the browser_info log
|
2019-02-08 16:02:57 -08:00 |
|
Chad Pilkey
|
0e7bc8ae93
|
[Flash] use bowser for browser detection, fix ss browser detection
|
2019-02-08 14:49:48 -08:00 |
|
Vitor Mateus
|
96f3d9fecc
|
Code improvement
|
2019-02-08 17:23:35 -02:00 |
|
Pedro Beschorner Marin
|
882026497f
|
Merge branch 'master' into fixes-6667
|
2019-02-08 16:29:32 -02:00 |
|
Anton Georgiev
|
d0f2e8806e
|
Merge branch 'master' into sync-lock-settings-status
|
2019-02-08 13:13:58 -05:00 |
|
Anton Georgiev
|
245eb4ad44
|
Merge pull request #6687 from KDSBrowne/2.2-fix-SR-duplicate-labels
Prevent SR from repeating button labels twice
|
2019-02-08 13:11:01 -05:00 |
|
Anton Georgiev
|
4c169e7329
|
Merge pull request #6720 from vitormateusalmeida/issue-6521
Implement reset zoom
|
2019-02-08 12:58:22 -05:00 |
|