Commit Graph

2897 Commits

Author SHA1 Message Date
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
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
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
Markos Calderon
3003280227 Added voicebridge and dialnumber to ExternalApiCalls 2013-02-22 15:37:59 -05: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
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
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
Richard Alam
7b10ea86a1 - turn off scrollbars 2013-02-01 19:35:26 +00:00
Richard Alam
845c48b056 Merge branch 'master' into listener-does-not-get-displayed-problem 2013-02-01 19:07:38 +00:00
Richard Alam
9a03f4ba71 Merge branch 'master' into style-presentation-upload-window 2013-02-01 19:06:20 +00:00
Richard Alam
66200ea3bc - remove camera names drop down as it's the same as the camera settings button 2013-02-01 19:05:21 +00:00
Richard Alam
77d8df50da - try to figure out why listener doesn't get displayed 2013-02-01 16:35:23 +00:00
Markos Calderon
b4ed805f55 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton 2013-02-01 11:24:16 -05:00
Markos Calderon
ab62b91a55 Merge remote-tracking branch 'bikramac/patch-3' 2013-02-01 10:45:02 -05:00
Markos Calderon
d44e00d51b update size of camera settings 2013-01-31 17:02:10 -05:00
Richard Alam
68d8f96730 - change messages 2013-01-31 21:09:37 +00:00
jtrobinson
ce400043ac Made accessibility descriptions for Viewer and User lists more clear 2013-01-31 20:08:30 +00:00
jtrobinson
9283c38ea0 Finally repaired screen reader/chat box compatibility. 2013-01-31 18:45:31 +00:00
Richard Alam
c16a4636c8 - remove status messages for some events 2013-01-31 17:35:39 +00:00
Richard Alam
cf880ab505 - display status messages on desktop sharing standalone 2013-01-31 17:13:32 +00:00
Richard Alam
9f14252fb3 - use external userID to match voice user. This way, third party apps can use the extern user id on the dialplan when calling from phone. 2013-01-30 23:05:20 +00:00
Markos Calderon
4d27998866 Adding branding for webcam preview 2013-01-30 18:05:02 -05:00
Richard Alam
7bb56a2542 - make the client work with 0.8 (this means that this won't work with master/0.81-dev) 2013-01-30 22:04:09 +00:00
Richard Alam
4975c707e6 Merge branch 'master' into deskshare-aspect-calculated
Conflicts:
	bigbluebutton-client/src/DeskshareStandalone.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/services/DeskshareService.as
2013-01-30 20:23:13 +00:00
Richard Alam
0569e0325e - dispatch event on deskshare connection status 2013-01-30 20:20:46 +00:00
jtrobinson
2c44133c13 Proof-of-concept works for chat message/screen reader compatibility. 2013-01-30 17:41:19 +00:00
Chad Pilkey
6cc5776fa4 started moving all strings to locale file 2013-01-29 18:05:12 -05:00
Richard Alam
278721359e - dispatch event on deskshare connection status 2013-01-29 21:01:52 +00:00
Chad Pilkey
81cd417cec added kick user and improved sort to include name and userid backup tests 2013-01-29 14:46:44 -05:00
Markos Calderon
e3d8f6bf4b Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton 2013-01-28 16:15:20 -05:00
Markos Calderon
db79ff62ab Update build.xml and applet 2013-01-28 16:14:32 -05:00
Chad Pilkey
3868b7be02 Participants Module is working just need to clean it up and add more comments 2013-01-28 16:05:31 -05:00
jtrobinson
e6f38b17a4 Almost done tweaking Chat screen-reader logic to fit new Chat architecture. 2013-01-28 20:57:13 +00:00
Richard Alam
26fd925a5e Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2013-01-28 19:39:06 +00:00
Richard Alam
c2f86af443 Merge branch 'master' into style-presentation-upload-window
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/MicSettings.mxml
2013-01-28 19:38:00 +00:00
Markos Calderon
6389cda5e0 updating deskshare applet 2013-01-28 14:01:29 -05:00
Richard Alam
943feb2b35 - update default BBB style 2013-01-28 18:47:08 +00:00
Markos Calderon
8ae4001b81 Merge branch 'master' into try-fixing-deskshare-red5-context 2013-01-28 12:42:04 -05:00
Richard Alam
26d138af63 - turn off horizontal and vertical scrollbars when viewing webcam 2013-01-28 16:55:50 +00:00
Richard Alam
3b91a08efd - publish deskshare streams in the app context so that context isn't removed when last user disconnects 2013-01-26 21:31:47 +00:00
Richard Alam
a274763f1e - scale desktop sharing properly and remove letter boxing 2013-01-25 18:19:34 +00:00
Chad Pilkey
acb02a4d97 Datagrid 90% works and the control bar seems to function appropriately 2013-01-23 18:29:48 -05:00
Chad Pilkey
46e83c1772 switched the Conference.as method amIPresenter() to a get/set pair so it's now bindable 2013-01-22 14:33:00 -05:00
jfederico
facd1b299f Added javascript to BigBlueButton.html to validate that javascript, java and flash are enabled before loading the client 2013-01-22 13:27:00 -05:00
Chad Pilkey
be2a1895ef Datagrid is half-working and the control bar is half-done 2013-01-22 13:08:38 -05:00
Markos Calderon
ba40fcca6b Updated license for bigbluebutton-client, bbb-video, and demo 2013-01-21 16:14:55 -05:00
jtrobinson
b39bfe50f3 Min/Max buttons in all windows 2013-01-21 16:07:09 +00:00
Richard Alam
d7cb479f44 - show only progress bar when uploading 2013-01-20 17:01:34 +00:00
Richard Alam
4161ededf3 - fix cancel button position 2013-01-20 16:49:23 +00:00
Richard Alam
f1bea8d3c8 - style mic settings 2013-01-20 16:41:05 +00:00
Richard Alam
a511ed47ba - handle delete presentation from file upload windo 2013-01-20 15:08:39 +00:00
Richard Alam
a74f96196f - continue styling file upload window 2013-01-20 14:22:34 +00:00
Richard Alam
cceb6986e7 - style fileupload window 2013-01-21 22:03:11 +00:00
Chad Pilkey
b50f308a87 Participant DataGrid added 2013-01-18 23:33:55 -05:00
Chad Pilkey
3ecaab1ba5 participant window added 2013-01-18 18:00:03 -05:00
Markos Calderon
a2a6ea643a Update bigbluebutton-client/locale/en_US/bbbResources.properties 2013-01-18 16:17:22 -05:00
Richard Alam
0068c60c98 - sync mouse loc - TODO: when both sides of captured region is bigger than scale 2013-01-18 05:15:04 +00:00
Richard Alam
c5511e98ca - try to sync mouse 2013-01-18 03:47:26 +00:00
Chad Pilkey
7bcc71918f added support through config.xml for multiple user whiteboard control 2013-01-17 17:47:05 -05:00
jtrobinson
ccf82d13dc Adding Presentation min/max keys 2013-01-16 19:05:59 +00:00
Chad Pilkey
f1c47c6606 added a check for presenter status 2013-01-16 12:48:53 -05:00
Chad Pilkey
376223fa02 Merge remote branch 'upstream/master' into improve-whiteboard-toolbar 2013-01-16 11:55:06 -05:00
Chad Pilkey
59dbd996d4 moved the whiteboard toolbar over the presentation window and only show it when moused over the window 2013-01-16 11:53:55 -05:00
Richard Alam
8efd3c7b58 - try to fix scaling problem with deskshare 2013-01-15 20:52:41 +00:00
Chad Pilkey
79c7b50c87 removed phatom control bar that shouldnt have existed 2013-01-15 12:21:32 -05:00
Richard Alam
f9fca35577 - add API to tell that SWF is ready for external interface calls 2013-01-14 21:06:49 +00:00
Richard Alam
bc80d55b2a Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2013-01-14 20:29:41 +00:00
Richard Alam
cb3ecd01f3 - add example on how to handle preview and view webcam stream when switching presenter 2013-01-14 20:27:21 +00:00
Richard Alam
1f68306bae - preview or view webcam when switching presenter 2013-01-14 20:26:11 +00:00
Richard Alam
9bcac978e5 Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton 2013-01-14 19:04:19 +00:00
Richard Alam
027dccbb6e - add sample how to query if user is publishing cam or not 2013-01-14 19:03:51 +00:00
Richard Alam
4ab5371e0f - add js api to query if user is publishing cam or not 2013-01-14 19:02:05 +00:00
jtrobinson
877e8d8b5c Minimize and maximize hotkeys added to Users window. 2013-01-14 18:36:55 +00:00
Chad Pilkey
85621c5b4d fix null ref when presenter switches before video control buttons load fully 2013-01-14 12:51:26 -05:00
Richard Alam
bceec77053 - fit broadcasted video to window 2013-01-14 15:38:37 +00:00
Richard Alam
ebd2423adb - don't show playlist toolbar 2013-01-14 15:35:47 +00:00
Richard Alam
8f6ad6d764 - move timestamp to right 2013-01-14 15:35:31 +00:00
Richard Alam
eaa19d3e98 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2013-01-11 22:28:09 +00:00
Richard Alam
4e0d1cf787 - sample calls to show how to use the api 2013-01-11 22:27:18 +00:00
Richard Alam
26e07fabb7 - call js interface when link is clicked on chat 2013-01-11 22:26:05 +00:00
Richard Alam
dac9e2e759 Merge branch 'master' into update-webcam-when-switching-presenter 2013-01-11 21:18:52 +00:00
Richard Alam
2fb52d54ee - style mic settings and file upload windows 2013-01-11 21:18:34 +00:00
Richard Alam
97cb0af1a7 - fix problem where JS API isn't called when user becomes viewer 2013-01-11 20:39:29 +00:00
Richard Alam
15aadde67e - remove BigBlueButton text 2013-01-11 18:24:46 +00:00
Richard Alam
d32ccde274 - provide example on how to use get user info api 2013-01-11 16:59:30 +00:00