Richard Alam
|
75ea51467b
|
Merge pull request #5061 from ritzalam/merge-20-with-master
Merge latest 2.0 branch with master
|
2018-01-30 10:41:19 -05:00 |
|
Richard Alam
|
edcb2cd54a
|
Merge pull request #5044 from capilkey/update-air-2.1
Update Whiteboard code in AIR client
|
2018-01-29 17:17:42 -05:00 |
|
Richard Alam
|
962b520d6a
|
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-20-with-master
|
2018-01-29 12:53:20 -08:00 |
|
Richard Alam
|
1354b065be
|
Merge branch 'require-auth-token-on-red5-connect' of github.com:ritzalam/bigbluebutton into merge-20-with-master
|
2018-01-29 12:36:41 -08:00 |
|
Fred Dixon
|
d33ac4a273
|
Merge pull request #5059 from riadvice/remove-java-check
Remove Java check in bbb-client-check
|
2018-01-29 13:39:45 -05:00 |
|
Ghazi Triki
|
0ae70f4d4d
|
Remove Java check from bbb-client-check.
|
2018-01-29 18:19:37 +01:00 |
|
Richard Alam
|
b0ce2ac0c1
|
Merge pull request #5057 from ritzalam/log-network-change-event
- add more logging when screenshare auto-reconnects
|
2018-01-29 10:35:45 -05:00 |
|
Richard Alam
|
e2416dc665
|
- add more logging when screenshare auto-reconnects
|
2018-01-29 07:34:41 -08:00 |
|
Anton Georgiev
|
fa24ca01f9
|
Merge pull request #4986 from lfzawacki/ice-cold-corrections
Corrections to HTML5 video ICE message cycle and the share video button
|
2018-01-29 10:20:36 -05:00 |
|
Fred Dixon
|
564ec8ea6c
|
Merge pull request #5054 from riadvice/2.0-ui-fixes
User interface fixes
|
2018-01-29 10:14:52 -05:00 |
|
Ghazi Triki
|
4e46ad806a
|
Acoid null params array in QueryStringParameters.
|
2018-01-29 14:23:19 +01:00 |
|
Ghazi Triki
|
718d260c9b
|
Do not display user feedback window in breakout rooms.
|
2018-01-29 07:59:57 +01:00 |
|
Ghazi Triki
|
4c039507e0
|
Keep only one green color in color pickers.
|
2018-01-29 07:58:14 +01:00 |
|
Fred Dixon
|
50d2498909
|
Merge pull request #5052 from ffdixon/update-copyright-date
Updated copyright date
|
2018-01-28 13:34:03 -05:00 |
|
Fred Dixon
|
036a23cfb1
|
Updated copyright date
|
2018-01-28 13:33:18 -05:00 |
|
Fred Dixon
|
f6801bd831
|
Merge pull request #5051 from ffdixon/update-lock-settings-text
Adjusting the wording in Lock Settings dialog
|
2018-01-28 13:19:00 -05:00 |
|
Fred Dixon
|
189c05001e
|
Adjusting the wording in Lock Settings dialog
|
2018-01-28 13:06:58 -05:00 |
|
Fred Dixon
|
f9665cfd24
|
Merge pull request #5050 from ffdixon/update-polling-text
I have also included some updates to bbb-conf to better match server_name in the nginx file.
|
2018-01-28 12:26:58 -05:00 |
|
Fred Dixon
|
728c71c327
|
Minor tweek in wording for Polling dialog
|
2018-01-28 12:17:16 -05:00 |
|
Fred Dixon
|
fe8ec692a2
|
Merge remote-tracking branch 'upstream/v2.0.x-release' into v2.0.x-release
|
2018-01-28 12:15:07 -05:00 |
|
Chad Pilkey
|
4a3cdeb55b
|
[AIR] enforce annotation and cursor holder sizes
|
2018-01-26 17:59:49 -05:00 |
|
Richard Alam
|
7d1d0b55f8
|
Merge pull request #5026 from ritzalam/require-auth-token-on-red5-connect
Require auth token on red5 connect
|
2018-01-26 17:22:07 -05:00 |
|
Richard Alam
|
5886da0b4b
|
Merge pull request #5043 from ritzalam/log-network-change-event
- log flash network change event to figure out if that is the one ca…
|
2018-01-26 16:27:06 -05:00 |
|
Richard Alam
|
4bb9f22a12
|
- log flash network change event to figure out if that is the one causing reconnects
|
2018-01-26 13:24:56 -08:00 |
|
Richard Alam
|
b05237b075
|
Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-20-with-master
|
2018-01-26 12:51:39 -08:00 |
|
Chad Pilkey
|
d22cddfb25
|
Merge remote-tracking branch 'upstream/master' into update-air-2.1
|
2018-01-26 15:24:46 -05:00 |
|
Chad Pilkey
|
4c84c7132a
|
make the air client exportable again
|
2018-01-26 15:24:24 -05:00 |
|
Lucas Fialho Zawacki
|
89debdb8a7
|
More refactors in bbb-webrtc-sfu js code
|
2018-01-26 19:58:02 +00:00 |
|
Maxim Khlobystov
|
61fc6ec911
|
Merge pull request #5031 from jfsiebel/fix-issue-4999
Exit from audio when in meeting ended to prevent echo test
|
2018-01-26 13:47:18 -05:00 |
|
Anton Georgiev
|
cd8f75b440
|
Merge pull request #5011 from OZhurbenko/fix-whiteboard-explosion
Fixed Pencil rendering breaking the html5 client
|
2018-01-26 16:09:43 -02:00 |
|
Anton Georgiev
|
7d6868ef63
|
Merge pull request #5033 from antobinary/pull-locales-2
Pulled html5 client locales 2018-01-25
|
2018-01-26 16:09:11 -02:00 |
|
Anton Georgiev
|
4d802a6d2d
|
Merge pull request #5039 from antobinary/fix-5037
Adjust production settings to match changes on dev settigns #4821
|
2018-01-26 16:08:45 -02:00 |
|
Richard Alam
|
0985750ae6
|
Merge pull request #5038 from riadvice/2.0-ui-fixes
Use a separate label for LoadingBar
|
2018-01-26 12:02:37 -05:00 |
|
Anton Georgiev
|
95c839a026
|
Merge pull request #5032 from antobinary/pull-locales
Omit pulling en.json (the source file) from transifex
|
2018-01-26 14:41:31 -02:00 |
|
Anton Georgiev
|
d2709c9d9d
|
adjust production settings to match changes on dev settigns
|
2018-01-26 11:22:17 -05:00 |
|
Ghazi Triki
|
2fc30ec310
|
Use a separate label for LoadingBar.
|
2018-01-26 17:06:00 +01:00 |
|
Fred Dixon
|
87f4c6a94b
|
Merge pull request #5017 from riadvice/moderator-message-ui
Improve moderator icon display in ChatMessageRenderer
|
2018-01-26 07:09:57 -05:00 |
|
Ghazi Triki
|
5cdf27120e
|
Update ChatMessageRenderer style.
|
2018-01-26 10:31:59 +01:00 |
|
Richard Alam
|
91ab6829ec
|
- check number of params for bbb-apps
|
2018-01-25 14:11:33 -08:00 |
|
Chad Pilkey
|
5628fbacb5
|
update whiteboard annotations and cursor in air client for 2.1
|
2018-01-25 16:28:58 -05:00 |
|
Richard Alam
|
7737b7d446
|
Merge pull request #5013 from riadvice/master-merge-2.0
Merge 2.0 branch into master
|
2018-01-25 15:38:27 -05:00 |
|
Richard Alam
|
ed1f45d9fe
|
- prevent any type of broadcast stream in bbb-apps
|
2018-01-25 12:32:39 -08:00 |
|
Richard Alam
|
83d9fdb168
|
- lock down screenshare to prevent unauthorized publishing of stream into the red5 app
|
2018-01-25 12:00:07 -08:00 |
|
Anton Georgiev
|
952b4457f5
|
pull the latest German translations
|
2018-01-25 14:15:51 -05:00 |
|
Anton Georgiev
|
e5b1289b9c
|
remove duplicated Japanese locale
|
2018-01-25 13:42:33 -05:00 |
|
Anton Georgiev
|
ba7d3325b7
|
adjust Khmer locale, related to #4538
|
2018-01-25 13:36:19 -05:00 |
|
Anton Georgiev
|
0d2f52c033
|
pulled html5 client locales 2018-01-25
|
2018-01-25 12:28:45 -05:00 |
|
Anton Georgiev
|
22a140e6eb
|
do not pull the source file en.json
|
2018-01-25 11:41:25 -05:00 |
|
Anton Georgiev
|
b37d4528af
|
unify indentation in transifex.sh
|
2018-01-25 11:02:15 -05:00 |
|
Joao Siebel
|
18019776cb
|
Exit from audio when in meeting ended to prevent echo test, fix #4999
|
2018-01-25 09:07:32 -02:00 |
|