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

240 Commits

Author SHA1 Message Date
Chad Pilkey
19fb9b9671 Revert "Revert "Added Java check to the configuration notifications"" 
This reverts commit 82545a03f3.
 2015-01-27 14:19:02 -08:00
Fred Dixon
82545a03f3 Revert "Added Java check to the configuration notifications" 2015-01-27 17:11:54 -05:00
Chad Pilkey
84d6c5e132 added deskshare help information for Chrome users 2015-01-27 13:54:24 -08:00
Chad Pilkey
80e58d1ee3 added java check to the configuration notifications 2015-01-21 11:40:55 -08:00
Chad Pilkey
9be9cca051 added a configuration warning system to the flash client 2015-01-15 16:14:49 -08:00
Richard Alam
3bb8c97f74 - change default chat font size to 12 2015-01-05 20:06:21 +00:00
Chad Pilkey
8b7d0ddb24 font size in config, and two bugs with private chat squashed 2014-12-11 13:16:38 -08:00
Chad Pilkey
acde1ef3ed Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into remove-chat-translation 2014-11-26 09:14:18 -08:00
Chad Pilkey
5cbb059aa6 removed all of the old google translate code in apps and client 2014-11-25 15:17:06 -08:00
Felipe Cecagno
93352a7ea4 make the recording notification alert configurable by the config.xml 
the notification shows up to remind the moderator to click the record button and start the recording
 2014-11-25 17:50:11 -02:00
Chad Pilkey
f78b234d0a Updated defaultLayout to match the localized key 2014-11-12 15:17:16 -05:00
Mateus Dalepiane
cbb4a167bb Merge remote-tracking branch 'origin/new-videodock' into 090-new-videodock 
Conflicts:
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/src/BigBlueButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMapDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/AvatarWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarPopupButton.mxml
 2014-08-26 17:20:00 -03:00
Richard Alam
c56fde0c42 Merge pull request #348 from speakserve/unify-version-number 
Unify version number
 2014-08-13 14:17:45 -04:00
Ghazi Triki
bb09eb6d75 After checking we bumped projects version and Flex locales to 0.9.0 with some fixes 2014-08-13 12:20:10 +01:00
Ghazi Triki
9a794f854a Bumped projects version and Flex locales to 0.9 2014-08-13 10:28:08 +01:00
Fred Dixon
b1c22ad8fd Set autoJoin to true to display audio options on loading 2014-08-12 22:38:25 -04:00
Richard Alam
9244dd19d0 - allow forcing user to join listen only when autoJoin=true 2014-08-10 08:42:11 -07:00
Richard Alam
654c93831e Merge branch 'merge-polling-with-master' into switch-to-sipjs 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
 2014-08-08 13:46:53 -07:00
Chad Pilkey
ac7a688965 swapped jssip for sipjs, cleaned up the webrtc events, changed instances of Rtc to RTC 2014-08-08 13:19:38 -07:00
Richard Alam
64fdb9e2f8 - allow configuring lock settings from config.xml 2014-07-31 09:44:42 -07:00
Ghazi Triki
ac7af7dfea Manually bumped all application version to the correct actual version 0.9.0-dev 2014-07-31 17:42:38 +01:00
Richard Alam
dede32bd63 - turn off polling 2014-07-30 11:22:23 -07:00
Richard Alam
aa92bdf61c - don't show phone dial option by default 2014-07-30 11:21:21 -07:00
Richard Alam
36183d55d2 - remove unused option 2014-07-30 08:38:21 -07: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
Chad Pilkey
893c977ec9 forgot to add the new config property to the template 2014-06-05 14:04:19 -07:00
Richard Alam
19ac02fab2 - enable polling by default 2014-06-02 07:44:46 -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
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
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
Felipe Cecagno
d599307543 commenting out the old video dock module 2014-04-01 15:00:46 -03: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
5c3859aa23 - add echo test for voice 2014-02-24 21:45:00 +00:00
Gustavo Salazar
ea0c763712 Merged with https://github.com/mconf/bigbluebutton/tree/webrtc_support 2014-02-07 16:56:23 -08:00
syeshchenko
4a0a702165 enabled colorpicker 2014-01-30 14:27:54 -08:00
Richard Alam
c4855876c3 - change test java link 2013-10-21 21:50:38 +00:00
Richard Alam
80ba0d6ead - change link so that user is redirected to appropriate localized page 2013-10-21 18:55:41 +00:00
Richard Alam
b07dde529c - add java version required notice in when starting desktop sharing 2013-10-21 18:09:00 +00:00
Richard Alam
c1d30dc72b - add config param to skip camera settings check 2013-09-23 15:24:07 +00:00
Chad Pilkey
ce7040f52d added enableHandRaise and enableSettingsButton as config.xml options for the Users Window 2013-08-23 15:36:49 -07:00
Felipe Cecagno
81e3d93bb7 Merge branch 'master' into global-audio-0.81 
Conflicts:
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/locale/kk_KZ/bbbResources.properties
	bigbluebutton-client/locale/km_KH/bbbResources.properties
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/src/org/bigbluebutton/main/events/ShortcutEvent.as
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MicSettings.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/views/components/ToolbarButton.mxml
 2013-08-21 15:59:33 -03:00
