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

3809 Commits

Author SHA1 Message Date
Richard Alam
36183d55d2 - remove unused option 2014-07-30 08:38:21 -07:00
Richard Alam
3bf4991eec - try to force FF 31 to display java applet permission bar 2014-07-30 07:48:59 -07:00
Richard Alam
a6dc4f6465 - change how to insert applet div into HTML 2014-07-29 13:16:12 -07:00
Richard Alam
3d959234cd - fix issue where button display the wrong state when user is muted but the icon shows unmuted 2014-07-29 08:06:08 -07:00
Richard Alam
d11974a0e9 - fix issue where we can't join voice when RTMP Tunnelling 2014-07-28 12:41:41 -07:00
Richard Alam
19c933b8fa - minor cleanup 2014-07-28 12:41:21 -07:00
Richard Alam
7481c46cd9 - re-enable buttons when there is an error encountered during presentation conversion 2014-07-28 11:39:44 -07:00
Richard Alam
2d20915e40 - prevent user from closing presentation upload window while the presentation is being converted 2014-07-28 11:07:35 -07:00
Richard Alam
5ddd295ea6 - remove mic init as it triggers Chrome to prompt user to allow mic access 
even if we still don't need it
 2014-07-28 09:48:04 -07:00
Richard Alam
65d8b0889c - minor cleanup 2014-07-28 09:47:50 -07:00
Richard Alam
889ea9187a - display remote layout name on layout dropdown 2014-07-28 08:28:53 -07:00
Richard Alam
9868dfdae5 - blur mic image when user is talking 2014-07-25 14:13:23 -07:00
Richard Alam
4148c5db8a - move button so that it's not overlapped by whiteboard toolbar 2014-07-25 08:03:51 -07:00
Richard Alam
806a09ec3f - update copyright year 2014-07-25 08:03:32 -07:00
Mateus Dalepiane
d7034ac848 Change the variable used to store and access connections from VideoProxy 
The previous variable was userID, now the streamName is used. This is necessary
because the streamName will be used to request the path that should be used to
connect to the stream.
 2014-07-25 11:38:35 -03:00
Richard Alam
c4a791437b - fix race condition on setting mute user 2014-07-24 12:29:56 -07:00
Richard Alam
e4d9b1e8f2 - fix muted/unmuted icon 2014-07-24 11:52:37 -07:00
Richard Alam
9485d25af7 - fix raise condition between setting the user has joined the voice conf and the joined voice event 2014-07-24 11:28:45 -07:00
Richard Alam
58f34d7767 - try and fix issue where mute button isn't showing up 2014-07-24 11:02:10 -07:00
Richard Alam
41ebc6859d - don't throw exception when external userid is not found as the user might have acutally left the meeting 2014-07-23 10:48:02 -07:00
Richard Alam
b47efe5675 - init dataprovider when layout list has been updated after the combo has been initialized 2014-07-22 10:45:56 -07:00
Richard Alam
5236d85cd4 - fix layout drop NPE 2014-07-22 08:53:38 -07:00
Richard Alam
94a8dc5762 - fix race condition on initializing layout combo dropbox 2014-07-22 08:33:36 -07:00
Chad Pilkey
5c79202ade reverted jssip back to 0.3.7 and fixed chrome webrtc 2014-07-21 10:25:08 -07:00
Richard Alam
0daff8a8d4 - deskshare applet where min jre version is passed from html page 2014-07-18 08:45:59 -07:00
Richard Alam
dfbf77aab0 - externalize min jre version required 2014-07-18 08:45:10 -07:00
Richard Alam
af3e7875ee - deskshare applet that support 1.7.0_51 and up 2014-07-18 07:54:28 -07:00
Richard Alam
9d20d28d30 - disable layout dropbox when layout is locked 2014-07-17 11:16:53 -07:00
Richard Alam
4c41140193 - do not sync layout to others automatically 2014-07-17 10:48:23 -07:00
Richard Alam
412e2c51a6 - a little cleanup 2014-07-16 13:12:10 -07:00
Richard Alam
7fd7b13088 - change layout sync icon 2014-07-16 11:39:16 -07:00
Mateus Dalepiane
a7bf60a674 Fixing comparation, empty string doesn't mean it wasn't set 
It's better to check if the dictionary entry is null
 2014-07-14 14:16:39 -03:00
Richard Alam
cbd12a5f5c Merge pull request #342 from SenecaCDOT-BigBlueButton/fix-audio-prompts-chrome36 
upgraded jssip to 0.4-devel, skipped the webrtc switch mic notifications
 2014-07-11 17:24:09 -04:00
