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

3087 Commits

Author SHA1 Message Date
Richard Alam
f45503d3c2 Merge pull request #155 from SenecaCDOT-BigBlueButton/fix-panning 
Fix panning
 2013-05-16 14:36:06 -07:00
Chad Pilkey
8f716fe33f change the thumbnail index when the slide changes 2013-05-16 14:25:57 -07:00
Chad Pilkey
24d15d74ec removing a file 2013-05-16 14:18:17 -07:00
Chad Pilkey
00a87a50e8 removed everything related to the old whiteboard toolbar button 2013-05-16 14:17:33 -07:00
Richard Alam
20c39ea109 - upgrade to the applet with fix for java block popup when stopping deskshare 
- generate an unsigned applet so other can sign using their own cert
 2013-05-16 20:10:33 +00:00
Richard Alam
60c0cdf11d Merge pull request #154 from SenecaCDOT-BigBlueButton/chat-hotkey-focus-fix 
Only one Chat hotkey needed changing to incorporate focus.
 2013-05-16 12:42:07 -07:00
jtrobinson
05b3f49a8a Only one Chat hotkey needed changing to incorporate focus. 2013-05-16 11:49:07 -07:00
jtrobinson
4d9f82fe4f Fixed focus and permission bugs for the remaining Presentation hot keys (Next and Previous, Slide selection, Fit to Width/Page) all at once. 2013-05-16 11:10:46 -07:00
jtrobinson
6b79780d38 Focus moves to Upload Presentation button when the relevant hotkey is used. Also fixed a small permission error in the same function. 2013-05-16 10:46:56 -07:00
jtrobinson
70aaed2b43 Focus moves to the Mute/Unmute button when the mute toggle shortcut key is used 2013-05-16 10:06:44 -07:00
jtrobinson
e30cd65994 Focus returns to Shortcut Help button after Glossary window closes. when the Glossary OPENS, focus moves to the titleBarOverlay as with all other module windows. 2013-05-16 09:19:52 -07:00
jtrobinson
8c4d4b321e Focus returns to Webcam button when Webcam window closes 2013-05-16 07:27:51 -07:00
jtrobinson
bdf1f46a16 Focus returns to Desktop Sharing button when DeskShare window closes. 2013-05-16 07:14:14 -07:00
Chad Pilkey
fb2ae2ab2a whiteboard tools now stay selected after hitting undo 2013-05-15 10:17:17 -07:00
Chad Pilkey
41b11581e5 increased the rowCount of the layout combobox to 10 2013-05-15 09:56:35 -07:00
Chad Pilkey
9c05911749 missed a listeners file as well 2013-05-15 09:46:00 -07:00
Chad Pilkey
bfdefeff8d missed a file while removing viewers 2013-05-15 08:05:46 -07:00
Fred Dixon
355334a6c5 Adjusted the logout icon for better fit in button 2013-05-14 21:03:51 -04:00
Chad Pilkey
27ecbcebeb mutemebutton mouse over text strings are now fixed 2013-05-14 15:56:07 -07:00
Chad Pilkey
4adb843005 changed logout button to an icon 2013-05-14 15:42:59 -07:00
Chad Pilkey
f4e57188ed help button changed to question mark 2013-05-14 14:28:25 -07:00
Chad Pilkey
4667c0c56a lock icon now only visible when locked 2013-05-14 12:38:32 -07:00
Richard Alam
ddce270398 Merge pull request #146 from SenecaCDOT-BigBlueButton/remove-viewers-and-listeners 
Remove viewers and listeners
 2013-05-14 12:18:31 -07:00
Chad Pilkey
0881bf052c removed locale strings for viewers and listeners 2013-05-14 12:10:53 -07:00
jtrobinson
bf8ea046d3 Focus moves to the 'start' of the BigBlueButton window when user leaves Audio Settings. 2013-05-14 11:52:20 -07:00
Chad Pilkey
e785e80629 viewers and listeners modules wiped from record 2013-05-14 11:40:21 -07:00
Richard Alam
36568ed037 Merge pull request #143 from SenecaCDOT-BigBlueButton/improve-client 
There are a couple of miscellaneous client improvements
 2013-05-14 10:55:57 -07:00
Richard Alam
f3d8358990 Merge pull request #142 from SenecaCDOT-BigBlueButton/accessible-audio-settings 
Accessible audio settings window
 2013-05-14 10:54:31 -07:00
