BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,868 Commits 13 Branches 260 Tags 1.1 GiB
7301d35941
Commit Graph

7868 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
cbfcdc231c Merge pull request #333 from SenecaCDOT-BigBlueButton/fix-phonenumber-text 
Addendum to #332
 2014-06-05 17:06:46 -04:00
Chad Pilkey
893c977ec9 forgot to add the new config property to the template 2014-06-05 14:04:19 -07:00
Richard Alam
2a0afbc6cc Merge pull request #332 from SenecaCDOT-BigBlueButton/fix-phonenumber-text 
Fix phone number text in audio selection
 2014-06-05 16:56:45 -04:00
Chad Pilkey
632096fd64 the phone option is now somewhat configurable 2014-06-05 13:52:37 -07:00
Richard Alam
94405b8e35 Merge pull request #331 from SenecaCDOT-BigBlueButton/alternate-upload-dialog-spawn 
Cleaned up the FileUploadWindow
 2014-06-04 15:04:32 -04: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
Fred Dixon
ee839aa7a5 Merge pull request #324 from xaker1/feature 
Contributor agreement received.  Merging (thanks!)
 2014-05-30 15:52:53 -04:00
Richard Alam
81e9a9ab9c Merge branch 'merge-polling-with-master' into broadcast-layout 2014-05-30 11:11:29 -07:00
Richard Alam
f4ff66c211 - update jar version numbers for red5 1.0.2 2014-05-30 11:10:41 -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
4cfd877f37 Merge branch 'merge-polling-with-master' into broadcast-layout 2014-05-29 14:09:34 -07:00
Richard Alam
e7dcf3c4bf - fix compile issue 2014-05-29 13:55:01 -07:00
Richard Alam
efd66699f0 - get it to compile 2014-05-29 12:02:55 -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
8221f219d0 - pass list of users to sync 2014-05-29 07:28:55 -07:00
Richard Alam
224bea1f5f - sync layout with viewers 2014-05-29 07:06:44 -07: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
32e90ae8e5 - move lock settings info to bbb-apps from client 2014-05-27 13:14:34 -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
Richard Alam
0a59bb3964 Merge branch 'merge-polling-with-master' of github.com:antobinary/bigbluebutton into have-server-send-data-when-user-joins 2014-05-26 12:32:54 -07: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
Anton Georgiev
1de97beadc the public chat messages are now displayed correctly - just once 2014-05-26 17:19:14 +00:00
Richard Alam
fb269a3c6b - remove user sessions from hashmap when user leaves and when meeting is destroyed to 
prevent memory leaks
 2014-05-26 08:32:56 -07:00