Chad Pilkey
af6e2b4db3 upgraded jssip to 0.4-devel, skipped the webrtc switch mic notifications 2014-07-11 13:32:04 -07:00
Richard Alam
d2196d4adb - sign applet that support java 8 2014-07-11 12:41:27 -07:00
Richard Alam
13046276fe - update windows when broswer is resized 2014-07-05 01:35:33 -07:00
Felipe Cecagno
b360db51e6 fix complementary to the previous one; non-prioritized videos now are correctly centralized on the grid cell 2014-07-02 16:09:41 -03:00
Mateus Dalepiane
52502488ec Merge branch 'multivideo' into multivideo-1404 
Conflicts:
	bbb-video/build.gradle
	bbb-video/src/main/java/org/bigbluebutton/app/video/VideoApplication.java
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
	bigbluebutton-web/grails-app/conf/bigbluebutton.properties
 2014-06-26 16:21:25 -03:00
Jonata Teixeira Pastro
1bcd668904 Fixed scrollbar issue. 2014-06-23 19:15:14 +00:00
Jonata Teixeira Pastro
7db69944be Fixed scrollbar issue. 2014-06-23 19:14:40 +00:00
Mateus Dalepiane
b09a75a61b Set client for paly NetConnections 2014-06-13 16:18:31 -03:00
Felipe Cecagno
c3c56a6355 few improvements on the camera messages; cleanup and refactoring of the new video dock implementation; extracted many hardcoded branding information to the branding file 2014-06-11 17:01:45 -03:00
Richard Alam
c7ceb58f43 - don't sync layout to viewers when moderstor resize the windows 2014-06-11 11:54:59 -07:00
Richard Alam
73877cab9b - switch layout when combo box is selected 2014-06-11 10:10:20 -07:00
Richard Alam
c8ec8bb24b - figure out why sync is broken 2014-06-07 01:25:39 -07:00
Richard Alam
0dd1b37afd Merge branch 'merge-polling-with-master' into broadcast-layout 2014-06-06 22:14:32 -07:00
Richard Alam
aac2dd3c3c - chnage label on lock settings 2014-06-06 21:26:01 -07:00
Richard Alam
73bb2cdeb6 - display layout names in dropdown 2014-06-06 18:27:46 -07:00
Richard Alam
045426e9af - try to diplay layouts in dropdown 2014-06-06 17:49:04 -07:00
Richard Alam
262f94b69c Merge branch 'merge-polling-with-master' into broadcast-layout 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
 2014-06-06 15:34:35 -07:00
Chad Pilkey
893c977ec9 forgot to add the new config property to the template 2014-06-05 14:04:19 -07:00
Chad Pilkey
632096fd64 the phone option is now somewhat configurable 2014-06-05 13:52:37 -07:00
Chad Pilkey
9b86798f21 cleaned up the file upload window and made it so that when you click the file name it will open the native file dialog 2014-06-04 11:47:24 -07:00
Richard Alam
8015eeeecd Merge branch 'merge-polling-with-master' of github.com:bigbluebutton/bigbluebutton into merge-polling-with-master 2014-06-03 19:20:44 -07:00
Richard Alam
3051bf9dd5 - change color of user talking icon glow 2014-06-03 19:19:47 -07:00
Richard Alam
d7b6918340 Merge pull request #330 from SenecaCDOT-BigBlueButton/fix-webrtc-dialogs 
add audio selection window
 2014-06-03 19:36:52 -04:00
Chad Pilkey
344103922a moved the webrtc call failed alertbox text to locales 2014-06-03 13:14:05 -07:00
Chad Pilkey
b1da215ac2 if presenterShareOnly is true don't switch moderators to listen only when presenter changes 2014-06-03 12:14:51 -07:00
Chad Pilkey
cfc49f51d5 Merge pull request #319 from SenecaCDOT-BigBlueButton/fix-presentation-control-bar 
Fix presentation control bar
 2014-06-03 12:07:21 -04:00
Chad Pilkey
f6cb040908 moved the audio selection window strings to the locale file 2014-06-03 09:00:41 -07:00
Chad Pilkey
d0618c1a03 added presenterShareOnly, error popup when webrtc fails with option to fallback to flash 2014-06-02 15:16:52 -07:00
Chad Pilkey
b9afd0e36b fixed a null pointer exception when the mic is not found 2014-06-02 09:23:13 -07:00
Chad Pilkey
e1a56c45ba Merge remote-tracking branch 'upstream/merge-polling-with-master' into fix-webrtc-dialogs 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml
 2014-06-02 08:59:33 -07:00
