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
Felipe Cecagno
1650c566f8
moving the notes.jsp application from /demo/notes.jsp to /bigbluebutton/notes.jsp
2012-10-30 10:11:28 -02:00
Felipe Cecagno
9bed70952c
added an option to hide the notes button on toolbar; hide the close button on the shared notes window
2012-10-29 15:59:18 -02:00
Richard Alam
969b8a3ab3
- make toolbar and footer visibilty configurable. The toolbar and footer can be hidden by
...
setting showToolbar="true" showFooter="true" to "false"
2012-10-22 17:10:20 +00:00
Fred Dixon
af96609e86
Set use h.264 video to true. We may revert this to false in the future
2012-10-22 10:42:23 -04:00
Felipe Cecagno
2cd83eb0e6
Merge commit 'v0.8' into sharedNotes
2012-10-17 14:59:32 -03:00
Richard Alam
a71069017f
- make layoutUrl option full URL
2012-10-02 20:22:12 +00:00
Richard Alam
8ac96a7a3c
- change config.xml template to have full URL of SWF files
2012-09-12 15:33:03 +00:00
Gustavo Salazar
e404da9614
Disable h264 by default.
2012-08-27 18:08:29 -05:00
tdj-br
3a0552a2b6
Changed the template of config file.
2012-08-22 10:18:40 +00:00
Gustavo Salazar
7735ff6d62
build client for Flash Player 11
2012-07-31 17:49:09 -05:00
Richard Alam
1d4ee2862c
Merge branch 'layout-module'
2012-07-06 15:03:49 +00:00
Richard Alam
17bba97d40
- add catalan locale
...
- update version to 0.8
2012-06-18 12:56:30 +00:00
Felipe Cecagno
85aa046010
added an attribute to the layout module to show or hide the module control buttons (add, save and load)
2012-06-15 14:43:18 -03:00
Felipe Cecagno
e2d99acbb0
it still needs some refactoring, but it's working fine; this is the client side of the layout module which interacts with the server in order to (un)lock the windows layout
2012-06-15 11:45:14 -03:00
Felipe Cecagno
f0214fa580
implements the very first prototype of the layout module; the admin put the layout definitions in a XML file, and the user may apply the layouts independently; the users also can extract the current layout to add directly to the xml file with the layout definitions
2012-05-22 23:13:12 -03:00
Felipe Cecagno
ddea57467d
little adjustment on config template
2012-03-23 18:21:18 -03:00
Felipe Cecagno
f31a26bcf3
fixing the default layout - when the screen is big, the default position of the videodock is just below the chat window; also the three window position on the left has been improved
...
there are some modifications related specifically to the shared notes module, but the core of the implementation is generic and could be patched to upstream
2012-03-13 16:33:07 -03:00
firstuser
ff493885c9
Merge branch 'master' into sharedNotes0.8
2012-03-12 12:26:54 -03:00
Richard Alam
be76c7d8ab
- update locale to 0.8-beta4
2012-03-01 19:15:31 +00:00
Felipe Cecagno
334ed6db81
Merge branch 'master' into sharedNotes0.8
...
Conflicts:
bigbluebutton-apps/build.gradle
bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-apps.xml
bigbluebutton-client/build.xml
bigbluebutton-client/html-template/index.template.html
bigbluebutton-client/html-template/sharednotes/diff_match_patch_uncompressed.js
bigbluebutton-client/locale/en_US/bbbResources.properties
bigbluebutton-client/resources/config.xml.template
bigbluebutton-client/resources/prod/BigBlueButton.html
bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/infrastructure/ServerConnection.as
2012-02-17 14:04:31 -02:00
Fred Dixon
2e458d147d
Tweaked the settings for VideoconfModule to slightly improve quality video. Bandwidth of video will take on aberage 50 KiB/S
2012-02-12 12:26:20 -05:00
Richard Alam
3d8722d504
- allow to configure to show presentation window controls or not
2012-01-25 22:05:50 +00:00
Fred Dixon
6aa2fe652b
Enable auto join audio by default
2012-01-15 14:26:16 -05:00
Richard Alam
140d9a566c
provide way to add window on bottom-3rd-lower-right
2011-11-22 13:25:41 -05:00
Richard Alam
2f421059bb
add option to not show close button for camera view window
2011-11-15 18:23:56 -05:00
Richard Alam
2acd95b677
Merge branch 'master' into hangout-style
2011-11-09 10:08:11 -05:00
Felipe Cecagno
9e5611c9ab
added the parameter oneAlwaysBigger to videodock module on config.xml. if oneAlwaysBigger is true, one window will always be bigger on videodock layout
2011-11-08 21:15:16 -02:00
Richard Alam
5ff8bd24ab
Merge branch 'hangout-style'
2011-11-08 12:55:48 -05:00
Richard Alam
fe70b2fef3
- add option to autostart dekstop sharing
2011-11-04 14:43:00 -04:00
Felipe Cecagno
003b612399
added a layout parameter for the video dock on config.xml; the layouts could be none (no action on click), smart (better adjustment positioning the big window on the top or on the right side) or hangout (the big window will always be on top)
2011-11-03 22:37:26 -02:00
Richard Alam
54ca0a5bfd
- change name of showing log button option
2011-11-02 14:18:40 -04:00
Richard Alam
60577df2b1
- redirect properly to logout url when logout window is not shown
2011-11-02 10:59:29 -04:00
Richard Alam
e07efebabc
initialize config.xml position for chat and video dock
2011-10-22 14:30:45 -04:00
Richard Alam
6cd4b502e7
make enabling acoustic echo cancel configurable
2011-10-17 13:59:48 -07:00
Richard Alam
f524cfda17
- change locale version 0.8-beta2
2011-10-02 13:53:24 -07:00
Richard Alam
4b7c6645c9
- set default quality to 50
2011-09-29 23:35:38 -07:00
Richard Alam
5d6d4cf87b
Merge branch 'set-option-for-voice'
2011-10-06 01:57:07 -04:00
Fred Dixon
3b3764cd34
Set defaults in config.xml for showDebugWindow=false, showVideoLayout=false, showResetLayout=true
2011-10-06 13:25:14 -07:00
Richard Alam
d9eabb813a
make checking of audio configurable
2011-10-06 01:56:10 -04:00
Richard Alam
42cd903342
missing showHelpButton on template
2011-10-05 18:37:50 -04:00
Richard Alam
bfa964c821
Enable videodock module
2011-10-04 21:45:13 -04:00
Richard Alam
43c487c5cd
Add parameter to maximize video dock window. If publish window is not visible, don't
...
dock it.
2011-09-28 19:37:52 -04:00
Richard Alam
99d80a97a9
Merge branch 'master' into make-presenter-cam-larger
2011-09-28 14:45:16 -04:00
Richard Alam
7bab790a0c
- Allow to configure not to dock presenter webcam.
...
- Provide ability to configure window dim for video docking
- Allow to configure to show present window
- Presenter docking does not handle switch present well.
2011-09-28 14:40:55 -04:00
Fred Dixon
d2bbede932
Turned autoJoin to false to trigger the audio pre-flight checklist
2011-09-27 13:40:38 -07:00
Fred Dixon
f0de2ff7a7
Changed default resolution to 320x240
2011-09-23 20:22:08 -07:00
Felipe Cecagno
2e76e21181
notes playback is disabled by default
2011-09-21 07:30:20 +00:00
Felipe Cecagno
8b9fedfa60
Merge branch 'sharedNotes' into sharedNotes-updated
2011-10-10 19:06:51 +00:00
Felipe Cecagno
e40bc25bb9
merging with sharedNotes
2011-10-07 11:14:58 +00:00
Felipe Cecagno
88c33838aa
cleaning some code
2011-09-21 06:13:17 +00:00
Felipe Cecagno
50b1d6674a
updating the module in order to remove the frequent query for modifications on the server - now it only query the server when it receives a signal from a remote shared object; fixed the problem with the hash calculation when the text contains special caracters like é; also, it is using now custom events to better manage the current state
2011-09-20 21:01:15 +00:00
Richard Alam
11e08ebde2
Merge video docking module from mconf. There are minor bugs which may be due
...
to using Flex 4.5
2011-09-19 16:40:18 -04:00
Felipe Cecagno
7390c477f8
Merge branch 'sharedNotes' into sharedNotes-updated
...
Conflicts:
bigbluebutton-client/build.xml
bigbluebutton-client/resources/prod/BigBlueButton.html
2011-09-19 15:56:04 -03:00
firstuser
d8472cca45
- set cam quality to 100. 50 resulted in pixelated video.
2011-09-13 11:03:58 -04:00
Fred Dixon
4209762e5e
Don't maximize viewer's window by default
2011-09-07 18:46:29 -07:00
Richard Alam
00ee3f3f56
- putting viewer window in middle maximizes window for viewing cam
2011-09-06 11:50:13 -04:00
Fred Dixon
b614a732bb
Turned off the settings module by default to test
2011-09-04 16:48:25 -07:00
Fred Dixon
0f5e092b99
Set autoJoin=true in config.xml to auto join the voice conference
2011-08-08 08:09:07 -07:00
Richard Alam
3d86d5d39c
- add more configurable options for webcam
2011-07-28 20:11:11 +00:00
Richard Alam
310b51184c
- add option to position webcam viewer window
2011-07-27 20:36:04 +00:00
Richard Alam
c6867b940b
- add option in config.xml to not display prompt when logging out
2011-07-21 11:22:48 -04:00
Richard Alam
d989e96295
- show toolbar by default
2011-07-19 17:08:10 -04:00
Richard Alam
0a8ac376fe
- add config property to show/hide toolbar
2011-07-18 14:00:41 -04:00
Richard Alam
192b54d978
- fix wrong attributes in config.xml tempalte
2011-07-14 14:56:09 -04:00
Richard Alam
6ec4c04ce7
- change config.xml template to have the new options
2011-07-14 14:07:38 -04:00
Richard Alam
cd479689a6
- cleanup
...
- add parameter to hide viewer and listeners windows. Need to make thsi more flexible later on.
2011-07-13 18:15:39 -04:00
Richard Alam
d250710b28
- use e4x to manage config
...
- make enabling private chat configurable. SO now, in the chat module, you can change "privateEnabled=true" to "privateEnabled=false".
2011-07-13 16:41:05 -04:00
deniszgonjanin
09e64093b9
Fixed config.xml.template, xml was malformed
2011-04-27 15:55:14 +00:00
deniszgonjanin
f0f3f939e8
Settings Module, initial commit. The Settings Module is based on the BBB-Checklist. It just runs as a BBB module instead, to let the user adjust their settings from within BigBlueButton.
2011-04-27 14:59:13 +00:00
Marco Calderon
d225ff4d44
Merge remote branch 'mconf/master'
2011-03-10 10:03:15 +00:00
deniszgonjanin
cb4508c691
Fixing devbuild breakage
2011-04-22 22:17:49 +00:00
deniszgonjanin
44e33cca9d
Improvements to the Settings Panel
2011-04-22 20:01:51 +00:00
@deniszgonjanin
46eae2e4ec
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
2011-03-04 17:36:10 -05:00
@deniszgonjanin
4fe35444e9
Added a Push To Talk button for the Classroom Audio Module
2011-03-04 17:35:30 -05:00
deniszgonjanin
63cb08fbd6
Added ClassAudioModule to build.xml and config.xml.template
2011-03-04 21:37:46 +00:00
Felipe Cecagno
859176db78
resolutions are configurated by the config.xml; removed the close button from PublishWindow; implemented the maximize and restore; corrected the implementation of resizing; the implementation of maximize, restore and resize is exactly the same for both PublishWindow and VideoWindow
2011-03-03 23:30:51 +00:00
deniszgonjanin
c130105b2c
SharedNotesModule task to the build.xml script
2011-02-13 19:19:13 +00:00
@deniszgonjanin
f89efce2ae
A working version of the notes module. Disabled by default
2011-01-29 02:08:47 -05:00
@deniszgonjanin
941882409e
Added optional warning suppresion for locale version check
2011-01-29 01:33:59 -05:00
@deniszgonjanin
d5e4813aff
Improvements to the branding ant tasks
2010-12-24 04:20:26 +00:00
Richard Alam
36cd4d25a7
- allow to pass autoJoin param in config.xml to auto join voice conference
2010-11-23 16:39:08 -05:00
Fred Dixon
3a181428df
- Noticed revently that some webcams were not successfully opening on other computers ... lowering the quality just a bit
2010-11-09 21:52:13 -05:00
Fred Dixon
cc9ccd4121
- Changed AllowKickUsers default to false as its better enabled by the administrator when configuring their BigBlueButton site
2010-11-07 18:30:00 -05:00
Richard Alam
ccce72a9b2
- upgrade checking of locales to 0.71
2010-11-03 13:49:11 -04:00
deniszgonjanin
e112bb8dc0
Fixed Issue 643 - Add Copy All Text option to Chat
2010-10-13 17:55:49 +00:00
deniszgonjanin
49144fc49f
Changes to the default config.xml to allow kicking users by default by the moderator, for both viewers and listeners
2010-10-12 02:03:31 +00:00
deniszgonjanin
714fa10277
Fix for Issue 404
2010-09-28 10:39:00 +00:00
deniszgonjanin
a673c32ce4
Externalized salt of BreakoutModule to config.xml
2010-08-31 21:39:59 +00:00
deniszgonjanin
8247a3bb4e
Breakout Module, Initial commit
2010-08-31 19:03:44 +00:00
deniszgonjanin
57f65bfe56
Created an option for the presenter to be able to share webcams only
2010-08-27 17:27:02 +00:00
deniszgonjanin
5fb93ad802
Made video quality configurable through the config.xml file
2010-08-26 17:49:01 +00:00
deniszgonjanin
d2ef6a8a33
Bulgarian Translation
2010-08-26 17:19:16 +00:00
deniszgonjanin
0194d07059
Branding for bbb-client. Initial Commit
2010-08-24 19:36:29 +00:00
deniszgonjanin
1611d8beda
A language selector for dynamically changing languages
2010-08-13 23:57:48 +00:00
deniszgonjanin
64b039b23d
Deleting unused files. Fixing ExampleChatModule to work with 0.71
2010-08-13 16:03:09 +00:00
deniszgonjanin
2afa932c0f
New module loading progress indicator
2010-08-10 14:56:10 +00:00
Richard Alam
85bd331537
- make config.xml.template use proper URL instead of join-mock.xml by default
2010-08-05 07:28:55 -04:00
deniszgonjanin
04ea34cf7b
Added options to config.xml for automatic translation in the Chat Module
2010-08-04 22:13:54 +00:00
deniszgonjanin
646e34c081
Made the kick user functionality optional. Now configurable in the config.xml
2010-08-04 20:42:14 +00:00
deniszgonjanin
64eec98d51
Refactoring bbb-client Main to not have dependancies on any other modules
2010-07-30 15:55:51 +00:00
deniszgonjanin
4ce8093924
Renamed HighlighterModule to WhiteboardModule to match the server code and avoid confusion
2010-07-17 20:05:57 +00:00
BigBlueButton
1e6eff084b
- Removed bbb-web scheduler
...
- Merged the enter and signout function into the api controller
2010-07-19 19:15:01 +00:00
deniszgonjanin
0ea1e0886c
New config.template.xml
2010-07-16 17:36:09 +00:00
Richard Alam
45e8e4aff8
- move up one folder as it is common for dev and prod
2010-07-04 11:35:35 -04:00