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
15b864c2c6 - cleanup 2010-11-01 14:25:45 -04:00
Richard Alam
c827327293 - don't translate when traslation flag is off 2010-11-01 12:51:33 -04:00
Richard Alam
e300c02c76 - change color of translated text 2010-11-01 12:35:59 -04:00
Richard Alam
ec6a85c0d6 - make sure that the chat messages are displayed correctly and not repeat displaying messages over again 2010-11-01 11:02:21 -04:00
Richard Alam
25f77eb9e3 - cleanup 2010-10-29 17:21:58 -04:00
Richard Alam
5e448095ba - extract translation and chat message into a class 2010-10-29 17:08:32 -04:00
Richard Alam
c8d7e668bd - put config in a class so that it will be accessible by other modules 2010-10-29 14:26:15 -04:00
Richard Alam
377fb72051 - cleanup 2010-10-29 11:42:39 -04:00
Richard Alam
425156c817 - do not enable close button until the preview window start streaming. On slow connections, the 
user may think nothing is happening and closes the window pre-maturely.
 2010-10-28 13:50:46 -04:00
Richard Alam
d79e4469e5 - do not scale video in preview window when sharing a smaller region than preview window 2010-10-28 11:46:55 -04:00
Richard Alam
4e0cc87e95 - make sure correct tooltip gets displayed...not the code to display it. 2010-10-28 10:47:06 -04:00
Richard Alam
4c7b055dc5 - convert trace to log 2010-10-27 14:32:31 -04:00
deniszgonjanin
41ad02f39b Commited updated spanish localization 2010-10-20 21:10:58 +00:00
Richard Alam
c8c45c7911 - make the translated boolean part of the message not part of the renderer because when the message 
scrolls up and a new message occupies the old renderer, the message doesn't get translated
 2010-10-20 11:39:46 -04:00
deniszgonjanin
d5e0ac2052 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2010-10-19 15:05:29 +00:00
deniszgonjanin
8a3e864db7 More 0.71 localizations 2010-10-19 15:05:06 +00:00
Richard Alam
f4c9fa3a7c - detect if user has old locale version and warn 2010-10-19 08:06:54 -04:00
deniszgonjanin
e7bf2f4e06 Updated localizations for 0.71 2010-10-18 18:26:28 +00:00
Richard Alam
22d2d638f5 - handle end meeting call from server 2010-10-18 13:51:39 -04:00
deniszgonjanin
a854dc071f Fixed chat issues 2010-10-18 17:09:36 +00:00
deniszgonjanin
b14ba3fa52 Fix for Issue 655 2010-10-17 23:18:26 +00:00
deniszgonjanin
83493e4523 Forgot to delete some test data from a previous commit 2010-10-17 23:00:13 +00:00
deniszgonjanin
5c21b039a0 Fix for Issue 662 2010-10-17 22:56:01 +00:00
deniszgonjanin
76366ca5f0 Fix for issues with the chat in 0.71 2010-10-17 22:50:00 +00:00
Richard Alam
f3d802fb57 - provide a way to autostart deskshare 2010-10-15 14:54:12 -04:00
Richard Alam
5a1099b46a - ooops...missed the declaration 2010-10-14 19:47:50 -04:00
Richard Alam
078212362a - dispatch event when all modules have been loaded 2010-10-14 17:32:18 -04:00
Richard Alam
9916fc63dd - cleanup logs 2010-10-14 16:31:49 -04:00
deniszgonjanin
be1d83dc02 Minor chat issue fix 2010-10-13 18:41:29 +00:00
deniszgonjanin
56688a6653 Fixed Issue 645 - Not auto-translating to Portugese (Brazil) 2010-10-13 18:29:00 +00:00
deniszgonjanin
e112bb8dc0 Fixed Issue 643 - Add Copy All Text option to Chat 2010-10-13 17:55:49 +00:00
deniszgonjanin
c5f993a2c4 Cleaning up the localization template of unused strings so that people don't have to translate them 2010-10-13 17:16:58 +00:00
deniszgonjanin
91cf4d607c Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2010-10-13 12:58:08 +00:00
deniszgonjanin
3990d3237b Localization strings. Fix issue with buttons on viewers and listeners window not being visible on low resolutions 2010-10-13 12:55:37 +00:00
Richard Alam
5e185717b0 - seems like sending by row is faster 2010-10-12 21:05:20 -04:00
Richard Alam
f41167c044 - send all changed blocks together 2010-10-12 20:47:08 -04:00
Richard Alam
8d8f81b1a8 - send changed blocks one row at a time 2010-10-12 20:29:23 -04:00
Richard Alam
ac86a3ebb6 - combine all blocks that has changed on a capture cycle into one packet 2010-10-12 17:52:56 -04:00
Richard Alam
b7865a2073 - init sequence number to zero 2010-10-12 14:46:01 -04:00
Richard Alam
2fcb99d94f Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2010-10-12 14:39:33 -04:00
Richard Alam
cc53a33aa7 - add sequence numbers to messages from deskshare applet to the server. This allows us to drop 
late block changes.
 2010-10-12 14:24:01 -04: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
