Ghazi Triki
|
0d6acd27b4
|
Auto detect https in bbb_webrtc_bridge_sip.js and select between wss and ws
|
2017-01-31 19:31:27 +01:00 |
|
Fred Dixon
|
dc73b512e1
|
Merge pull request #3615 from ffdixon/update-bbb-conf-3
bbb-conf now recommends editing external.xml if FreeSWITCH is listening to 5066 with SSL enabled
|
2017-01-28 20:00:46 -05:00 |
|
Fred Dixon
|
0589105b37
|
bbb-conf --check warns you if you have SSL configured by still have FreeSWITCH listening on port 5066
|
2017-01-28 18:58:46 -06:00 |
|
Fred Dixon
|
b8dde7b921
|
Merge pull request #3614 from ffdixon/update-bbb-conf-2
Cleanup formatting of port for nginx in bbb-conf --check
|
2017-01-28 18:46:33 -05:00 |
|
Fred Dixon
|
a7a16a7d4c
|
Cleanup formatting of port for nginx in bbb-conf --check
|
2017-01-28 17:46:02 -06:00 |
|
Fred Dixon
|
4699d519df
|
Merge pull request #3610 from pedrobmarin/escaping-properties-file
Escaping Java's properties file instructions
|
2017-01-27 10:42:42 -05:00 |
|
Pedro Beschorner Marin
|
32cab1bcab
|
Escaping Java's properties file instructions
|
2017-01-27 12:58:45 +00:00 |
|
Fred Dixon
|
d271694dbf
|
Merge pull request #3604 from alexandrekreis/master
In recording playback, chat links open in a new tab
|
2017-01-25 18:34:04 -05:00 |
|
alexandre
|
b19ce7f714
|
In recording playback, chat links open in a new tab
Fixes #3590
|
2017-01-25 18:21:49 -02:00 |
|
Anton Georgiev
|
382573a20c
|
Merge pull request #3601 from antobinary/fix-android
html5client: limit sound on unread chat via Settings and Config
|
2017-01-25 09:05:53 -05:00 |
|
Anton Georgiev
|
64db5ef257
|
cleanup
|
2017-01-24 17:34:58 -05:00 |
|
Anton Georgiev
|
1b950f5e78
|
limit sound on unread chat via Settings and Config
|
2017-01-24 17:32:25 -05:00 |
|
Anton Georgiev
|
573284d1d2
|
Merge pull request #3599 from antobinary/fix-android
recover redirect to html5 client on android device
|
2017-01-24 15:52:36 -05:00 |
|
Anton Georgiev
|
e55705b043
|
recover redirect to html5 client on android device
|
2017-01-24 15:34:52 -05:00 |
|
Fred Dixon
|
79622284ca
|
Merge pull request #3592 from capilkey/fix-locale-typo
Fix typo in closed caption locale string
|
2017-01-24 13:11:09 -05:00 |
|
Chad Pilkey
|
cab1bebeac
|
fix typo in closed caption locale string
|
2017-01-24 12:35:56 -05:00 |
|
Anton Georgiev
|
043d55091d
|
Merge pull request #3589 from antobinary/html5-localization
add German to html5 client (from Transifex)
|
2017-01-24 11:12:58 -05:00 |
|
Anton Georgiev
|
076a13491b
|
Merge pull request #3584 from JaeeunCho/clearStatus_user
HTML5 - clear status on userlist
|
2017-01-24 11:11:01 -05:00 |
|
Anton Georgiev
|
e7926f5be4
|
add German to html5 client (from Transifex)
|
2017-01-23 16:19:53 -05:00 |
|
Fred Dixon
|
bec6543580
|
Merge pull request #3588 from capilkey/remove-webrtc-screenshare-flag
Remove screenshare WebRTC options from config.xml
|
2017-01-23 15:52:48 -05:00 |
|
Chad Pilkey
|
0ea6387b19
|
remove screenshare webrtc options from config.xml because they aren't fully implemented
|
2017-01-23 14:32:58 -05:00 |
|
Anton Georgiev
|
773b8a64fa
|
Merge pull request #3586 from antobinary/fix-screenshare-reconnect
Fix screenshare preview on reconnect. Fixes #3252
|
2017-01-20 17:31:13 -05:00 |
|
Anton Georgiev
|
00fb1added
|
log line was displaying null values
|
2017-01-20 16:56:48 -05:00 |
|
Anton Georgiev
|
5b78da8ed0
|
fix incorrect screenshare stream uri on reconnect
|
2017-01-20 16:55:34 -05:00 |
|
JaeeunCho
|
c732e5774b
|
HTML5 - changed a variable name
|
2017-01-20 13:47:16 -08:00 |
|
JaeeunCho
|
0243b907e8
|
HTML5 - added a variable to check currentUser is moderator or the user is currently logged in
|
2017-01-20 13:38:40 -08:00 |
|
JaeeunCho
|
82eb561dc0
|
HTML5 - clear status on userlist
|
2017-01-20 12:13:14 -08:00 |
|
Anton Georgiev
|
6f746a6ac3
|
Merge pull request #3582 from JaeeunCho/slides
HTML5 - arrow key of presentation
|
2017-01-20 14:41:53 -05:00 |
|
JaeeunCho
|
e6cfcb9ff8
|
Merge remote-tracking branch 'upstream/master' into slides
|
2017-01-20 11:16:57 -08:00 |
|
Anton Georgiev
|
b6b354caaf
|
Merge pull request #3533 from JaeeunCho/sound
HTML5 Client sound - added sound for unreadMessages -Tested, works fine
|
2017-01-20 14:14:50 -05:00 |
|
JaeeunCho
|
20399830be
|
HTML5 - changed arrow color of presentation
|
2017-01-20 10:49:16 -08:00 |
|
JaeeunCho
|
813c7c97eb
|
Merge remote-tracking branch 'upstream/master' into slides
|
2017-01-20 10:43:54 -08:00 |
|
JaeeunCho
|
1ae6738cf0
|
HTML5 - moved the openChats() to outside of container
|
2017-01-20 09:50:03 -08:00 |
|
JaeeunCho
|
9036e8b763
|
Merge remote-tracking branch 'upstream/master' into sound
|
2017-01-20 09:43:44 -08:00 |
|
Anton Georgiev
|
6110797486
|
Merge pull request #3580 from antobinary/fix-many-webcam
Filter out webcam duplicates. Also fixes #3572
|
2017-01-20 11:25:23 -05:00 |
|
Fred Dixon
|
005b18d6a3
|
Merge pull request #3579 from capilkey/localize-custom-poll
Add custom poll option text to locales
|
2017-01-19 23:06:33 -05:00 |
|
Anton Georgiev
|
9c3df8d3e5
|
improve detection of duplicates + cleanup
|
2017-01-19 18:09:26 -05:00 |
|
Anton Georgiev
|
98300d77e2
|
allow view for 2+ webcams per user. improve duplicate detection
|
2017-01-19 17:36:58 -05:00 |
|
Chad Pilkey
|
e5d06f9f23
|
add custom poll option text to locales
|
2017-01-19 14:58:17 -05:00 |
|
JaeeunCho
|
8312cee1a0
|
HTML5 - added openChat() in createContainer()
|
2017-01-17 14:09:32 -08:00 |
|
JaeeunCho
|
f66799604b
|
Merge remote-tracking branch 'upstream/master' into sound
|
2017-01-17 14:05:55 -08:00 |
|
JaeeunCho
|
5cb5b98562
|
HTML5 - did lint code
|
2017-01-16 13:24:21 -08:00 |
|
Anton Georgiev
|
9d0f9df123
|
Merge pull request #3570 from antobinary/add-meetingname-html5-demo
bbb-api-demo: Add parameter to join html5 client as moderator
|
2017-01-16 15:04:17 -05:00 |
|
Anton Georgiev
|
e33d8bd0f1
|
make meetingname field required
|
2017-01-16 14:56:49 -05:00 |
|
Anton Georgiev
|
b34532c2f2
|
add parameter to join as moderator
|
2017-01-16 14:30:53 -05:00 |
|
JaeeunCho
|
5e2fa0fc09
|
HTML5 - changed componentDidUpdate() and added params
|
2017-01-16 10:03:02 -08:00 |
|
JaeeunCho
|
73e96bb516
|
Merge remote-tracking branch 'upstream/master' into sound_v1
|
2017-01-16 10:00:23 -08:00 |
|
Anton Georgiev
|
4d50bafdb2
|
Merge pull request #3569 from antobinary/add-meetingname-html5-demo
bbb-api-demo: addition to pr 3564
|
2017-01-16 12:11:37 -05:00 |
|
Anton Georgiev
|
b0a4647407
|
addition to pr 3564
|
2017-01-16 12:08:02 -05:00 |
|
JaeeunCho
|
81a033c2fd
|
HTML5 - added checking prevProps is undefined
|
2017-01-16 07:56:21 -08:00 |
|