Commit Graph

2779 Commits

Author SHA1 Message Date
Chad Pilkey
628bd364cd the webcam indicator is now only a button when you have closed the stream 2013-05-13 15:58:26 -07:00
Chad Pilkey
05be49429f Merge remote branch 'upstream/master' into improve-client 2013-05-13 09:41:51 -07:00
Fred Dixon
630ec92d84 Layout fix for issue https://code.google.com/p/bigbluebutton/issues/detail?id=1498 2013-05-12 16:41:08 -07:00
Fred Dixon
bc45788ae2 Added back allowKickUser='true' to config.xml.template 2013-05-11 17:39:40 -04:00
Richard Alam
dfbd64e316 - cleanup presentation upload event names 2013-05-10 16:59:50 +00:00
Chad Pilkey
40be1f9859 fixed all of the flash coercion errors related to locales 2013-05-09 15:53:25 -07:00
Markos Calderon
00bcf1b232 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton 2013-05-09 17:30:25 -05:00
Markos Calderon
da3cc3b5b5 fix for java showing security warning when closing desktopsharing 2013-05-09 17:30:12 -05:00
Chad Pilkey
8c4daa1685 increased size of the mute me button 2013-05-09 15:27:18 -07:00
Richard Alam
5b3809f0de - scale the video properly and turn on smoothing video when scaled 2013-05-09 21:49:44 +00:00
Markos Calderon
35e02a9acc Merge branch 'master' into presentation-js-api 2013-05-09 14:10:55 -05:00
Markos Calderon
7e7e0e6377 fix for presentation name in JS presentation api 2013-05-09 13:37:07 -05:00
Markos Calderon
0968345635 Merge branch 'presentation-js-api' of https://github.com/bigbluebutton/bigbluebutton into presentation-js-api 2013-05-08 18:17:44 -05:00
Markos Calderon
7d4a446afb listen js conversion events 2013-05-08 18:17:06 -05:00
Richard Alam
f0d7d933d0 make cam, mic settings, and presentation upload windows NOT draggable 2013-05-08 15:38:52 +00:00
Richard Alam
9a291902d0 - display published video properly and maintain aspect ratio 2013-05-07 21:00:59 +00:00
Richard Alam
c6a464f860 Merge branch 'master' into presentation-js-api 2013-05-07 18:14:35 +00:00
Markos Calderon
889aa4ef90 initial changes for third party page 2013-05-07 13:05:35 -05:00
Richard Alam
50f93ee9cd - allow presenter to lock/unlock layout 2013-05-07 17:49:50 +00:00
Richard Alam
9df2b7c231 - resize avatar image maintaining aspect ratio 2013-05-07 16:07:50 +00:00
Richard Alam
05225d9826 - Fix https://code.google.com/p/bigbluebutton/issues/detail?id=1489 2013-05-06 18:47:25 +00:00
Markos Calderon
815f3abcd3 put a check while the activation is complete for publishing 2013-05-03 16:52:07 -05:00
Markos Calderon
931c3ba942 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton 2013-05-03 15:15:00 -05:00
Markos Calderon
7bd396c017 fix for webcam sharing 2013-05-03 15:14:39 -05:00
Richard Alam
711ef6e67d - don't display video control buttons when window is very small 2013-05-03 18:38:27 +00:00
Markos Calderon
063a952df7 fix hide and show presenter icon in videoconf 2013-05-03 10:55:54 -05:00
Richard Alam
08aee47876 - make video windows the same sizes inside video dock 2013-05-03 14:31:22 +00:00
Richard Alam
97884b8cc8 - notify JS API that user has left the meeting 2013-05-02 18:41:48 +00:00
Chad Pilkey
60b1e77196 the message time is now correct 2013-04-28 15:12:08 -07:00
Chad Pilkey
c18f9405f6 chat messages now know the correct last message send time 2013-04-28 13:42:04 -07:00
Richard Alam
dd8014c122 - fix problem where webcam button is not showing up when user is using RTMPT 2013-04-28 20:10:22 +00:00
Richard Alam
9a338b8105 - don't delete locales folder unless building locales 2013-04-28 17:15:05 +00:00
Richard Alam
e30a87d91c - build polling after building main client to generate linker-report needed by modules 2013-04-27 14:53:14 -07:00
Richard Alam
7740b54b17 create client dir if not present 2013-04-27 14:15:01 -07:00
Richard Alam
a98511997d - don't delete .gitignore under client dir 2013-04-27 13:46:53 -07:00
Richard Alam
7805cfb854 - use client dir as output target instead of bin. This way we don't have to link bin to client
to setup dev env
2013-04-27 13:18:54 -07:00
Richard Alam
cc8a93b0e2 - cleanup project files 2013-04-27 13:17:30 -07:00
Richard Alam
9d20b66e5f - remove copying of join-mock.xml as we don't support that anymore 2013-04-27 13:08:44 -07:00
Chad Pilkey
a7ff32711e the whiteboard toolbar now follows the presentation window when it moves
when it moves
2013-04-27 10:42:23 -07:00
Chad Pilkey
ddfc84b8c0 added disabled icons for left and right arrow buttons in presentation window 2013-04-27 10:21:40 -07:00
Felipe Cecagno
0619d5716a Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton 2013-04-26 17:44:57 -03:00
Felipe Cecagno
1f3f6e927f fixing the problem that was preventing the client to load the default layouts in the beginning of the session; the combo was only populated if the layouts were loaded BEFORE the layout combo get created - now it works independently of the order that the elements get initialized 2013-04-26 17:43:22 -03:00
jtrobinson
3bd3d6c88a Changed Ctrl-X to Ctrl-L 2013-04-26 12:13:41 -07:00
Richard Alam
00a0d1e8a1 Merge pull request #132 from mconf/layout-min-width-0.81
Layout minWidth
2013-04-25 15:39:50 -07:00
Felipe Cecagno
34d16432e5 just fixed an issue introduced during the merge of minimum width on layouts 2013-04-25 18:52:13 -03:00
Felipe Cecagno
7ad5b359dc adding minWidth to the current default layouts 2013-04-25 18:16:14 -03:00
Felipe Cecagno
59825d336d Merge remote branch 'mconf/layout-min-width' into layout-min-width-0.81
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/events/ModuleLoadEvent.as
	bigbluebutton-client/src/org/bigbluebutton/main/maps/ApplicationEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/model/modules/ModuleManager.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/modules/ModulesProxy.as
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/model/LayoutDefinition.as
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/model/WindowLayout.as
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/services/LayoutSharedObjectService.as
2013-04-25 18:12:44 -03:00
Richard Alam
89ce86ae90 Merge pull request #130 from SenecaCDOT-BigBlueButton/fix-userwindow-namecolumn
added min widths to the userwindow columns
2013-04-25 13:30:50 -07:00
Richard Alam
0db837a18d Merge pull request #129 from SenecaCDOT-BigBlueButton/fix-presentation-ctrlbar
Fix presentation ctrlbar
2013-04-25 13:30:31 -07:00
Richard Alam
a8b9ac3214 Merge pull request #128 from SenecaCDOT-BigBlueButton/add-headset-to-joinaudio
added a headset icon to the join audio button
2013-04-25 13:30:04 -07:00