d39bfed5dc Minor UI tweeks to bbb-client for 0.71 2010-10-12 01:49:33 +00:00
deniszgonjanin
230de72008 Changes to UI of the Listeners Window 2010-10-12 01:37:35 +00:00
deniszgonjanin
a56af89471 UI changes to the Viewers Window, for the kick button 2010-10-12 00:52:32 +00:00
deniszgonjanin
cea8c1ca4f Fix for client issues tagged for 0.71 2010-10-11 23:04:14 +00:00
Richard Alam
54ea5e4f8a - modify logic so that we don't unnecessarily compute if the block has changed if it's already 
dirty and wating to be sent to the server.
 2010-10-10 12:28:55 -04:00
Richard Alam
519a287cd5 - fix problem where blocks don't get updated when moving the capture region 2010-10-10 12:05:06 -04:00
Richard Alam
9b59058b1b Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2010-10-10 09:24:59 -04:00
Richard Alam
6ce70eb011 - localize video publish strings 2010-10-10 09:24:14 -04:00
Richard Alam
77b15e25ba - localize deskshare strings 2010-10-10 09:19:34 -04:00
deniszgonjanin
f354ac6919 Fix for several small client side bugs 2010-10-09 22:44:26 +00:00
Richard Alam
b7bc30ab9b - don't display mouse cursor outside of window 2010-10-07 13:38:03 -04:00
Richard Alam
cd039d3a3e - synch setting of the flag so that new screen caps are propagated properly 2010-10-07 11:37:24 -04:00
Richard Alam
87afee0d46 - revert back eject listener icon 2010-10-07 10:02:13 -04:00
Richard Alam
7905aad860 - create new location...there should be a better way to do this but need to do it quickly 2010-10-07 08:52:49 -04:00
Richard Alam
4bad11b581 - center dekshsare publish window 2010-10-07 08:48:12 -04:00
Richard Alam
e2a169c041 - remove tray icon when stopping deskshare 2010-10-06 12:02:45 -04:00
Richard Alam
3491c2851d - when publishing video, replace bottom control bar with quit button 2010-10-05 15:05:19 -04:00
Richard Alam
83c540aed4 - hide close button when displaying fullscreen and region button 
- put region and fullscreen on oppsite end of toolbar
 2010-10-05 13:23:47 -04:00
Richard Alam
2fb57a1879 - remove frame when stopping desktop sharing 2010-09-30 22:47:18 -04:00
Richard Alam
23e124ac50 - remove full screen icon 2010-09-30 22:03:51 -04:00
Richard Alam
5e752b3831 - change eject icon 2010-09-30 21:55:56 -04:00
Richard Alam
1501220806 - fix http://code.google.com/p/bigbluebutton/issues/detail?id=632 2010-09-30 21:55:23 -04:00
Richard Alam
7fcc2937da - center capture region when starting 2010-09-30 21:22:28 -04:00
Richard Alam
f3209f6514 - remove start button when sharing. Users will now have to quit from the client until we figure out the 
best way to start/stop sharing.
 2010-09-30 15:12:36 -04:00
Richard Alam
b36c6b2c76 - try a 32x32 block encoding 2010-09-30 12:27:39 -04:00
Richard Alam
e4bfa81df7 - add applet that autoscales to 1280 width if sharing full screen 2010-09-30 11:29:31 -04:00
Richard Alam
3a877a3270 - update applet and cleanup 2010-09-30 10:34:55 -04:00
Richard Alam
4e423e7ce4 - merge in deskstop sharing refactoring 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/model/ConfigParameters.as
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
 2010-09-30 10:28:42 -04:00
