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

1261 Commits

Author SHA1 Message Date
Richard Alam
4c6d21b5d4 - add missing import 2011-05-04 11:04:46 -04:00
Richard Alam
e7bbf63484 Merge branch 'master' into record-and-playback-feature 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
 2011-05-03 14:50:37 -04:00
Richard Alam
381d89b5d0 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 
Conflicts:
	bigbluebutton-client/.actionScriptProperties
	bigbluebutton-client/.flexProperties
 2011-05-03 14:47:15 -04:00
deniszgonjanin
5e41c46ea6 Added Settings Module to build.xml 2011-04-22 23:05:08 +00:00
deniszgonjanin
fa6f72c137 Settings Panel will automatically appear at startup when visiting BBB for the fist time. 2011-04-22 22:56:13 +00:00
deniszgonjanin
2eb68cab20 Localization strings for the Settings Panel 2011-04-22 22:48:45 +00:00
deniszgonjanin
cb4508c691 Fixing devbuild breakage 2011-04-22 22:17:49 +00:00
deniszgonjanin
82bece4399 Bug fixes for the Settings Panel 2011-04-22 21:14:34 +00:00
deniszgonjanin
db26b8f5ee More improvements to the Settings Module 2011-04-22 20:14:15 +00:00
deniszgonjanin
44e33cca9d Improvements to the Settings Panel 2011-04-22 20:01:51 +00: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
deniszgonjanin
e2b60b7c9c Fixed default language in the language selector to english 2011-04-27 13:32:46 +00:00
BigBlueButton
2433c7fa9b Fixed video resizing bug 2011-04-22 18:44:42 +00:00
@deniszgonjanin
8b1f180a1d Serbian (Latin) and Croatian translations 2011-04-21 14:46:21 -04:00
deniszgonjanin
e837658274 Some refactoring of the video window layout code 2011-04-18 20:37:17 +00:00
deniszgonjanin
5c8ae8c9bb Fixes Issue 913 2011-04-18 14:43:10 +00:00
deniszgonjanin
fd79897931 Fixed localization selector bug 2011-04-18 14:30:36 +00:00
@deniszgonjanin
c07478c39e Serbian translation 2011-04-17 17:57:51 -04:00
@deniszgonjanin
3f170220ca I made a noob 2011-04-16 20:23:32 -04:00
deniszgonjanin
86a1797e1f Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-04-16 21:55:06 +00:00
deniszgonjanin
fb93a87d8e Loading of webcam preferences from the settings saved using the bbb-checklist 2011-04-16 21:53:54 +00:00
@deniszgonjanin
431de9a48f Changed size of combo boxes 2011-04-16 15:26:24 -04:00
Felipe Cecagno
1abb71da67 Merge branch 'bbb-master' 2011-04-14 13:25:57 +00:00
deniszgonjanin
47c2173113 Locale strings for the logout window 2011-04-12 21:43:00 +00:00
BigBlueButton
4db0ee6cf3 Fixed disconnect bug. 2011-04-12 20:08:31 +00:00
deniszgonjanin
c6aa0fcf7e Disabled automatic reconnect 2011-04-06 12:22:41 +00:00
Richard Alam
28b5f9f138 - merge in changes from HEAD 2011-04-04 11:10:10 -04:00
Richard Alam
c2fd6f6c20 - add back lines where we need to generate unique filenames for webcam streams 2011-04-14 15:02:44 -04:00
Richard Alam
f8de22e00b - fix merge conflict with video publish 2011-04-14 11:28:56 -04:00
Richard Alam
19694d87e0 Merge branch 'master' into record-and-playback-feature 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/presentation/PresentationHandler.java
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/PublishWindow.mxml
 2011-04-04 11:15:09 -04:00
Richard Alam
a3640e6f87 - add record status events in the client 2011-03-30 14:33:00 -04:00
Marco Calderon
49df7affdc update zn_TW locale 2011-03-23 15:42:08 +00:00
Marco Calderon
4af0c95285 update polish locale 2011-03-23 15:07:31 +00:00
@deniszgonjanin
e60bf5aa23 Fixed Issue 882. Also another issue where the whiteboard sometimes goes stupid and draws everything from the top left corner of the screen. 2011-03-29 02:39:56 -04:00
@deniszgonjanin
85ae75ee5f Changed javascript file initialization so they work better in sandbox mode 2011-03-27 21:45:29 -04:00
deniszgonjanin
c0d9b16c91 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-03-27 21:45:55 +00:00
deniszgonjanin
46eb5c7dc7 Cleaned up HTML template of the client. Moved all javascript functionality to external java script files 2011-03-27 21:45:08 +00:00
Richard Alam
4e55a6e157 - notify client on the status of deskshare recording 
- this should just display alert boxes for now. we need to figure out the best way
   to display record status that will also be used for voice, video, and events (chat, presentation, whiteboard, etc.)
 2011-03-29 15:28:59 -04:00
Richard Alam
92c0af9f49 - remove LIVE|RECORD mode as we are not using it 2011-03-22 10:23:32 -04:00
Richard Alam
9c6b27fb5f Merge branch 'master' into record-and-playback-feature 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
 2011-03-18 15:43:39 -04:00
Richard Alam
ab2f359a53 - format video stream name into <meetingid>-<userid>-<timestamp> so that we can easily 
identify and parse the video recordings
 2011-03-15 15:36:32 -04:00
Felipe Cecagno
6f76f07b42 starting to implement the window layouts - the small videos layout is fully implemented 2011-03-15 16:24:41 +00:00
Felipe Cecagno
bcbb108536 some other improvements on the resize window feature. still blinking sometimes 2011-03-10 18:13:54 +00:00
Fred Dixon
e1d9783db7 Recompiled bbb-deskshare-applet-0.71.jar with JDK 1.5 to work on Mac OS 10.5.6 under Firefox 2011-03-07 20:45:00 -05:00
Marco Calderon
e9c996be77 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2011-03-07 11:03:26 +00:00
Felipe Cecagno
d15f6b270c some other improvements on the resize window feature. still blinking sometimes 2011-03-07 09:13:31 +00:00
Felipe Cecagno
1c389f01d3 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-07 09:13:31 +00:00
Marco Calderon
01a5490421 added korean and update dutch locale 2011-03-07 03:45:42 +00:00
Marco Calderon
0b82f712eb - [ignore] deleting wrong files 2011-03-06 07:40:35 +00:00