Richard Alam
6314140dcb - position button controls on the lower right of video window 2013-05-14 15:15:22 +00:00
Chad Pilkey
c75a25d679 the webcam indicator is always an icon for your own entry 2013-05-13 16:10:29 -07:00
Chad Pilkey
b5d25388cd Merge remote branch 'upstream/master' into improve-client 2013-05-13 15:59:13 -07:00
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
Richard Alam
5731d49a05 - display mute/unmute control only when user is joined to the voice conference 
- display properly switch presenter and eject buttons depending on role of user
 2013-05-13 22:19:18 +00:00
Richard Alam
71eedbe1fb - display webcam standalone properly maintaining aspect ratio 2013-05-13 18:45:50 +00: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
jtrobinson
e81b437740 Audio Settings window is compatible with JAWS. 2013-05-09 13:40:42 -07: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
jtrobinson
9d886f814d Added accessibilityDescriptions to buttons in Audio Settings window. 2013-05-09 09:10:27 -07:00
jtrobinson
72ac0718a2 Added accessibilityDescription to audio settings help button and a corresponding string in English locale 2013-05-09 09:06:07 -07:00
jtrobinson
dddbdedffd The audio settings window had two help buttons which did the same thing. Removed one of them. 2013-05-09 09:01:08 -07: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
Chad Pilkey
686785462c added min widths to the userwindow columns 2013-04-25 13:01:09 -07:00
Felipe Cecagno
e20b583861 make the hack of starting the layout module before the other modules compatible with BigBlueButton 0.8 (since the layout was developed on that version, and the hack was done in another one) 2013-04-25 16:51:50 -03:00
Felipe Cecagno
438e2e6156 some refactor on how layouts are loaded from server and populate the layouts combo box; fixed the "add layout" button that was not working since last modifications on the module; 2013-04-25 16:49:28 -03:00
Chad Pilkey
2c7b5cf36f increased the size of all the other control bar buttons 2013-04-25 11:58:26 -07:00
Chad Pilkey
a11215b278 clean up toolbar comments 2013-04-25 08:46:57 -07:00
Chad Pilkey
88dea837e4 hide the whiteboard toolbar when over the presentation controlbar 2013-04-25 08:44:21 -07:00
Chad Pilkey
f62f66c451 increased the size of the left and right presentation buttons 2013-04-25 08:43:50 -07:00
Chad Pilkey
d78ce305ab added a headset icon to the join audio button 2013-04-24 09:54:08 -07:00
Chad Pilkey
8876059be4 added allowKickUser option to config.xml, fixed lock icon bug, set whiteboardtoolbar to invisible by default 2013-04-23 14:45:20 -07:00
Fred Dixon
7096bb828f Updated wording for Test Microphone to Test/Change Microphone 2013-04-20 18:21:53 -07:00
Fred Dixon
040cf5478c Updated fit-to-screen icon 2013-04-20 17:02:49 -07:00
Fred Dixon
5f528f004f Removed ',' from Copyright notice 2013-04-20 16:25:33 -07:00
Richard Alam
4b9bf799cd - modify copyright 2013-04-19 21:31:32 +00:00
Richard Alam
dcea68de29 - try checking for desktop sharing port 2013-04-19 21:30:54 +00:00
Richard Alam
2f30fd4485 - check if user can connect using RTMP or RTMPT 2013-04-17 21:47:12 +00:00
Richard Alam
8986c4b0ef Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2013-04-17 18:37:35 +00:00
Richard Alam
344e87a548 - try to figure out best way to test for cam 2013-04-17 18:36:43 +00:00
Fred Dixon
d61f83248c Further simplified default layout.xml by commenting out the Users layout as it appears the same as default layout 2013-04-17 11:17:49 -07:00
Fred Dixon
6083c28418 Remove red from cancel button in presentation upload dialog 2013-04-16 19:42:23 -07:00
Fred Dixon
b58a7a0028 Simplified the choices in layout.xml 2013-04-16 19:35:11 -07:00
Fred Dixon
abc074aaa1 Hide the network monitor and editing buttons for layouts module by defult 2013-04-16 19:23:20 -07:00
Markos Calderon
581b9caf27 UI changes to muteme button 2013-04-16 20:09:10 -05:00
Markos Calderon
7100c53543 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton 2013-04-16 18:38:36 -05:00
Markos Calderon
c29e1b9aab added UI changes to layout menu and network monitor 2013-04-16 18:38:11 -05:00
Richard Alam
dc69530bf0 - start add cam check 2013-04-16 21:17:00 +00:00
Felipe Cecagno
b5fe8a7a09 Implemented the minWidth property in the layouts; it is defined in the window definition and is expressed in pixels: 
<layout name="Something">
    <window name="VideoDock" width=... minWidth="400" />