Richard Alam
a73bcd4faa - start/stop deskshare properly 2010-09-30 10:21:35 -04:00
deniszgonjanin
0e75b61cf6 Cleanup of some redundant code on the client 2010-09-29 19:12:34 +00:00
deniszgonjanin
7d09c626e8 Fix for first user not automatically becoming presenter 2010-09-29 19:03:00 +00:00
deniszgonjanin
4dd966e8f7 Fix for chat not recognizing unique userid correctly 2010-09-29 18:51:55 +00:00
Richard Alam
69062b4e4d - viewer now starts and stop properly 2010-09-29 13:46:21 -04:00
Richard Alam
afaf5847b1 publish window now opens and close properly 2010-09-29 13:37:01 -04:00
Richard Alam
92ad5794cb - break down DeskshareManager to make it simpler 2010-09-29 13:13:05 -04:00
Richard Alam
6836e5e8e6 - create new event for app version 2010-09-29 10:23:30 -04:00
Richard Alam
43406c798a - change the version to the build version 2010-09-29 10:13:56 -04:00
Richard Alam
665b0069ff - fix parameters for starting the applet 2010-09-28 16:01:53 -04:00
Richard Alam
99376a3dfe - cleanup 2010-09-28 15:52:39 -04:00
Richard Alam
48e2e74239 - modify template to use fullscreen param 2010-09-28 15:17:19 -04:00
Richard Alam
dc7b2de3f2 - start/stop desktop sharing from withing bbb client 2010-09-28 15:10:35 -04:00
Richard Alam
c28bbc7310 - change parameter to accept fullscreen 2010-09-28 13:53:40 -04:00
Richard Alam
cdad4d25bf - modify parameter to use fullscreen or not when starting desktop shairng 2010-09-28 12:59:50 -04:00
Richard Alam
f07b55dee5 - applet that changes border from red to blue when capturing 2010-09-28 08:39:41 -04:00
deniszgonjanin
6f7ae1e5d3 Fixed Issue 608 2010-09-28 11:15:04 +00:00
deniszgonjanin
714fa10277 Fix for Issue 404 2010-09-28 10:39:00 +00:00
deniszgonjanin
173e56bee8 Attempted fix for Issue 42 - Client should reconnect automatically when the connection drops 2010-09-28 09:44:14 +00:00
deniszgonjanin
155791a826 A more robust solution for Issue 615 2010-09-28 06:57:56 +00:00
deniszgonjanin
8f17241607 Changed the eject icon for the Listeners Window to a more appropriate one 2010-09-28 05:28:14 +00:00
deniszgonjanin
efd378f403 Fix for a participant being able to join the voice conference multiple times 2010-09-28 05:21:45 +00:00
deniszgonjanin
a04bb4ca33 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2010-09-28 04:45:49 +00:00
deniszgonjanin
77a11c9004 Fixed welcome message not displaying correctly in the new Chat UI. 
Fixed Viewers and Listeners # participants not dynamically updating
 2010-09-28 04:44:42 +00:00
Richard Alam
d0e09ad5ae - add applet that captures region or full screen 
TODO:
    - fix problem where applet gets exception when strating and stopping sharing from bbb-client
    - modify html to pass fullscreen or region option
    - modify bbb-client publish window UI to allow sharer to choose fullscreen or region option
 2010-09-27 17:40:32 -04:00
