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 |
|
Fred Dixon
|
bf9850e29d
|
Merge pull request #6740 from riadvice/remove-tomcat
Update permissions and config file path for the new bbb-web
|
2019-02-08 10:54:04 -07:00 |
|
Ghazi Triki
|
85bb9b4184
|
Fix triplicated bbb-web service in bbb-conf
|
2019-02-08 18:45:39 +01:00 |
|
Anton Georgiev
|
2f843f3cc3
|
Merge pull request #6727 from vitormateusalmeida/issue-6726
Fix log error when meteor restart
|
2019-02-08 12:40:02 -05:00 |
|
Vitor Mateus
|
bee218adfb
|
Merge remote-tracking branch 'upstream/master' into issue-6521
|
2019-02-08 15:23:53 -02:00 |
|
Anton Georgiev
|
205bb63e84
|
Merge pull request #6654 from vitormateusalmeida/issue-6639
Fix Warning when closing private chat
|
2019-02-08 12:09:25 -05:00 |
|
Ghazi Triki
|
99aa2b5fcc
|
Use the right bigbluebutton user for recording directories.
|
2019-02-08 17:53:57 +01:00 |
|
Tainan Felipe
|
1c03f9572c
|
Add ^ to regExp
|
2019-02-08 10:05:29 -02:00 |
|
Fred Dixon
|
4baec1290c
|
Merge pull request #6738 from bigbluebutton/ffdixon-patch-2
Properly update API demos with correct path
|
2019-02-07 18:40:24 -07:00 |
|
Fred Dixon
|
e7bc3aedae
|
Properly update API demos with
|
2019-02-07 18:39:41 -07:00 |
|
Fred Dixon
|
39c4d9522a
|
Merge pull request #6737 from ffdixon/fix-bbb-conf-15
Added support to start/stop bbb-web
|
2019-02-07 18:23:49 -07:00 |
|
Fred Dixon
|
f4a0fbdc4e
|
Added support to start/stop bbb-web
|
2019-02-07 19:23:00 -06:00 |
|
Fred Dixon
|
22a42aa572
|
Merge pull request #6736 from ffdixon/update-bbb-conf-14
Updated bbb-conf for new bbb-web
|
2019-02-07 18:11:41 -05:00 |
|
Fred Dixon
|
e2d593dbd5
|
Updated bbb-conf for new bbb-web
|
2019-02-07 17:10:55 -06:00 |
|