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 |
|
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 |
|
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 |
|
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 |
|
Anton Georgiev
|
f95a8f7e43
|
Merge pull request #5027 from bigbluebutton/v2.0.x-release
Merge V2.0.x release into 'master' -- html5 changes only
|
2018-01-24 20:26:47 -02:00 |
|
Richard Alam
|
2a784bdb67
|
- rollback jar dependencies for bbb-voice
|
2018-01-24 14:10:39 -08:00 |
|
Anton Georgiev
|
c27d69c71b
|
Merge pull request #5025 from antobinary/drop-duplicated-keys
Remove duplicated keys in en.json
|
2018-01-24 20:07:37 -02:00 |
|
Richard Alam
|
2297ca50b9
|
- validate auth token for bbb-voice
|
2018-01-24 13:58:16 -08:00 |
|
Anton Georgiev
|
72ea8b8906
|
remove duplicated keys in en.json
|
2018-01-24 16:49:48 -05:00 |
|
Anton Georgiev
|
b8400c7501
|
remove duplicated keys in en.json
|
2018-01-24 16:46:18 -05:00 |
|
Richard Alam
|
df4ba41faf
|
- wire up message receivers for bbb-voice
|
2018-01-24 13:40:02 -08:00 |
|
Richard Alam
|
3bf2662aba
|
- start adding check for bbb-voice
|
2018-01-24 12:53:31 -08:00 |
|
Richard Alam
|
1e60930bc5
|
- track port test connection and exclude from validating with akka-apps
|
2018-01-24 08:16:00 -08:00 |
|
Richard Alam
|
7e1f539165
|
- manage connection
|
2018-01-23 14:20:49 -08:00 |
|
Richard Alam
|
bd50aa44fc
|
Merge branch 'riadvice-master-merge-2.0'
|
2018-01-23 11:39:11 -08:00 |
|
Ghazi Triki
|
635fad2dcf
|
Improve moderator icon display in ChatMessageRenderer.
|
2018-01-23 19:58:18 +01:00 |
|
Ghazi Triki
|
67d643fb1b
|
Merge pull request #2 from ritzalam/riadvice-master-merge-2.0
Riadvice master merge 2.0
|
2018-01-23 18:38:36 +01:00 |
|
Richard Alam
|
8a13c69942
|
- handle no microphone properly. Should not go to echo test if no mic.
|
2018-01-23 09:01:35 -08:00 |
|
Richard Alam
|
e3c54fc27c
|
- fix merge exceptions
|
2018-01-23 09:01:14 -08:00 |
|
Anton Georgiev
|
bd56a9e1e9
|
Merge pull request #4996 from Tainan404/fix-clear-chat
Fix issue #4992. Unable to clear chat.
|
2018-01-23 14:14:35 -02:00 |
|
Maxim Khlobystov
|
0568a01692
|
Merge pull request #4923 from MaximKhlobystov/selenium-visual-regression
[HTML5 Client] Initial Visual Regression Tests Setup
|
2018-01-23 11:13:54 -05:00 |
|
Ghazi Triki
|
a2feb9bf5b
|
Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into master-merge-2.0
# Conflicts:
# akka-bbb-apps/src/main/scala/org/bigbluebutton/core/domain/MeetingStatus.scala
# akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala
# bbb-common-web/src/main/scala/org/bigbluebutton/api2/BbbWebApiGWApp.scala
# bigbluebutton-client/branding/default/style/css/V2Theme.css
# bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.fla
# bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.swf
# bigbluebutton-client/locale/en_US/bbbResources.properties
# bigbluebutton-client/src/org/bigbluebutton/main/model/users/JoinService.as
# bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
# bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml
# bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
# bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/AddChatTabBox.mxml
# bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatMessageRenderer.mxml
# bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatWindowEventHandler.as
# bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
# bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml
# bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml
# bigbluebutton-html5/private/config/development/server/log.yaml
|
2018-01-23 12:27:42 +01:00 |
|
Richard Alam
|
3cd0625424
|
Merge pull request #5007 from ritzalam/investigate-rtmps
support rtmps
|
2018-01-22 21:30:33 -05:00 |
|
Maxim Khlobystov
|
9a3804ebdd
|
Improved the naming of the test cases / screenshot files.
|
2018-01-22 18:32:29 -05:00 |
|
Oleksandr Zhurbenko
|
946c731471
|
Fixed pencil rendering during the race condition between clear annotations and pencil's draw_end message
|
2018-01-22 15:07:29 -08:00 |
|
Richard Alam
|
e56086234c
|
- start tracking port test connections
|
2018-01-22 14:35:53 -08:00 |
|
Richard Alam
|
aef4030750
|
- authorize connection using token
|
2018-01-22 14:05:48 -08:00 |
|
Richard Alam
|
672d3b5ef7
|
- try to prevent connecting to bbb-video with authz
|
2018-01-22 11:54:57 -08:00 |
|
Fred Dixon
|
13dc23b68a
|
Merge pull request #5008 from ritzalam/update-locales-jan-22-2018
- update locales to jan 22, 2018
|
2018-01-22 10:48:21 -05:00 |
|
Richard Alam
|
a22fca4931
|
- update locales to jan 22, 2018
|
2018-01-22 07:45:09 -08:00 |
|
Fred Dixon
|
e62899818e
|
Merge pull request #5006 from riadvice/2.0-ui-fixes
Update lock settings title width
|
2018-01-22 09:44:12 -05:00 |
|