Chad Pilkey
c88b888ae3 enable the logout confirmation again 2013-08-19 14:58:25 -07:00
Fred Dixon
1c50f1cff2 Disable logout window for the moment as its pending UI updates (changed correct parameter :-) 2013-08-16 15:38:41 -07:00
Fred Dixon
d5099639ef Disable logout window for the moment as its pending UI updates 2013-08-16 15:11:45 -07:00
jtrobinson
674195ea71 Config Template contains boolean flag to activate/deactivate logout confirmation (default is true). Also cleaned up remnants of old custom Confirm component. 2013-07-30 08:52:07 -07:00
Markos Calderon
65bc8774f3 Added autoFullScreen in config xml 2013-07-22 19:58:35 -05:00
Hugo Lazzari
37d67f1854 Fixed bugs when listenOnlyMode was false, add new icons depending on listenOnlyMode 
changed joingGlobal to listenOnlyMode
Removed old debug messages
 2013-07-12 11:31:04 -03:00
Hugo Lazzari
46522fc943 Begin the global-audio with bbb 0.81 2013-07-08 10:55:53 -03:00
Felipe Cecagno
371243dbe6 Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton into video-profiles 
Conflicts:
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/src/BigBlueButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/api/ExternalApiCallbacks.as
	bigbluebutton-client/src/org/bigbluebutton/main/api/ExternalApiCalls.as
	bigbluebutton-client/src/org/bigbluebutton/main/views/CameraDisplaySettings.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/VideoWindow.mxml
 2013-06-28 16:09:11 -03:00
Chad Pilkey
b564f7d591 moved the popup windows to the start of the tab order 2013-07-12 13:08:49 -07:00
Chad Pilkey
ce3993a6af added a property keepToolbarVisible to the Whiteboard Module 2013-07-09 09:59:37 -07:00
Chad Pilkey
16fbdd9ab5 added config.xml property to control showing the meeting name in the toolbar 2013-06-10 15:08:30 -07:00
Chad Pilkey
0eef79116e added whiteboardAccess to config.xml template 2013-06-10 08:21:07 -07:00
Richard Alam
2bd9794008 - add option in presentation to open external file uplaod window instead of from within flash 2013-05-19 22:51:08 +00:00
Chad Pilkey
e785e80629 viewers and listeners modules wiped from record 2013-05-14 11:40:21 -07:00
Fred Dixon
bc45788ae2 Added back allowKickUser='true' to config.xml.template 2013-05-11 17:39:40 -04:00
Felipe Cecagno
e5a604bf17 added a new attribute for the PhoneModule definition on config.xml to enable only the presenter to share the microphone - it fits perfectly on the global audio stream feature for webinars; refactored a little the PhoneOptions class to parse the options directly in a single place 2013-05-04 21:35:25 -03:00
Felipe Cecagno
99d6d959f9 Implementation done during the 2nd BigBlueButton Hackfest on April 2013; implemented the concept of video profiles - the sysadmin can specify in a XML file the video profiles that the users will use to broadcast video; it includes width, height, key interval, fps, enableH264 among other parameters; a hack was done to enable the user subscribe to a different profile than the one that is being broadcasted - on the server-side there will be a transcoder component that will handle this kind of subscription 2013-04-28 18:18:17 -04: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
c29e1b9aab added UI changes to layout menu and network monitor 2013-04-16 18:38:11 -05:00
Markos Calderon
0db6cfedb6 make gloweffect configurable 2013-04-04 15:50:12 -05:00
Markos Calderon
1261828a09 added maxFileSize configurable from config.xml 2013-04-02 14:56:11 -05: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
65c28bf90a - minor cleanup 2013-03-19 22:28:28 +00:00
Chad Pilkey
df557b89af changed all internal references to participants to users 2013-03-15 18:53:39 -04: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
Markos Calderon
d6a368f32e change shortcutkeys property name in config.xml 2013-03-07 15:20:27 -05:00
Markos Calderon
b2dd27d56f added showbutton to deskshare module 2013-03-05 10:01:42 -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
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
Markos Calderon
942d2f146a make shortcutKeys button configurable in config.xml 2013-02-28 17:32:44 -05: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
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
Chad Pilkey
a847250cb3 updated config template to replace user and listeners with participants 2013-02-07 17:11:57 -05:00
Richard Alam
d1e80464d8 -disable polling module by default 2013-02-05 20:14:22 +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
Chad Pilkey
493696d1f2 Merge remote branch 'origin/master' into access-hotfix 
Conflicts:
	bigbluebutton-client/resources/config.xml.template
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
 2013-01-10 14:36:57 -05:00