</layout>

The other windows will adjust their size and position to fit the canvas according the windows with fixed minimum width. minHeight was not implemented yet.
 2013-04-16 18:04:51 -03:00
Markos Calderon
7ca3a26c54 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton 2013-04-16 16:00:47 -05:00
Markos Calderon
e918777ef2 UI modifications when user is talking 2013-04-16 16:00:11 -05:00
Richard Alam
9913cba842 - don't make upload button fix sized to allow changing icon through CSS 2013-04-16 20:51:04 +00:00
Richard Alam
8457c2b30d - don't show switch presenter button if you are already presenter 2013-04-16 20:50:34 +00:00
Richard Alam
420e7fe339 Merge branch 'implement-pre-flight' 
Conflicts:
	bigbluebutton-client/build.xml
 2013-04-16 17:43:24 +00:00
Richard Alam
13923dbf39 Merge branch 'make-polling-start-up' 2013-04-16 15:45:06 +00:00
Richard Alam
3481b80230 - check for microphone 2013-04-16 15:42:31 +00:00
Richard Alam
9252447a92 - make polling module run with latest master 2013-04-15 20:48:10 +00:00
Fred Dixon
47a4d72c13 Removed second HRule for the Audio Settings Dialog 2013-04-13 09:02:28 -07:00
Richard Alam
34d3285a04 Merge pull request #124 from SenecaCDOT-BigBlueButton/imp-muteme-button 
New muteme button
 2013-04-12 08:08:25 -07:00
Richard Alam
0f98d922bf - add some checks for java 2013-04-12 10:08:48 +00:00
Richard Alam
e5887fe1b8 - start adding checks 2013-04-12 09:36:21 +00:00
Richard Alam
89c73c9951 - start implementing standalone pre-flight check page 2013-04-12 07:47:07 +00:00
Richard Alam
753a79546d - provide JS api to eject user 2013-04-11 20:56:02 +00:00
Chad Pilkey
d5e955c2a8 Merge remote branch 'upstream/master' into imp-muteme-button 2013-04-11 10:48:07 -07:00
Chad Pilkey
120fea2fd0 removed old button and new one works 2013-04-11 10:10:32 -07:00
Richard Alam
4b5afe742c - disable looback audio when opening mic settings 2013-04-10 22:04:29 +00:00
Richard Alam
ca37dd17ff - fix issue where the avatar window opens up when a user sharing webcam is ejected from the meeting 2013-04-10 21:20:02 +00:00
Richard Alam
68b522803d - Add button to test microphone 2013-04-10 21:02:04 +00:00
Richard Alam
8b98130d46 - turn on loopback when testing mic 2013-04-10 20:10:56 +00:00
Richard Alam
3fef459a19 - simplify audio settings 2013-04-10 18:45:08 +00:00
Richard Alam
6ef3a8d51a - fix issue where we can't match voice user with web user when user's name has a dash 2013-04-09 17:42:32 +00:00
Chad Pilkey
0617d847ea switched strings to locale strings, unlocked is now only shown to moderators 2013-04-08 13:26:12 -07:00
Chad Pilkey
1039dc5f59 muteMeBtn hides when locked, added text to the muteMeBtn 2013-04-08 11:27:27 -07:00
Chad Pilkey
e68213b53a added 20x20 images so images in the users window don't shift 2013-04-05 13:25:21 -07:00
Markos Calderon
652076d952 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton 2013-04-04 15:50:26 -05:00
Markos Calderon
0db6cfedb6 make gloweffect configurable 2013-04-04 15:50:12 -05:00
Richard Alam
3f27928cd6 Merge pull request #117 from SenecaCDOT-BigBlueButton/re-implement-locking 
more misc fixes
 2013-04-04 12:33:38 -07:00