Richard Alam
19ac02fab2 - enable polling by default 2014-06-02 07:44:46 -07:00
Richard Alam
26a142b49a - make window smaller 2014-06-01 18:17:07 -07:00
Richard Alam
e0f65acffd - make viewer init the polling module properly 2014-06-01 09:22:07 -07:00
Chad Pilkey
02e6a98f1c removed some unused managers from the phone module 2014-05-30 15:20:00 -07:00
Chad Pilkey
19ce05b31b created an audio selection window to choose your stream type 2014-05-30 15:19:25 -07:00
Chad Pilkey
91d2e1d288 removed the background from the listen only indicator image 2014-05-30 15:15:38 -07:00
Richard Alam
93c3ef7d05 - try to figure out how layout changes on window resize 2014-05-30 14:23:40 -07:00
Richard Alam
c806b4364f - continue modifyng the layout module to sync with others when windows are resized 2014-05-30 13:54:40 -07:00
Richard Alam
39fa4f2db1 - modify how we send lock and broadcast layout from client 2014-05-30 11:08:47 -07:00
Richard Alam
04c271996d Merge branch 'broadcast-layout' of github.com:mconf/bigbluebutton into broadcast-layout 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/layout/LayoutApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/layout/LayoutService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/layout/LayoutApp.scala
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/events/LayoutEvent.as
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/services/LayoutService.as
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/services/MessageReceiver.as
 2014-05-29 11:21:01 -07:00
Felipe Cecagno
5821c32372 implemented the new button broadcast layout, which will send to all viewers the moderator's current layout; the lock button and broadcast button only affect viewers, not moderators 2014-05-29 12:19:40 -03:00
Richard Alam
224bea1f5f - sync layout with viewers 2014-05-29 07:06:44 -07:00
Jonata Teixeira Pastro
f931d6cf76 Merging branches feat1212 and new-videodock. 2014-05-28 21:02:23 +00:00
Jonata Teixeira Pastro
d8c431d056 Small fixes in config.xml.template 2014-05-28 20:54:39 +00:00
Jonata Teixeira Pastro
736140dd20 #Feature 1212: Small fixes in the presentation of the video. 2014-05-28 20:43:34 +00:00
Richard Alam
e254787276 - add layout to lock settings 2014-05-28 12:25:28 -07:00
Richard Alam
f87933cf76 - try to inject layout change when layout option is changed in lock settings 2014-05-27 19:00:38 -07:00
Richard Alam
79136feeba - presenter should not be affected by lock settings 2014-05-27 07:16:04 -07:00
Richard Alam
f8974e5922 - apply lock icon to viewers only 2014-05-27 06:57:22 -07:00
Richard Alam
ff8c210104 - still the lock icon is not updating properly 2014-05-26 14:24:29 -07:00
Richard Alam
320ee09231 - try to apply lock settings to moderator only 2014-05-26 14:13:07 -07:00
Jonata Teixeira Pastro
172950f6ae #Feature 1212: Implemented VideoWithWarnings class that encapsulates Camera warnings. The new class is used in the camera preview in CameraDisplaySettings and in the new video dock windows. 2014-05-26 19:50:10 +00:00
Jonata Teixeira Pastro
42b852f4a4 #Feature 1212: Implemented VideoWithWarnings class that encapsulates Camera warnings. The new class is used in the camera preview in CameraDisplaySettings and in the new video dock windows. 2014-05-26 19:48:41 +00:00
Richard Alam
068df39570 - add [Disabled] text beside feature name 2014-05-26 11:32:21 -07:00
Richard Alam
e7c5a343a9 - show lock icon when a settings are locked 2014-05-26 10:48:30 -07:00
Richard Alam
b550ba966f - disable/enable users list in chat window when private chat is enabled/disabled 2014-05-26 10:30:57 -07:00
Richard Alam
fb2fd12f3c - disable/enable chat for viewer when settings are changed 2014-05-23 19:33:27 -07:00
Richard Alam
8549159aad - try creating a chat conversation model 2014-05-23 14:43:01 -07:00
Richard Alam
71cff3bfe6 - extract some user code from flex module. Module should only be for the UI. 2014-05-23 13:24:01 -07:00
Richard Alam
6eee34b86c - remove some of the menu items for the gear icon 2014-05-23 10:29:09 -07:00
Richard Alam
87b776ad58 - fix sending of lock settings to server 2014-05-23 08:47:13 -07:00
Richard Alam
5c844ffeee - send lock settings to server 2014-05-22 11:41:59 -07:00
Richard Alam
1ab0b0a2c4 - send new lock settings to server 2014-05-22 11:13:00 -07:00
Richard Alam
1b8fa657ce - send lock settings from server to client 2014-05-22 08:30:46 -07:00
Chad Pilkey
b4b5e7793c Merge remote-tracking branch 'upstream/merge-polling-with-master' into fix-webrtc-dialogs 2014-05-21 12:33:34 -07:00
Chad Pilkey
679b899b74 first take at new audio dialogs 2014-05-21 12:14:08 -07:00
Richard Alam
f266067e1a - display message to user when auth token is invalid 2014-05-21 18:42:49 +00:00
Richard Alam
391dc9be5a - fix listen-only in get users reply 2014-05-16 17:26:51 +00:00
Richard Alam
5686b6871c - finish global audio...display speaker icon beside user's name when joined in listen-only mode 2014-05-16 15:24:22 +00:00
Richard Alam
42fcfe1055 Merge branch 'merging-global-audio' of github.com:mconf/bigbluebutton into merge-global-audio 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
 2014-05-12 10:39:25 -07:00