Richard Alam
6303de3007 - extract webcam control icons 2013-01-08 20:04:03 +00:00
Chad Pilkey
6e002d966e Merge remote branch 'origin/master' into access-hotfix 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
 2013-01-08 14:00:46 -05:00
Richard Alam
051c55c37d - modify default config.xml 2013-01-07 15:54:20 +00:00
Felipe Cecagno
b1fa455303 revert some unwanted changes 2013-01-07 13:43:48 -02:00
Hugo Lazzari
d8eaaba91e New template to global audio 2013-01-07 10:05:14 -02:00
Chad Pilkey
b3a6e1e552 Merge remote branch 'upstream/master' into access-hotfix 
Conflicts:
	bigbluebutton-client/resources/config.xml.template
	bigbluebutton-client/src/BigBlueButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/SlideView.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/PublishWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videodock/views/VideoDock.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/ClearButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/LineButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/PanZoomButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/RectangleButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/ScribbleButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/TextButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/buttons/UndoButton.mxml
 2013-01-04 14:03:39 -05:00
Richard Alam
6b95383957 - handle response when saving note 2013-01-03 20:44:32 +00:00
Richard Alam
6b36e0011a - build BBB default style 2012-12-28 17:32:14 +00:00
Richard Alam
3418876adc - add options in config template 2012-12-24 19:42:50 +00:00
Richard Alam
cbcd54cd7b - update broadcast module to work on master 2012-12-21 20:34:33 +00:00
Richard Alam
f80fcfbc46 - provide absolute url where to load the skin swf file 2012-12-18 20:57:56 +00:00
Chad Pilkey
02b222625f Merge branch 'master' into access-hotfix 
Conflicts:
	bigbluebutton-client/resources/config.xml.template
	bigbluebutton-client/src/BigBlueButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/model/VideoConfOptions.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/PublishWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/VideoWindow.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/videodock/views/VideoDock.mxml
 2012-12-17 15:29:49 -05:00
Richard Alam
1ab06e37b3 - try skinning 2012-12-17 20:06:12 +00:00
Richard Alam
50aa8dfd24 - add option to enable displaying of avatar 2012-12-04 19:09:45 +00:00
jtrobinson
41b59d6e92 Fixed mistake in config.xml.template, updated README 2012-11-23 18:25:33 +00:00
jtrobinson
b6617ac58b Deskshare and webcam publishing included in tab order. Some tweaking required. 2012-11-22 21:43:31 +00:00
jtrobinson
4c13b70a7b Remember to use the baseTabIndex values in config.xml.template for tab order to work 2012-11-20 16:53:45 +00:00
Richard Alam
c85ae5b760 - add options in config.xml to display the webcam controls 2012-11-01 17:46:43 +00:00