Richard Alam
a547a3cd21 - copy join-mock.xml and locales.xml when building in DEV env 2010-09-27 17:39:54 -04:00
Richard Alam
77f83bef18 - re-enable deskshare publisher window 2010-09-25 13:03:12 -04:00
deniszgonjanin
e528919d5c Sync chat translation with localization selector. Minor localization issues fixed 2010-09-24 23:55:35 +00:00
deniszgonjanin
84bc11aafe Fixed some issues with the Chat Translation 2010-09-24 23:37:11 +00:00
deniszgonjanin
89ec87d657 Fix for new chat UI flickering 2010-09-24 10:15:22 +00:00
deniszgonjanin
bdf857b56e Chat History fix for 0.71 2010-09-24 09:12:35 +00:00
Richard Alam
83b2519b60 - convert pixels from int[] to byte[] and use the byte[] to calculate checksum to determine if a block has chnaged 2010-09-17 14:53:20 -04:00
deniszgonjanin
f6e1e802c7 New russian translation 2010-09-16 00:13:26 +00:00
deniszgonjanin
1a0a309f80 New Azeri translation 2010-09-12 23:42:48 +00:00
deniszgonjanin
9c47b00940 New turkish translation 2010-09-11 06:56:36 +00:00
deniszgonjanin
ec4370732d New Greek and French translations 2010-09-08 05:17:00 +00:00
deniszgonjanin
205ca72fb1 Applet was in wrong spot for client to build deskshare. Recommiting in the proper spot 2010-09-08 04:31:59 +00:00
deniszgonjanin
7cd54ebf02 Fixed some display issues on the client regarding the improvements to the desktop sharing 2010-09-08 04:14:05 +00:00
deniszgonjanin
b8a1b45e0d Desktop Sharing region selection 2010-09-08 03:56:31 +00:00
Richard Alam
b77a8f46ca Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2010-09-03 14:54:36 -04:00
Richard Alam
5b963bfa18 - make applet do http tunneling 2010-09-03 14:52:24 -04:00
deniszgonjanin
8e30508ed2 Fix for the localization problem of truncation showing 'null' instead of '...' 2010-09-02 05:57:43 +00:00
BigBlueButton
e8442f34ed Updated japanese translation ja_JP for bbb-client 2010-09-02 04:00:28 +00:00
BigBlueButton
d2257b46c9 Found a way to dynamically update localization strings in flexlib MDIWindow 2010-09-02 03:42:44 +00:00
deniszgonjanin
663952367c Small UI tweeks. Removed .actionScriptProperties and .flexProperties from bbb-client/.gitignore 2010-09-01 16:03:45 +00:00
deniszgonjanin
c8f583d718 Removed redundant directory src/tests from bbb-client 2010-09-01 01:07:57 +00:00
deniszgonjanin
7185999371 Minor changes to the client's build.xml 2010-09-01 01:06:25 +00:00
deniszgonjanin
a673c32ce4 Externalized salt of BreakoutModule to config.xml 2010-08-31 21:39:59 +00:00
deniszgonjanin
3d45d68c6e Modified build.xml on the client to compile Breakout Module 2010-08-31 20:43:24 +00:00
deniszgonjanin
8bbe2db0d3 Fixed error in Bulgarian translation that was preventing the client from compiling properly 2010-08-31 20:05:57 +00:00
deniszgonjanin
e5a0aa4c5d Breakout Module, Initial commit 2010-08-31 19:04:30 +00:00
deniszgonjanin
8247a3bb4e Breakout Module, Initial commit 2010-08-31 19:03:44 +00:00
deniszgonjanin
a3fc79bbaa Layout Issue fix for webcam windows overlaping. 2010-08-27 18:46:41 +00:00
deniszgonjanin
f1d3e53541 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2010-08-27 17:27:37 +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
Richard Alam
f8b8d8f8e3 Merge branch 'master' into record-and-playback-feature 2010-08-27 11:08:03 -04:00
Richard Alam
dbbea7ae2a Merge branch 'master' into record-and-playback-feature 
Conflicts:
	bigbluebutton-client/.actionScriptProperties
 2010-08-27 11:05:19 -04:00
deniszgonjanin
ede8b61a4e Webcams now start automagically for others when a person shares 2010-08-26 20:48:06 +00:00
deniszgonjanin
655594a914 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2010-08-26 17:49:32 +00:00
deniszgonjanin
5fb93ad802 Made video quality configurable through the config.xml file 2010-08-26 17:49:01 +00:00
Richard Alam
48a6659766 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2010-08-26 13:21:41 -04:00
deniszgonjanin
d2ef6a8a33 Bulgarian Translation 2010-08-26 17:19:16 +00:00
Richard Alam
eb025271e7 - add VERSION param into swf file to prevent caching 2010-08-26 13:17:10 -04:00
deniszgonjanin
6d96b7cce5 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2010-08-24 20:11:19 +00:00
deniszgonjanin
8d44d18609 Added Ant task for building the branding swf files from outside Flash Builder 2010-08-24 20:10:28 +00:00
Richard Alam
74566ce68a Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2010-08-24 15:49:21 -04:00
Richard Alam
b397c6130b - increment timestamps 
Ulaw: 160 (RTMP -> RTP)
           32 (RTP -> RTMP)
    Speex WB: 320 (RTMP -> RTP)
               20 (RTP -> RTMP)
 2010-08-24 15:39:55 -04:00