Chad Pilkey
66e7f0bb98 more misc fixes 2013-04-04 12:04:05 -07:00
Markos Calderon
8092532740 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton 2013-04-03 17:29:17 -05:00
Markos Calderon
5898b5ad49 correction for autokick 2013-04-03 17:28:54 -05:00
Richard Alam
5d11113fb9 - enable echo suppression to minimize echo when checking for mic settings 2013-04-03 21:49:41 +00:00
Chad Pilkey
f1046c7df8 you no longer appear to be connected to the audio no matter what 2013-04-03 14:11:45 -07:00
Chad Pilkey
883bc045ed Merge remote branch 'upstream/master' into re-implement-locking 2013-04-03 13:17:00 -07:00
Chad Pilkey
c91bbfd7db changed the individual mute and lock to images when not rolled over and buttons when rolled 2013-04-03 13:14:40 -07:00
Markos Calderon
e34ddfe757 disable kick yourself 2013-04-03 14:38:06 -05:00
Markos Calderon
d7308bb0ab added hebrew language 2013-04-02 16:23:24 -05:00
Chad Pilkey
2b5f91d170 pushing before fire alarm 2013-04-02 13:15:08 -07:00
Markos Calderon
1261828a09 added maxFileSize configurable from config.xml 2013-04-02 14:56:11 -05:00
Chad Pilkey
00479ecd4b reverted to just locking enabled 2013-04-02 10:03:47 -07:00
Markos Calderon
dbe12bd4e7 fixed goToPage issue not updating for others 2013-04-01 16:15:27 -05:00
Chad Pilkey
bfa8e97e34 mic disable state is implemented, but can't filter by role yet 2013-03-28 14:38:37 -07:00
Richard Alam
2ac532cf2e Merge branch 'master' into merge-master-into-dynamic-config 2013-03-27 14:21:05 +00:00
Richard Alam
c5f668e3bc - fix bug where publish window becomes resizable when broadcasting webcam 2013-03-25 17:11:22 +00:00
Richard Alam
d9dc599b24 - add a black theme file 2013-03-23 20:48:55 +00:00
Chad Pilkey
d46d416aad Merge remote branch 'upstream/master' into fix-video-dock 2013-03-23 13:55:23 -04:00
Chad Pilkey
3dd69116d9 added video option to prioritize a user's webcam when they start talking 2013-03-23 13:49:30 -04:00
Richard Alam
0fff63d4d2 - display multiple resolutions for all users 2013-03-22 16:10:59 +00:00
Richard Alam
6de26a98a8 Merge branch 'master' into merge-master-into-dynamic-config 2013-03-22 14:57:53 +00:00
Richard Alam
a5c193bc7a Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2013-03-22 14:17:59 +00:00
Richard Alam
aebc524125 - Fix NPE when removing voice conference when all users have left 2013-03-22 14:16:31 +00:00
Markos Calderon
787b437479 fix setting h264 level 2013-03-21 16:50:30 -05:00
Chad Pilkey
f2cc1028ef fixed the mutebtn in the users itemrenderer to be included in the layout 2013-03-20 13:10:44 -04:00
Richard Alam
685da4de75 Merge branch 'master' into merge-master-into-dynamic-config 2013-03-20 14:49:08 +00:00
Richard Alam
65c28bf90a - minor cleanup 2013-03-19 22:28:28 +00:00
Richard Alam
60b3586024 Merge pull request #110 from SenecaCDOT-BigBlueButton/fix-camera-settings-popup 
fixed camera settings resolution and a tooltip
 2013-03-19 12:21:14 -07:00
Chad Pilkey
795df0761b fixed camera settings resolution and a tooltip 2013-03-19 13:08:27 -04:00
Chad Pilkey
8f164d3e23 added images when buttons are disabled in the users window and button images swap on mouse over 2013-03-18 19:08:30 -04:00
Richard Alam
6955757a3e Merge branch 'master' into merge-master-into-dynamic-config 2013-03-18 18:35:43 +00:00
Richard Alam
b4a1cd191b Merge pull request #108 from SenecaCDOT-BigBlueButton/rename-participants-module 
Rename participants module
 2013-03-18 11:33:18 -07:00
