BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,030 Commits 13 Branches 260 Tags 1.1 GiB
d22cddfb25
Commit Graph

6923 Commits

Author SHA1 Message Date
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
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
a22fca4931 - update locales to jan 22, 2018 2018-01-22 07:45:09 -08:00
Ghazi Triki
bbed266239 Update lock settings title width. 2018-01-22 15:30:12 +01:00
Ghazi Triki
e2f5fad58d Update flash client German localisation file. 2018-01-21 15:57:45 +01:00
Ghazi Triki
4238b12453 Switch lock settings "disable webcams" and "webcam only for moderators" states, only one of them can be enabled at the same time. 2018-01-21 08:46:24 +01:00
Ghazi Triki
ff7cf434b1 Improve camera control and display when webcamsOnlyForModerator is enabled. 2018-01-20 21:11:23 +01:00
Ghazi Triki
307f12448a Add new hint box to LockSettings and update style. 2018-01-20 18:33:02 +01:00
Ghazi Triki
5227217e85 Fix the regex that checks the Flash stream id by adding the option "-recorded" to the pattern, making sure recorded streams are matched too. 2018-01-20 09:34:11 +01:00
Richard Alam
6ea49e05aa - add protocol for bwmon and port test 2018-01-19 14:30:49 -08:00
Richard Alam
11d226db2a - clean up logging 2018-01-19 13:07:48 -08:00
Richard Alam
e789d1440d - determine screenshare connection type 2018-01-19 12:16:47 -08:00
Richard Alam
9d660bb4b5 - determine video connection type 2018-01-19 08:47:21 -08:00
Richard Alam
ff85a724bb - determine bbb-apps connection type 2018-01-19 08:46:34 -08:00
Richard Alam
0fc8df84c2 - determine voice connection type 2018-01-19 08:45:27 -08:00
Richard Alam
3ea109aa25 - port test connection 2018-01-19 08:45:01 -08:00
Richard Alam
6402966fb5 - determine port test connection type 2018-01-19 08:44:10 -08:00
Richard Alam
b20828a8cd - bw mon determine connection type 2018-01-19 08:38:55 -08:00
Richard Alam
802f945b2a - add bw mon options and some string constants 2018-01-19 08:35:39 -08:00
Ghazi Triki
171db3e0ee Display moderator icon next to his name in chat messages. 2018-01-17 22:02:26 +01:00
Fred Dixon
6c36f8dc00 Tweeked feedback dialog 2018-01-17 12:42:17 -06:00
Fred Dixon
346d127cf0
Merge pull request #4973 from riadvice/logout-feedback 
Implemented "user rating feedback on logout" feature
 2018-01-16 15:56:49 -05:00
Ghazi Triki
cf92e1aeef Implemented "user rating feedback on logout" feature. 2018-01-16 20:37:05 +01:00
Anton Georgiev
1e25a6d4e1
Merge pull request #4955 from prlanzarin/video-upstream-errors 
WebRTC media updates
 2018-01-15 14:40:53 -02:00
Ghazi Triki
e89aadb3a6 Disable webcam button in media column for all users when webcamsOnlyForModerator is on. 2018-01-15 12:33:24 +01:00
prlanzarin
acc9650370 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into video-upstream-errors 2018-01-12 21:39:24 +00:00
prlanzarin
8594ce169d Merge remote-tracking branch 'mconftec/fixes-lucas' into video-upstream-errors 2018-01-12 20:02:45 +00:00
Richard Alam
d60a2a2782
Merge pull request #4945 from riadvice/moderator-message-ui 
Show moderator message header in bold
 2018-01-12 07:35:27 -08:00
Richard Alam
f960b2fccc
Merge pull request #4951 from capilkey/update-air-2.1 
Update AIR client with 2.1 presentation code
 2018-01-12 07:35:05 -08:00
Ghazi Triki
3ffbc3a12c Delay showing configramtion buttons in WebRTCEchoTest under firefox browser. 2018-01-12 15:17:26 +01:00
Chad Pilkey
628569c08a remove unneeded presentation code from the Flash client 2018-01-11 17:31:15 -05:00
Ghazi Triki
4bc7279c1c Fix ScreenshareViewWindow scroll-bars in original video size mode. 2018-01-11 21:34:09 +01:00
Ghazi Triki
d4fda31d00 Show moderator message header in bold. 2018-01-11 17:55:03 +01:00
Ghazi Triki
526b2b12fb Fix alpha value for ScreenshareViewWindow change display button. 2018-01-11 14:38:21 +01:00
Richard Alam
e2530eddf4
Merge pull request #4942 from ritzalam/investigate-rtmps 
- try to make rtmps work in client
 2018-01-10 14:06:37 -08:00
Richard Alam
d4a5b91bc4
Merge pull request #4940 from capilkey/update-air-2.1 
Update AIR for 2.1
 2018-01-10 14:06:20 -08:00
Richard Alam
dde5eb76f1 - trye to make rtmps work in client 2018-01-10 13:04:05 -08:00
Chad Pilkey
2717ef39da removed unneeded properties from chat messages 2018-01-10 15:06:43 -05:00
Ghazi Triki
8f47e7b7de Remove webcamsOnlyForModerator from enter API response. 2018-01-09 18:14:58 +01:00
Ghazi Triki
ed1467550f Automatically subscribe/unsubcribe to video streams when webcamsOnlyForModerator value changes. 2018-01-09 17:01:17 +01:00
Ghazi Triki
55f4e7cb7c Revert webcamsOnlyForModerator feature in VideoEventMapDelegate. 2018-01-08 20:59:45 +01:00
Richard Alam
45f5a76da6 - display all users in the presentation dropdown 2018-01-08 10:42:01 -08:00
Ghazi Triki
d1c765e614 Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into webcams-only-for-moderator-on-off 2018-01-08 19:33:23 +01:00
Richard Alam
02736382f6
Merge pull request #4868 from riadvice/2.0-ui-fixes 
Fix toolbar components alignment and localisation update
 2018-01-08 10:19:55 -08:00
Richard Alam
9b64e3d2a3
Merge pull request #4916 from riadvice/alphabetise-private-chat-users 
Sort private chat users alphabetically.
 2018-01-08 10:19:24 -08:00
Richard Alam
b93a95ca8e
Merge pull request #4896 from prlanzarin/flash-webcam-fix 
Ghost flash webcams fix
 2018-01-08 10:18:52 -08:00
Ghazi Triki
a7354c5be7 Sort private chat users alphabetically. 2018-01-08 16:58:17 +01:00
Ghazi Triki
36f02e8528 Request webcamsOnlyForModerator value at user enter success. 2018-01-07 22:24:54 +01:00
Ghazi Triki
8129f67879 Add missing class SetWebcamsOnlyForModeratorEvent. 2018-01-07 16:46:16 +01:00