deniszgonjanin
0194d07059 Branding for bbb-client. Initial Commit 2010-08-24 19:36:29 +00:00
Richard Alam
32452e8722 - change buffer time to 180 milliseconds...aprox. 9 packets 2010-08-18 11:12:42 -04:00
Richard Alam
6cbec30e4a - add 1sec buffer to audio stream 2010-08-18 09:57:24 -04:00
Richard Alam
426e9ebac1 - fix timestamps for RTMP audio 2010-08-17 10:35:30 -04:00
Richard Alam
3fef44952a - set ptime:120 and framesPerPacket=6 2010-08-16 16:50:35 -04:00
Richard Alam
b03ffcf30e Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2010-08-16 15:43:24 -04:00
Richard Alam
862a88c712 - try ptime:40 2010-08-16 15:42:10 -04:00
deniszgonjanin
a49389114e made language selection optional in the config.xml 2010-08-16 15:05:10 +00:00
deniszgonjanin
40a071bbcf Added Japanese Translation 2010-08-14 00:02:28 +00:00
deniszgonjanin
1611d8beda A language selector for dynamically changing languages 2010-08-13 23:57:48 +00:00
deniszgonjanin
1ace8d3dff Auto detection of language for chat translation. 2010-08-13 21:33:02 +00:00
deniszgonjanin
a1c42fe842 Persian and Swedish translation files 2010-08-13 20:24:14 +00:00
deniszgonjanin
d810c5d597 Added Persian and Swedish translations 2010-08-13 20:23:50 +00:00
deniszgonjanin
64b039b23d Deleting unused files. Fixing ExampleChatModule to work with 0.71 2010-08-13 16:03:09 +00:00
Richard Alam
f8d4a5d0ce - fix default logout url 2010-08-10 08:45:59 -04:00
Richard Alam
aba6daf3cd - change the support flash player to version 10 instead of 9.0.124 2010-08-10 07:53:08 -04:00
deniszgonjanin
dc9da8afa0 More work on the new progress loader for bbb-client 2010-08-10 17:30:20 +00:00
deniszgonjanin
2afa932c0f New module loading progress indicator 2010-08-10 14:56:10 +00:00
deniszgonjanin
091c867d20 Minor adjustments to the new chat UI - color changes and translation handling 2010-08-09 23:12:34 +00:00
deniszgonjanin
7cbfbbe473 Fixed small display bugs in the new chat interface 2010-08-09 22:49:44 +00:00
deniszgonjanin
018564453a More improvements to the new chat UI 2010-08-09 20:47:36 +00:00
deniszgonjanin
070a641abf Fixed Issue 584 2010-08-09 16:13:21 +00:00
deniszgonjanin
08f6d2499c Changed whiteboard to use new Flash Player 10 drawing methods, for better performance; added more unit tests to main 2010-08-09 14:40:27 +00:00
Richard Alam
fc05379396 - cleanup the logging which has the old groovy ${var} string 2010-08-09 07:58:31 -04:00
deniszgonjanin
0c0d8b6579 More unit tests for bbb-client/main 2010-08-06 21:02:34 +00:00
deniszgonjanin
c1e030118d Added unit tests for modules in bbb-client/main 2010-08-06 18:56:34 +00:00
deniszgonjanin
72cc7bed8f Cleanup and refactoring in bbb-client Main app 2010-08-06 13:45:36 +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
Richard Alam
0eabfd09a1 - update BigBlueButton.html to flex 3.5 2010-08-05 05:10:53 -04:00
Richard Alam
da34e004e0 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2010-08-05 03:30:44 -04:00
Richard Alam
7713a56234 - fix so it build with open flex sdk 3.5 2010-08-05 03:29:58 -04:00
deniszgonjanin
bc46d4e0d7 Compiled using proper Flex version, seems like it got messed up on master somewhere 2010-08-04 22:14:58 +00:00
deniszgonjanin
68e8459a46 Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton 2010-08-04 22:14:28 +00: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
6142ae978c Merged Neeraj's GSoC Chat Translation into Chat, along with a new User Interface for Chat 2010-08-04 19:47:54 +00:00
Richard Alam
cf865ec52e Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into support-both-ulaw-and-speex 
Conflicts:
	bigbluebutton-client/.actionScriptProperties
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/ConnectionManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/StreamManager.as
 2010-08-04 10:07:45 -04:00