Richard Alam
db8d305d3b Merge branch 'master' into merge-master-into-dynamic-config 2013-03-18 18:06:36 +00:00
Markos Calderon
f0bbe5db4e Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton 2013-03-18 12:58:36 -05:00
Markos Calderon
9babc757fc fix close cam if it's not available 2013-03-18 12:58:09 -05:00
Chad Pilkey
df557b89af changed all internal references to participants to users 2013-03-15 18:53:39 -04:00
Chad Pilkey
c77ceba8fe renamed participants files to users files 2013-03-15 18:08:53 -04:00
Chad Pilkey
8671477202 renamed participants module to users 2013-03-15 17:54:32 -04:00
Richard Alam
0e386adab2 Merge branch 'master' into merge-master-into-dynamic-config 2013-03-15 21:03:13 +00:00
Richard Alam
52bd6f2b7d - make JS API voice mute/unmute, etc. work with the participants module 2013-03-15 18:49:45 +00:00
Richard Alam
956242d644 - use Participants module as default 2013-03-14 18:47:01 +00:00
Richard Alam
a6736d8e68 - change bw and port test to connect to a subscope. Somehow if we don't, we can't reconnect again when all users logs out 2013-03-14 15:54:14 +00:00
jfederico
2b23d9cea7 Merge branch 'bbb-lti_v0.1.1' 2013-03-13 11:30:46 -04:00
Chad Pilkey
af7e8c5bc4 Merge remote branch 'upstream/master' into more-client-fixes 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/participants/views/ParticipantsWindow.mxml
 2013-03-12 18:17:01 -04:00
Chad Pilkey
2bc57e953a added mute all except presenter and removed presenter from sort function 2013-03-12 17:57:40 -04:00
Markos Calderon
d3c303776e added localization strings for participants module 2013-03-12 16:02:35 -05:00
Markos Calderon
0d01fb9a4b Check if accessibility is supported 2013-03-11 15:02:59 -05:00
Chad Pilkey
1c7a06003b removed chat colour picker and coloured the welcome message 2013-03-11 13:17:23 -04:00
Chad Pilkey
d581bf6958 moved the Select File button 2013-03-11 11:58:44 -04:00
Markos Calderon
86970340d8 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton 2013-03-08 17:05:01 -05:00
Markos Calderon
34616c04d8 Merge branch 'layout-module' of https://github.com/mconf/bigbluebutton into mconf-layout-module 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/maps/LayoutEventMap.mxml
 2013-03-08 17:04:02 -05:00
Richard Alam
74e983605d Merge pull request #102 from SenecaCDOT-BigBlueButton/css-improvements 
cleaned up the UI a little
 2013-03-08 07:00:22 -08:00
Chad Pilkey
f1b9e19a42 cleaned up the UI a little 2013-03-07 18:04:32 -05:00
Markos Calderon
3d87c1cb1a change flag value for cameradeniedaccess 2013-03-07 16:02:08 -05:00
Markos Calderon
17a76f281b ask again for accessing to the webcam 2013-03-07 15:48:13 -05:00
Markos Calderon
058c9fda8f Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton 2013-03-07 15:20:55 -05:00
Markos Calderon
d6a368f32e change shortcutkeys property name in config.xml 2013-03-07 15:20:27 -05:00
Richard Alam
a9b3f7755b - in participants module, make sure the user is ejected from the voice conf when 
ejected from the web
 2013-03-07 16:23:02 +00:00
Richard Alam
40ae05b8d0 - in listeners's module, listen for eject user event and make sure that the user is 
also ejected from the voice conf
 2013-03-07 16:21:44 +00:00
Richard Alam
fd21773ba1 Merge pull request #101 from SenecaCDOT-BigBlueButton/fix-sharewebcam-toolbarbutton 
fixed bug 1393 and properly formatted the MIC_SETTINGS_CLOSED event thro...
 2013-03-05 11:56:16 -08:00
Richard Alam
dd267e21db Merge pull request #100 from SenecaCDOT-BigBlueButton/add-participants-to-layout 
the presentation window has been added to the layout.xml file and is pro...
 2013-03-05 11:55:35 -08:00
Richard Alam
084ae6ac44 Merge pull request #99 from SenecaCDOT-BigBlueButton/implement-mute-all 
implemented mute all functionality
 2013-03-05 11:55:08 -08:00