Mateus Dalepiane
660730fb01 New implementaion of multiple connections 
This implemetantion create a NetConnection when a webcam view is requested,
when the connection is ready an event triggers the view window creation.
Also, this implementation keep track of how many streams are using a
connection, and if no one is using it anymore the connection is closed.
 2014-05-12 11:04:14 -03:00
Felipe Cecagno
eb0a56bb13 refactoring part of the global audio server-side implementation 2014-05-11 22:31:35 -03:00
Mateus Dalepiane
2870cacf8d Moved NetStream creation from NetConnection handler to start publish method 
This change allow the handler to be used both for publish and play
NetConnections. Now the NetStream used for publishing is created only
when there is something to publish.
 2014-05-07 12:36:01 -03:00
Richard Alam
eef2c87cd4 - cleanup 2014-05-05 18:45:18 +00:00
Mateus Dalepiane
4e84687b32 Working through more than one proxy server 
A modified version of RTMP Client is being used to communicate with the next
proxy server, this client behaves like the bbb flash client. The difference is
how the client asks the server for the stream. The bbb flash client uses only
the streamname as a parameter in play(), while the red5 client also uses
timestamp and length.
 2014-05-05 14:44:50 -03:00
Jonata Teixeira Pastro
3c2296fd9a Minor corrections (null testing and aspect ratio correction 2014-05-02 20:50:59 +00:00
Jonata Teixeira Pastro
b90416846d Added priorityRatio property to config.xml.template 2014-04-30 15:17:35 +00:00
Jonata Teixeira Pastro
8a9df273eb Added priorityRatio option to config.xml.template 2014-04-30 11:52:48 -03:00
Mateus Dalepiane
0c77ea580b Fixed support for single server in path 
When the path contains a single server the stream name prefix should be
empty. Before this fix it was "/".
 2014-04-25 13:45:39 -03:00
Mateus Dalepiane
e90092bdf2 Always update streamNamePrefix related to a user 
Whenever the user is going to create play a stream the path is retrieved from
the load balancer. As this path can change at any time, is necessary to update
it always.
 2014-04-25 10:53:24 -03:00
Mateus Dalepiane
70ad6fe7f2 NetConnection is now retrieved using URL 
Since the NetConnection is created using the full URL, is more sensible to
relate it with the full URL, instead of the server IP only.
 2014-04-25 10:37:18 -03:00
adam-sharpe
f428f046de Fixed presentation control for viewers 2014-04-24 15:51:00 -07:00
Felipe Cecagno
19e3a4b3f0 client side implementation is done, but having issues because the server calls three times disconnectedFromJoinVoiceConferenceCallback when the user leaves the listen only stream (need a server-side refactoring) 2014-04-24 19:41:22 -03:00
Mateus Dalepiane
f13abacdb6 Implemented one NetConnection per server 
+ Instead of one NetConnection per user stream, one NC per server is created
+ Implemented code to create newUrl and streamPrefix from the connection path
 2014-04-24 17:52:50 -03:00
Tiago Daniel Jacobs
97ad5e28f4 Changes to support RTMPS connections 2014-04-24 17:16:03 -03:00
Mateus Dalepiane
9b75fd7871 Included EventListeners for new NetConnections 
+ Included a verification to check if the NetConnection is ready before using it
+ Fixed code indentation
 2014-04-24 16:08:51 -03:00
Mateus Dalepiane
149bc3da58 Implemented support for multiple NetConnections 
NOT WORKING!!
 2014-04-23 18:13:08 -03:00
Felipe Cecagno
92eac1e988 Merge branch 'global-audio' into merge-global-audio 
Most of the client implementation is going to be rewritten on next commits.
 2014-04-23 16:13:40 -03:00
Mateus Dalepiane
d913173685 Included stub methods for multiple NetConnection support in VideoProxy 2014-04-23 14:58:33 -03:00
Felipe Cecagno
4d49b6f0f4 trying to deal with the webrtc connection failed 2014-04-22 18:13:18 -03:00
Mateus Dalepiane
cb99102472 Log in multivideo 2014-04-22 14:55:03 -03:00
Jonata Teixeira Pastro
af99b9dfa6 Feature #1211: Minor corrections of aspectRatio problems. PriorityRatio property added to config.xml 2014-04-16 21:05:32 -03:00
Jonata Teixeira Pastro
8618bfef2c Indentation fix. 2014-04-10 18:00:07 +00:00
Jonata Teixeira Pastro
5f246ebe26 Indentation fix. 2014-04-10 17:52:00 +00:00
Jonata Teixeira Pastro
1cc8c5b82a Feature #1211: Prioritization of video dock on mouse click. 2014-04-10 17:01:07 +00:00
Jonata Teixeira Pastro
c6cc869b49 Feature #1211: Prioritization mode for videodock. Correcting commit a17c076..8d52fc5 2014-04-09 21:11:37 +00:00
Jonata Teixeira Pastro
8d52fc5c9f Feature #1211: Prioritization mode working with a fixed video element (first). 2014-04-09 21:01:18 +00:00
Jonata Teixeira Pastro
a17c076c35 Feature #1211: Partial implementation of prioritization mode; Optimal use of the canvas space in priorityMode. 2014-04-09 19:19:19 +00:00
Jonata Teixeira Pastro
7d888b2cfb Feature #1211: Partial implementation of prioritization mode; Horizontal split. 2014-04-08 20:00:48 +00:00
Jonata Teixeira Pastro
485adde68b Feature #1211: Partial implementation of prioritization mode; Vertical split. 2014-04-08 19:36:50 +00:00
Richard Alam
bee1320463 Merge branch 'merge-polling-with-master' into connect-bbb-apps-html5 
Conflicts:
	bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
 2014-04-08 19:07:37 +00:00
Jonata Teixeira Pastro
c7cafd35fe Feature #1211: Partial implementation of prioritization mode of a video window. Cases of 0 and 1 windows done. For 2 or more a static vertical division of the screen is made, the first window is given 2/3 of the screen and the others are disposed in the remaining space. 2014-04-08 15:58:02 +00:00
Anton Georgiev
2d89a73c0c Merge branch 'addMsgLib' of /home/ubuntu/dev/antonHtml5/bigbluebutton into connect-bbb-apps-html5 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/Room.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/RoomsManager.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/chat/ChatService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessagingConstants.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessagingService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/RedisMessagingService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsHandler.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/ConversionUpdatesProcessor.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardService.java
	bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-apps.xml
	bigbluebutton-web/grails-app/conf/UrlMappings.groovy
	bigbluebutton-web/grails-app/conf/bigbluebutton.properties
	bigbluebutton-web/grails-app/conf/spring/doc-conversion.xml
	bigbluebutton-web/ivy.xml
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MessagingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/RedisMessagingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/presentation/imp/SwfSlidesGenerationProgressNotifier.java
 2014-04-08 15:55:04 +00:00
Jonata Teixeira Pastro
1f0fb4f9a0 Feature #1211 - Initial version of prioritized video dock functions findPriorityConfiguration and updateDisplayListHelperByPriority 2014-04-07 17:32:31 -03:00
Gustavo Salazar
1d647470b7 Skip flash error 2038 2014-04-04 12:15:13 -07:00
Richard Alam
3742ebc1c2 - prevent the user from rejoining meeting when meeting has ended 2014-04-02 19:45:58 +00:00
Felipe Cecagno
d599307543 commenting out the old video dock module 2014-04-01 15:00:46 -03:00
Richard Alam
214957e52c - localize text 2014-03-28 16:02:33 +00:00
Richard Alam
0e1945118f - fix toolbar icon display when user leaves voice conf using webrtc 2014-03-28 15:05:38 +00:00
Felipe Cecagno
50f2953453 Merge branch 'video-profiles' into new-videodock 2014-03-27 17:55:31 -03:00
Felipe Cecagno
4da4980a1f video profiles are now only identified by its name on the camera display settings (resolution was removed) 2014-03-27 17:53:28 -03:00
Felipe Cecagno
fad9a9a38b Merge branch 'multicamera-0.81' into new-videodock 
Conflicts:
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/PublishWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarPopupButton.mxml
 2014-03-27 17:41:16 -03:00
Richard Alam
d007fecd9f - leave voice conference when logging out even if the browser hasn't fully redirected away from the client yet 2014-03-27 19:36:02 +00:00
Richard Alam
bddd6f747d i - fix issue where user cannot leave voice conference when clicking on headset icon 2014-03-27 15:23:28 +00:00
Richard Alam
7e528c6890 - don't connect using flash when we want webrtc 2014-03-26 20:40:37 +00:00
Richard Alam
cc624dfa5e - fix race condition where we hangup the chotest and join the conference at the same time. 
We should stop echo test then join voice conference.
 2014-03-26 19:00:39 +00:00
Richard Alam
963468d729 Merge branch 'merge-polling-with-master' into implement-join-voice-with-flash 2014-03-26 16:58:13 +00:00
Richard Alam
5fb8dee4cd - hide mic settings when user has joined the voice conference 2014-03-26 16:56:38 +00:00
Felipe Cecagno
68da29897b removing the black border 2014-03-26 11:03:37 -03:00
Felipe Cecagno
52a016bf3b fixed the issue when windows got different aspect ratio; cleanup 2014-03-26 11:03:28 -03:00
Felipe Cecagno
79f6b8daee making the video canvas border always visible 2014-03-26 10:25:38 -03:00
Felipe Cecagno
f6bd6fedae handling properly the permissions to mute 2014-03-26 10:25:12 -03:00
Richard Alam
9a001ed324 - close mic settings when user has joined voice conference 2014-03-25 21:33:58 +00:00
Richard Alam
4a495e0f6a - start stop echo test 2014-03-25 21:22:24 +00:00
Felipe Cecagno
89a96d2527 cleanup 2014-03-25 17:36:29 -03:00
Felipe Cecagno
c163d4783a improve the layout to avoid scroll bars 2014-03-25 17:08:42 -03:00
Richard Alam
e065b4a63b connect to echo test app 2014-03-25 20:05:33 +00:00
Felipe Cecagno
fc6b9ddabd better handling of voice events in the video camera; prettier transition between visible and invisible states in the mute btn 2014-03-25 14:46:19 -03:00
Richard Alam
cd552664bc - continue implementing joining voice conf using flash 2014-03-25 17:16:42 +00:00
Gustavo Salazar
9a2b05a7ee allow username with spaces 2014-03-24 17:18:39 -05:00
Felipe Cecagno
b4607f8f38 better icons in the video windows 2014-03-24 17:37:47 -03:00
Richard Alam
e27c8000f8 Merge branch 'merge-polling-with-master' into implement-join-voice-with-flash 2014-03-23 16:05:28 +00:00
Richard Alam
35daebbf86 - don't go through echo test again when user has already done it 2014-03-23 16:02:40 +00:00
Richard Alam
3f66908f4d - reinit mic 2014-03-21 22:08:50 +00:00
Richard Alam
bd0a54e9f1 - continue implementing Flash Mic Settings dialog 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/PhoneManager.as
 2014-03-21 21:43:19 +00:00
Richard Alam
ce3432fb1b - disable flash calling for webrtc testing 2014-03-21 14:37:09 +00:00
Richard Alam
0bc45659fc - show elcome message in chat window 2014-03-21 14:20:27 +00:00
Richard Alam
98d851c582 - add new commands 2014-03-20 20:46:46 +00:00
Richard Alam
5bb2a2cb2b - continue implementing join voice using flash 2014-03-20 19:10:09 +00:00
Richard Alam
148e3be430 - start implementing joining voice using flash 2014-03-19 21:34:09 +00:00
Felipe Cecagno
69ea5a3175 fully working version of the new videoconf window, still needs some UI tweaks to look better 2014-03-19 15:47:41 -03:00
Richard Alam
a08be6298f - implement flow for user to join vonce conf uwing webrtc 2014-03-18 19:14:27 +00:00
Richard Alam
bb5db33eac - implement user joining voice using webrtc 2014-03-17 19:47:45 +00:00
Felipe Cecagno
78f5761627 avoiding the main NetConnectionDelegate to trace for every cursor message 2014-03-16 22:08:31 -03:00
Felipe Cecagno
70ba73d388 implemented the very first version of the video dock without the internal windows as part of the videoconf module 2014-03-16 22:07:22 -03:00
firstuser
915f9aa3d7 - continue implementing mic settings for webrtc 2014-03-15 18:15:28 -07:00
Richard Alam
61d90933f4 - display different mic setting for ff and chrome 2014-03-14 22:44:53 +00:00
Richard Alam
04a77ddaca - figure out how to display mic permissions for FF and Chrome 2014-03-14 21:06:31 +00:00
Richard Alam
3b4b818841 i - do echo test and then join voice conference using webrtc 2014-03-14 19:21:21 +00:00
Richard Alam
4cc16f1b00 - add bin-debug dir to ignore 2014-03-14 16:03:23 +00:00
Richard Alam
d869dab51e - start implementing echo test and join conference using webrtc 2014-03-14 16:02:54 +00:00
Felipe Cecagno
79e513b38f Merge branch 'v0.81-release' of https://github.com/bigbluebutton/bigbluebutton into video-profiles 
Conflicts:
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/PublishWindow.mxml
 2014-03-12 21:58:15 -03:00
Richard Alam
680fa7709a - minot cleanup 2014-03-12 18:36:33 +00:00
Richard Alam
dd0ed0df37 - fix query presentations from JS API 2014-03-12 14:18:14 +00:00
Richard Alam
31926bd26d - implement end and destroy meeting 2014-03-10 21:38:03 +00:00
Richard Alam
62f89ebe2d - start deskshare properly 2014-03-09 20:23:39 -04:00
Richard Alam
1a5251621d - display poll button if presenter when user joins 2014-03-02 18:16:52 -05:00
Richard Alam
a418190169 - sync presentation position for latecomer 2014-03-02 16:43:04 -05:00
Richard Alam
a535412629 - fix switching presentation 2014-03-02 15:15:42 -05:00
Richard Alam
46bb7633ca - fix undo and clear whiteboard 2014-03-06 20:35:00 +00:00
Richard Alam
bb11712a19 - display whiteboard shapes 2014-03-06 19:23:18 +00:00
Richard Alam
e27274bf8c - use wb id instead of pres/pagenumber for whiteboard 
- the whiteboard id matches presId/page id for the current page
 2014-03-06 16:37:03 +00:00
Richard Alam
6b855aa351 - start refactoring whiteboard 2014-03-05 21:43:35 +00:00
Richard Alam
2f9650d1d3 - fix uploading of presentation 2014-03-05 19:54:32 +00:00
Richard Alam
a43c942314 - fix upload 2014-03-04 22:51:35 +00:00
Richard Alam
371e2da0b0 - allow changing of page usng thumbnail 2014-03-04 20:52:23 +00:00
Richard Alam
09c9bfa9e5 - display page properly 2014-03-04 20:18:31 +00:00
Richard Alam
4f799f09b4 - sync page 2014-03-04 16:54:49 +00:00
Richard Alam
0b9f90348c - handle page moves 2014-03-04 15:34:07 +00:00
Richard Alam
a5c9932498 - fix go to next/previous page 2014-03-04 14:59:19 +00:00
Richard Alam
bc5f60923c - figure out why we can't get to the next page 2014-03-03 21:41:18 +00:00
Richard Alam
89e2f6363a - display presentation page 2014-03-03 18:39:04 +00:00
Richard Alam
fe30c034d8 - continue refactoring presentation on client 2014-02-28 22:48:24 +00:00
Richard Alam
10b4b6ee3a - fix compile issues 2014-02-28 19:26:58 +00:00
Richard Alam
c946687872 - continue refactoring presentation 2014-02-28 16:48:21 +00:00
Richard Alam
d15e8c3a5b - continue cleaning up presentation 2014-02-27 21:41:25 +00:00
Richard Alam
feb49951a5 - add presentation ids to presentation conversion 2014-02-27 17:23:44 +00:00
Richard Alam
32431f62c7 - missed one file 2014-02-25 02:45:37 +00:00
Richard Alam
d8933b322c - disable join button when doing an echo test 2014-02-24 23:56:09 +00:00
Richard Alam
5c3859aa23 - add echo test for voice 2014-02-24 21:45:00 +00:00
Richard Alam
dcfe856f46 - fix issue where users show up as joined voice when a client loads 2014-02-24 19:24:23 +00:00
Hugo Lazzari
02f34bd51b URL connection control. Now only record on source server. 2014-02-24 10:25:00 -03:00
Richard Alam
b78a0fa776 - remove auto switching to presenter from client if joining as the first moderator 
as this is now driven on the server side
 2014-02-21 22:50:02 +00:00
Richard Alam
944b04e3a7 - fix async errors when users join/leave voice 2014-02-21 22:26:12 +00:00
Richard Alam
ab7d328ba1 - fix issue where connection drops due to async error when joining voice conference 2014-02-21 21:41:56 +00:00
Richard Alam
8a2990284e - cleanup and formatting 2014-02-21 20:02:54 +00:00
Richard Alam
4fc48da1b2 - change user joining sequence 2014-02-20 21:39:29 +00:00
Richard Alam
02e3e8cbc3 - set up flow for validating auth token when user joins 2014-02-20 18:01:55 +00:00
Richard Alam
6159029711 - cleanup 2014-02-19 21:54:15 +00:00
Richard Alam
ac111de364 Merge remote branch 'bbb/v0.81-javau51-update' into merge-java-7u51-branch 2014-02-19 20:09:56 +00:00
Richard Alam
e05d310908 - removing dependency on FS userid to manage voice for each user 2014-02-19 19:23:17 +00:00
Richard Alam
b6e5bf8091 - fix some compile issues 2014-02-19 15:33:51 +00:00
Richard Alam
ae36cb7997 - try to fix why we can't handle user leaving voice 2014-02-18 19:07:07 -05:00
Richard Alam
3a5f4ad079 - handle user messages from the server 2014-02-18 16:57:35 -05:00
Richard Alam
7d484dc0ba - create individual messages 2014-02-14 17:05:50 -05:00
Richard Alam
67b591001a - move users model 2014-02-14 15:42:20 -05:00
Richard Alam
d922531288 - organize data model 2014-02-14 14:50:00 -05:00
Richard Alam
2f9364cdc1 - start implementing the models 2014-02-14 12:13:38 -05:00
Richard Alam
a60299d036 - start/stop recording button works now 
- need to work on record processing
 2014-02-13 16:02:43 +00:00
Richard Alam
0bd25997a9 - implement start/stop recording. 
- TODO: alert doesn't popup when clicking on the record button
 2014-02-12 18:25:28 -05:00
Richard Alam
948e1b323e Merge branch 'master' into merge-polling-with-master 2014-02-12 15:59:23 -05:00
Richard Alam
0e935d4927 - fix swithc presenter 2014-02-12 15:56:19 -05:00
Richard Alam
aa341b5b6f - fix issue where other users gets logged out when a user leaves the meeting 2014-02-12 15:33:30 -05:00
Richard Alam
6cef7ecdac - fix share webcam 2014-02-12 15:27:10 -05:00
Chad Pilkey
e3b617225e Merge pull request #305 from syeshchenko/presentationWindowFix 
FileUploader window fixes
 2014-02-12 13:04:00 -05:00
Richard Alam
d967f86750 - fix get users reply message 2014-02-12 12:33:28 -05:00
Richard Alam
0f59af0aad - fix voice users commands and events 
- TODO: figure out why we are not receiving mute/talk events from FS ESL
 2014-02-11 22:45:24 -05:00
syeshchenko
ed15780273 Centred the FileUploadWindow, restricted the width of file name to be shown in the list 2014-02-11 14:48:44 -08:00
Richard Alam
f071e65235 - finally! got presentation to work...needs some cleanup 2014-02-11 14:52:13 -05:00
Gustavo Salazar
901d7a1097 use mic permission image not only for chrome 2014-02-11 11:41:02 -08:00
Gustavo Salazar
8709d7fae8 Update browser versions for webrtc 2014-02-11 11:15:01 -08:00
Richard Alam
e30ef32867 - now sending correct messages to client 2014-02-11 13:33:14 -05:00
syeshchenko
df001f9c9a Centred the Close button 2014-02-11 08:32:58 -08:00
Gustavo Salazar
339608c813 update message for not webrtc capable browser 2014-02-10 14:16:05 -08:00
Richard Alam
c77ddd76d3 Merge branch 'master' into merge-polling-with-master 2014-02-10 21:49:36 +00:00
Gustavo Salazar
fd4a34bc57 Fit webrtc buttons in audio settings window. 2014-02-10 13:49:18 -08:00
Richard Alam
858f1fef88 - try to figure out why whiteboard history isn't working 2014-02-10 21:48:24 +00:00