Richard Alam
6f9bc895ec - dynamically choose between SPEEX and PCMU codec. PCMU codec audio is still choppy. 2010-08-04 07:29:21 -04:00
deniszgonjanin
b7a9742115 Fixed Issue 28 2010-08-01 17:23:28 +00:00
deniszgonjanin
8bf45dc051 Finished decoupling the Main app from all other modules. 2010-07-30 23:24:12 +00:00
Richard Alam
b4bbe4c75a - change the frames per packet to 1 as FS expects only 320 samples per packet 2010-07-30 17:50:32 -04:00
Richard Alam
3f16b01126 - works great with echo app but not with conference. 2010-07-30 15:41:20 -04:00
deniszgonjanin
133c7fdc99 More cleanup of old code in bbb-client 2010-07-30 18:29:01 +00:00
deniszgonjanin
49b57d8399 Finished moving Viewers business logic to Main 2010-07-30 17:03:03 +00:00
deniszgonjanin
64eec98d51 Refactoring bbb-client Main to not have dependancies on any other modules 2010-07-30 15:55:51 +00:00
Richard Alam
564f22c11b - listen audio stream is good...the talks stream is bad 2010-07-28 17:58:04 -04:00
Richard Alam
da00988ce2 - make client use speex 2010-07-28 16:03:32 -04:00
Richard Alam
5e52011860 - upgrade flex sdk to 3.5 2010-07-28 16:02:49 -04:00
Richard Alam
6ef5a7ea0c Merge branch 'merging-fs-support' 2010-07-23 16:36:30 -04:00
Richard Alam
0c8977dfde Merge branch 'master' into merging-fs-support 
Conflicts:
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/PublicScheduledSessionController.groovy
 2010-07-20 16:28:59 -04:00
Richard Alam
3a7f008ebd - fix presentation windo bug becoming very small when minimized (fix from Mariusz) 2010-07-20 15:08:41 -04: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
Jeremy Thomerson
3c16ee6eee Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2010-07-18 21:00:32 -05:00
Jeremy Thomerson
804c3e25e2 more locales from djp and gang 2010-07-18 21:00:07 -05:00
deniszgonjanin
f15aaa4b1e Moved the bussines logic of ViewersModule to Main 2010-07-18 23:51:17 +00:00
deniszgonjanin
4ce8093924 Renamed HighlighterModule to WhiteboardModule to match the server code and avoid confusion 2010-07-17 20:05:57 +00:00
Richard Alam
9b8e910105 - adding bigbluebutton-client/.actionScriptProperties and bigbluebutton-client/.flexProperties to .gitignore 
as it's IDE specific. Not deleting it though as FlexBuilder needs it to build.
 2010-07-21 11:03:10 -04:00
Richard Alam
790e42dc86 Merge branch 'ljackson-master' into merging-fs-support 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/main/managers/ModuleManager.as
 2010-07-16 15:23:22 -04:00
deniszgonjanin
0ea1e0886c New config.template.xml 2010-07-16 17:36:09 +00:00
deniszgonjanin
688aceb672 merged some files 2010-07-16 17:16:42 +00:00
deniszgonjanin
aa3f8a870b Merge branch 'MateRefactoring' 
Conflicts:
	bigbluebutton-client/.actionScriptProperties
	bigbluebutton-client/.flexProperties
	bigbluebutton-client/src/ExampleChatModule.mxml
	bigbluebutton-client/src/VideoconfModule.mxml
	bigbluebutton-client/src/conf/config.xml.dev
	bigbluebutton-client/src/conf/join-mock.xml
 2010-07-16 17:16:26 +00:00
deniszgonjanin
5f7d7f7fb0 Renamed deskShare module to deskshare 2010-07-16 16:30:43 +00:00
deniszgonjanin
324e4c9d8e Deleted old PlaybackModule 2010-07-16 16:28:54 +00:00