Markos Calderon
b2dd27d56f added showbutton to deskshare module 2013-03-05 10:01:42 -05:00
Hugo Lazzari
2d5519b866 Translation of new resources to pt_br, fixed guestWindow layout when using pt_br, fixed bug that sometimes made flash not load the strings. 2013-03-05 09:31:24 -03:00
Chad Pilkey
034a7b4b61 fixed bug 1393 and properly formatted the MIC_SETTINGS_CLOSED event throughout the client 2013-03-04 18:43:45 -05:00
Chad Pilkey
cc563a73b5 the presentation window has been added to the layout.xml file and is properly positioned 2013-03-04 17:29:36 -05:00
Chad Pilkey
e655b2dfa3 implemented mute all functionality 2013-03-04 17:21:37 -05:00
Markos Calderon
4a67a67826 fix deskshare preview when the area is wider 2013-03-04 15:53:54 -05:00
Fred Dixon
f58fa128dd Removed carriage returns from config.xml so the bbb-client post instal scripts would run without error 2013-03-03 03:45:32 -05:00
Chad Pilkey
c883340d9c removed Shortcut button from the layout when invisible and fixed a typo in a method name. ('T's are important) 2013-03-01 20:17:14 -05:00
Chad Pilkey
638b3d01a4 Merge remote branch 'upstream/master' into access-hotfix 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
 2013-03-01 20:12:07 -05:00
Chad Pilkey
f79de237de fixed a lot of issues with accessibility 2013-03-01 20:00:33 -05:00
Richard Alam
b57044dcc7 Merge pull request #85 from SenecaCDOT-BigBlueButton/fix-controlbutton-null-ref 
fix null ref when presenter switches before video control buttons load fully
 2013-03-01 10:26:53 -08:00
Richard Alam
3740380e58 Merge pull request #93 from SenecaCDOT-BigBlueButton/fix-presentation-zoom 
Fix presentation zoom
 2013-03-01 10:05:03 -08:00
Hugo Lazzari
cffcc3fbf5 New BBBSettings button and window. 
You can now add a component to bbb settings window using the event
SettingComponentEvent tha same way that is used to add buttons on
MainToolbar. All components added should listen to OK and Cancel events
to know when this events happen.
 2013-03-01 11:56:27 -03:00
Markos Calderon
942d2f146a make shortcutKeys button configurable in config.xml 2013-02-28 17:32:44 -05:00
Markos Calderon
0fba95a2ac Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton 2013-02-28 15:52:03 -05:00
Markos Calderon
a56d706b3d fix share webcam when autosharing is true and show button false 2013-02-28 15:51:35 -05:00
Richard Alam
36130c1339 Merge branch 'master' into unify-users-and-listeners 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/Conference.as
 2013-02-28 19:26:01 +00:00
Hugo Lazzari
a98b604dc5 Fixed missed import and misspelled variable. 2013-02-28 09:18:10 -03:00
Hugo Lazzari
cd35eb4b03 Refactoring code to fix problem where combobox lost event to populate its data. 2013-02-27 14:39:41 -03:00
Markos Calderon
798007de5a Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton 2013-02-26 19:10:30 -05:00
Markos Calderon
429d1e9a31 presenters preview desktopsharing centered 2013-02-26 19:10:05 -05:00
Hugo Lazzari
30e46569c2 Fixed problem where layout list wasn't displayed 
The problem occured because the event to populate the list was sent
before the creation of combobox.
 2013-02-26 15:42:35 -03:00
Richard Alam
85177576b3 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2013-02-26 14:09:34 +00:00
Markos Calderon
fe7ff40fce Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton 2013-02-25 18:36:26 -05:00
Richard Alam
9f14b3c380 Merge branch 'master' of github.com:blindsidenetworks/bigbluebutton 2013-02-25 21:27:45 +00:00
Markos Calderon
47b193ceab change color picker for whiteboard 2013-02-25 15:24:25 -05:00
Richard Alam
8189c61909 - add example on how to get dial number and voice bridge from JS API 2013-02-25 15:14:52 +00:00
Hugo Lazzari
5af05a4bd8 Added title to bbb setting window. 2013-02-25 09:18:49 -03:00
Markos Calderon
3003280227 Added voicebridge and dialnumber to ExternalApiCalls 2013-02-22 15:37:59 -05:00
Hugo Lazzari
36730a5614 new Resources Strings and only show bbb settings button to moderator 2013-02-22 01:47:54 -03:00
Hugo Lazzari
65b75e72ad Add Setting Button and Remember Guest Window 2013-02-22 01:08:21 -03:00
Hugo Lazzari
d095305d69 BugFix 2013-02-21 23:24:46 -03:00
Markos Calderon
5e3a03eaa5 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton 2013-02-20 17:48:45 -05:00
Markos Calderon
6ba6395a47 added font chat size 2013-02-20 17:48:17 -05:00
Richard Alam
e43bebe691 - make sure participants module dispatches events the same as listener's module 2013-02-20 21:42:28 +00:00
Richard Alam
9bfdd8cf0b - use viewers and listeners window for now...we will decide to use the participants module in this release or next 2013-02-20 21:41:10 +00:00
Richard Alam
5469e4eb01 - remove compile warning 2013-02-20 20:51:28 +00:00
Richard Alam
79ed1bdbe9 Merge branch 'master' into unify-users-and-listeners 2013-02-20 19:46:11 +00:00
Richard Alam
dfcf933ad5 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2013-02-20 17:47:36 +00:00
Richard Alam
f616a8e8ef Merge branch 'master' into add-user-custom-properties 2013-02-20 17:37:19 +00:00
Richard Alam
2f52da172c - example how to access user data from JS 2013-02-20 17:36:20 +00:00
Markos Calderon
980c273c56 setting minimum at 1 2013-02-20 12:14:16 -05:00
Richard Alam
2ccf330c08 - add layout for unified users and listeners 2013-02-20 16:11:04 +00:00
Markos Calderon
2b2109eeae fixing js problem 2013-02-20 10:53:32 -05:00
Hugo Lazzari
f0f1094890 Creating new button to choose guest policy 2013-02-20 10:19:28 -03:00
Richard Alam
f166a9489e - trying to figure out why listener and viewers module doesn't display anymore 2013-02-19 22:46:04 +00:00
Markos Calderon
2fc1e219b3 parsing customdata xml 2013-02-19 17:29:08 -05:00
Richard Alam
c24cf55d9c Merge branch 'master' into unify-users-and-listeners 
Conflicts:
	bigbluebutton-client/build.xml
 2013-02-19 21:31:56 +00:00
Chad Pilkey
8702b42def Merge remote branch 'upstream/master' into access-hotfix 
Conflicts:
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/resources/config.xml.template
	bigbluebutton-client/src/BigBlueButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/ShortcutHelpWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/viewers/views/ViewersWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
 2013-02-19 13:45:50 -05:00
Markos Calderon
cc1e40d61c Added user customdata to the client 2013-02-19 12:18:12 -05:00
Hugo Lazzari
b04dadc26a Add new label for accepting all in the meeting. 2013-02-18 08:51:01 -03:00
Hugo Lazzari
868e251fd1 Add an option on the guest window to allow everybody to join 2013-02-15 10:35:36 -02:00
Chad Pilkey
2b521b8351 fixed a different presentation edge case bug that I just discovered 2013-02-14 13:07:24 -05:00
Chad Pilkey
b200482840 forgot to put in bounds checks after a zoom, specifically zoom out 2013-02-13 18:02:57 -05:00
Chad Pilkey
ecaed7318a Reworked the zoom calculation and fixed it, but I think it can be improved more 2013-02-13 15:07:30 -05:00
Richard Alam
37db82c67a - add JS API to query for presenter user id 2013-02-13 17:05:59 +00:00
Richard Alam
b5141883f1 - add sample on how to query the presenter user id 2013-02-13 17:05:05 +00:00
Richard Alam
36e191d3d2 - update BBB JS API 2013-02-14 21:26:08 +00:00
Richard Alam
c871bbd369 - update event name list 2013-02-14 19:58:51 +00:00
Richard Alam
c957be6f4d Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2013-02-12 21:11:24 +00:00
Richard Alam
1c7c4c1dd8 - add JS callback for Webcam Stanalone apps to say that they are ready 2013-02-12 21:09:45 +00:00
Richard Alam
aae6ff77b7 - have the webcam standlaone apps call to the JS shell to inform external JS apps that it is ready 
When the SWF files is loading and starting up, the 3rd-party application maybe sending the SWF apps
   events/commands to start/stop webcam. However, these events may be lost because the SWF file isn't
   yet ready to handle the events.
 2013-02-12 20:48:54 +00:00
Richard Alam
4ae34689dc - set the bbbuser status to not talking when she leaves the voice conference 2013-02-12 20:48:32 +00:00
Richard Alam
744f209bcc Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2013-02-12 20:42:43 +00:00
Chad Pilkey
959c57742a dial-in users get created now and you can't kick dial-in users 2013-02-12 15:17:45 -05:00
Chad Pilkey
915b755762 removing an unneeded file 2013-02-12 12:27:12 -05:00
Richard Alam
2569afb262 Merge branch 'master' into merge-chad-improve-whiteboard-toolbar-pull 2013-02-11 02:01:34 +00:00
Richard Alam
dc24de7743 - change red button to gray and add play icon to the webcam start button 2013-02-11 00:15:40 +00:00
Chad Pilkey
0920742ae9 added in sort to put phone users at the bottom of the list 2013-02-07 17:24:55 -05:00
Chad Pilkey
a847250cb3 updated config template to replace user and listeners with participants 2013-02-07 17:11:57 -05:00
Chad Pilkey
3c25777539 removed the ability to make dial-in users presenter 2013-02-07 17:08:51 -05:00
Richard Alam
a7a85bfd66 - update deskshare jar file 2013-02-07 20:52:52 +00:00
Richard Alam
44084a0825 - update deskshare applet jar 2013-02-07 20:50:02 +00:00
Markos Calderon
d2cc026588 update deskshare jar 2013-02-07 15:49:58 -05:00
Richard Alam
e6fe97db36 Merge branch 'master' into merge-master-into-dynamic-config 2013-02-07 18:53:01 +00:00
Chad Pilkey
7924665c3d the participants module fully works and has been added to the layout manager 2013-02-07 13:50:24 -05:00
Markos Calderon
f9b2600cdc updating jar in order to not show warning message 2013-02-07 13:49:18 -05:00
Chad Pilkey
f486f2f5f1 removed unneeded file 2013-02-07 12:29:26 -05:00
Richard Alam
d1e80464d8 -disable polling module by default 2013-02-05 20:14:22 +00:00
Richard Alam
b6605f3112 Merge branch 'master' into merge-master-into-polling-module 2013-02-05 18:35:00 +00:00
Richard Alam
200817563f - display mic settings when joining voice from the js api 2013-02-05 18:25:41 +00:00
Richard Alam
43cba65f6d Merge branch 'poll-access' into merge-master-into-polling-module 
Conflicts:
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/src/org/bigbluebutton/modules/polling/views/PollingStatsWindow.mxml
 2013-02-05 16:21:54 +00:00
Chad Pilkey
4eb34ad9ca added in listener SO support, it should work, but can't test because vm is broken 2013-02-04 18:34:50 -05:00
Richard Alam
33665fe236 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 
Conflicts:
	README
 2013-02-04 22:42:07 +00:00
jtrobinson
e9f9c671f7 Trying to commit workable (but in no way accessible) Polling Module) 2013-02-04 22:37:42 +00:00
jtrobinson
8ad5bc177d Merge branch 'poll-access' of github.com:capilkey/bigbluebutton into poll-access 2013-02-04 22:05:37 +00:00
jtrobinson
88aabc9bbe Trying to undo merge. 2013-02-04 22:05:04 +00:00
jtrobinson
1079f128f0 Fixed conflicts; merging 2013-02-04 19:51:48 +00:00
Richard Alam
93311e6464 Merge branch 'master' into merge-master-into-polling-module 
Conflicts:
	bigbluebutton-client/build.xml
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/src/BigBlueButton.mxml
 2013-02-04 19:34:23 +00:00
jtrobinson
a3c5a13433 Pulled in upstream changes; now there's a crazy focus bug. Trying to figure that out. 2013-02-04 18:43:27 +00:00
Richard Alam
d5ea1099da - update deskshare applet 2013-02-04 17:09:36 +00:00
Chad Pilkey
56194205d0 clean up file that shouldnt be there 2013-02-02 20:17:52 -05:00
Chad Pilkey
faf63af571 Accesibility mostly finished 2013-02-01 18:06:05 -05:00
Chad Pilkey
875df8ca30 all strings are now localised 2013-02-01 17:51:09 -05:00
Richard Alam
09a7b9e109 - bringing status messages for deskshare standalone into master 2013-02-01 20:09:39 +00:00
Richard Alam
dcecac18f9 Merge branch 'master' into sync-deskshare-that-will-work-with-0.8-with-master 2013-02-01 19:50:19 +00:00
Chad Pilkey
be11b4415b started implementing accessibility 2013-02-01 14:49:51 -05:00