BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,446 Commits 13 Branches 260 Tags 1.1 GiB
4e423e7ce4
Commit Graph

1042 Commits

Author SHA1 Message Date
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
deniszgonjanin
2b9df36d3e Got the kinks out of the new module dependency resolution 2010-07-15 23:36:21 +00:00
deniszgonjanin
3a31266f99 Now using new way of resolving module dependencies, although there is still issues left to fix 2010-07-15 15:52:46 +00:00
deniszgonjanin
1004daf6eb Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2010-07-15 15:09:32 +00:00
deniszgonjanin
3165006c47 Added French Canadian localization 2010-07-15 15:07:06 +00:00
Richard Alam
d5fd4eb60d - update join-mock.xml with new params 2010-07-15 10:30:36 -04:00
deniszgonjanin
e558a83db9 Created a way for modules to resolve dependencies, an eventual fix for Issue 172 2010-07-15 01:52:32 +00:00
deniszgonjanin
f7190aef47 More cleanup of unused files in bbb-client Main app 2010-07-15 00:02:23 +00:00
Richard Alam
c3091f0fa6 Revert "Fixed Issue 560" 
This reverts commit 593753c6e1.
 2010-07-14 16:55:49 -04:00
Richard Alam
e6176ce054 Revert "Fix for issue with Phone button not being re-enabled after leaving conference" 
This reverts commit 9069785ca0.
 2010-07-14 16:55:14 -04:00
Leif Jackson
8528b2d287 Merge commit 'bbb/master' 2010-07-14 02:53:29 +00:00
deniszgonjanin
d5d82a81ba Merge branch 'master' of git@github.com:bigbluebutton/bigbluebutton 2010-07-14 01:13:06 +00:00
Jeremy Thomerson
a70047d4aa resources from djp 2010-07-14 09:13:57 -05:00
deniszgonjanin
9069785ca0 Fix for issue with Phone button not being re-enabled after leaving conference 2010-07-14 01:12:34 +00:00
deniszgonjanin
593753c6e1 Fixed Issue 560 2010-07-13 16:56:28 +00:00
deniszgonjanin
d439cc215b Forgot to add new files to the last commit 2010-07-13 13:58:13 +00:00
deniszgonjanin
8f76bdacfb Updated the example module to be relevant for 0.7, and simpler than before 2010-07-13 13:57:04 +00:00
Richard Alam
3d4ed68736 - fix issue 574 http://code.google.com/p/bigbluebutton/issues/detail?id=574. The voice stream from 
flash player wasn't closed when Asterisk hangs-up first
 2010-07-12 11:54:40 -04:00
Leif Jackson
ab51ca68de missed on conflict on bbb/master sync 2010-07-11 04:40:30 +00:00
Leif Jackson
f236dc5c1c Merge commit 'bbb/master' sync with bbb 2010-07-11 04:28:39 +00:00
deniszgonjanin
249ec33439 Removed unused @embed images from bbb-client 2010-07-09 10:47:53 +00:00
Jeremy Thomerson
ff3339494e from DJP - updated french translation 2010-07-08 11:35:53 -05:00
deniszgonjanin
06b3f3db63 Cleanup of unused files in bbb-client Main app 2010-07-08 09:30:04 +00:00
deniszgonjanin
1093c49366 Fixed some small UI issues, issue 568 included 2010-07-08 08:58:58 +00:00
deniszgonjanin
c21370ad95 Finished refactoring to Mate 2010-07-07 13:52:11 +00:00
deniszgonjanin
a48d507539 Cautionary commit while I make some irrevocable changes 2010-07-07 13:45:31 +00:00
deniszgonjanin
e6c388ae33 Finished removing PureMVC. Not to just fix bugs introduced from refactoring 2010-07-07 12:05:31 +00:00
deniszgonjanin
4bf070f289 More refactoring to Mate on the client. Refactored Main app events 2010-07-07 08:46:02 +00:00
Richard Alam
6d55f9b953 - add a way to compile just bbb and locales separately 2010-07-06 11:50:34 -04:00
deniszgonjanin
24063fbcc9 Removed more unused stuff from the Main app 2010-07-06 09:13:26 +00:00
deniszgonjanin
792ed1d2a9 Removed Endpoint and PureMVC messaging stuff from Main. 2010-07-06 08:32:52 +00:00
deniszgonjanin
b65ca955b4 Deleted old viewers module. Fixed logout issues with new viewers module 2010-07-06 07:59:51 +00:00
Richard Alam
a514051c3e - copy the packaged config.xml into src/conf 
- revert back previous change where in build.xml we copy the config.xml from client as we don't want to
   always overwrite the config.xml everytime the dev runs ant. The dev may have a custom config.xml which
   gets overwritten with what's packaged
 2010-07-05 15:15:51 -04:00
Richard Alam
497a496ba7 - copy config.xml from packaged client 2010-07-05 15:00:51 -04:00
deniszgonjanin
11a879127b New files for refactored Listeners and Viewers modules 2010-07-05 12:28:07 +00:00
deniszgonjanin
ef8b9e0786 Refactored Listeners and Viewers to Mate 2010-07-05 12:27:00 +00:00
deniszgonjanin
1061236d8e Small UI tweeks for 0.7 2010-07-05 07:24:05 +00:00
Richard Alam
175591ee66 - copy config.xml or config.xml.template depending on BUILD_ENV. During development, 
it will copy the developer's config.xml but in production, it will use the template
   to generate a config.xml
 2010-07-04 12:31:44 -04:00
Richard Alam
c544212637 - move join-mock.xml to dev resource and add to .gitignore. Devs should copy this file from dev 
resource if they want to use this.
 - delete config.xml.dev as devs can copy config.xml.template to create their own config.xml
 2010-07-04 11:39:30 -04:00
Richard Alam
058867df1d - missed one file 2010-07-04 11:37:05 -04:00
Richard Alam
45e8e4aff8 - move up one folder as it is common for dev and prod 2010-07-04 11:35:35 -04:00
Richard Alam
e3e40bb0a3 - move to production resources 2010-07-04 11:33:19 -04:00
Richard Alam
a21ca1402d - move resource files needed for production the prod folder 2010-07-04 11:28:42 -04:00
Richard Alam
129bc58f89 - not needed anymore 2010-07-04 11:24:26 -04:00
Richard Alam
ff452ff11a - change how VERSION is put for deskshare standalone 2010-07-04 10:56:58 -04:00
Richard Alam
8fa7a9a03c - change how we put version in the SWF filename 
- make not executable
 2010-07-04 10:54:35 -04:00
Richard Alam
8401ec1cdf - minor edit to description 2010-07-04 10:45:17 -04:00
Richard Alam
d4a8519f3e - make build.xml not executable 2010-07-04 10:41:59 -04:00
Richard Alam
5d7e4473c7 - change how we add the VERSION as it screws up ant dev build 2010-07-04 10:38:33 -04:00
Richard Alam
3dd62cd0ee - make html file non-executable 2010-07-04 10:36:34 -04:00
Richard Alam
85f08cc628 - build deskshare standalone without optimization as it doesn't depend on other modules. 2010-06-29 21:17:12 -04:00
Leif Jackson
3c1ac567f7 update flex AS properties to include test 2010-06-29 06:59:02 +00:00
Leif Jackson
e67070cac5 Stability issues with module loader in flex client and deskshare/vm-build.sh script for local devel 2010-06-29 05:07:00 +00:00
Leif Jackson
9decad03c6 Inital import of freeswitch intergration 2010-06-29 04:51:31 +00:00
Richard Alam
09384df99d - rename swfSlideLoader to just slideLoader 
- add comments on the functions to at least help in explaining how it's used.
 2010-06-28 11:24:32 -04:00
Richard Alam
a6730c24b3 - fix problem where slide and cursor gets out of synch when moving/zooming slide 2010-06-28 10:09:56 -04:00
Richard Alam
d49d73c51d - comment out query for presenter name as it breaks dekstop sharing (issue 554) 2010-06-25 23:47:38 -04:00
Richard Alam
43f6ea5d22 Merge branch 'master' of git@github.com:bigbluebutton/bigbluebutton 2010-06-25 14:58:46 -04:00
Richard Alam
d6a8776f80 Merge branch 'master' of git@github.com:bigbluebutton/bigbluebutton 2010-06-25 14:51:46 -04:00
Richard Alam
1e7d9d8cd6 - cleanup 
- display the correct text when locale has the proper text for old locale warning
 2010-06-25 14:50:50 -04:00
Richard Alam
f2eb54c9bd - fix logic 2010-06-25 14:26:10 -04:00
Richard Alam
16f62adf25 - display default locale messages 2010-06-25 14:06:58 -04:00
Richard Alam
36431188c0 - update locales 2010-06-25 13:21:04 -04:00
Richard Alam
cddd0c81bf - change "version" to "build" to reflect the value that get's displayed in copyright notice 2010-06-25 11:14:47 -04:00
Richard Alam
5b3a3252db - applet shouldn't tunnel by default 2010-06-25 11:03:03 -04:00
deniszgonjanin
4e3c4c3ca5 Same as previous - fix for the presenter name bug, last commit had an error 2010-06-25 12:17:04 +00:00
deniszgonjanin
add99194fe Merge branch 'master' of git@github.com:bigbluebutton/bigbluebutton 2010-06-25 12:11:54 +00:00
deniszgonjanin
c67f4ebf60 Fix for Issue with presenters name not updating in DesktopViewWindow 2010-06-25 12:10:40 +00:00
Richard Alam
6bc8845f67 - check if locales are old and tell user to clear cache if old 2010-06-24 16:57:45 -04:00
Richard Alam
e4bbff76b4 - make locale check pass for now 2010-06-24 15:51:22 -04:00
Richard Alam
842bac3f1a Merge branch 'master' of git@github.com:bigbluebutton/bigbluebutton 2010-06-24 14:48:51 -04:00
Richard Alam
e8820f589a - check if client has old version of locales 2010-06-24 14:48:28 -04:00
Richard Alam
4692c42d6b - remove dynamically generated linker-report.xml and add to .gitignore 2010-06-24 12:45:57 -04:00
deniszgonjanin
c76db60dac Fix for Issue 545 2010-06-24 11:42:42 +00:00
deniszgonjanin
64f57d47e4 Merge branch 'master' of git@github.com:bigbluebutton/bigbluebutton 2010-06-24 10:20:33 +00:00
deniszgonjanin
0b82208b54 Changed the ChatModule to use the new UserManager api 2010-06-24 10:19:57 +00:00
deniszgonjanin
4f44869815 Merge branch 'master' of git@github.com:bigbluebutton/bigbluebutton 2010-06-24 08:59:25 +00:00
Richard Alam
5906b771dd - add note to clear browser cache if loading of modules hangs 2010-06-24 10:36:09 -04:00
deniszgonjanin
58414fcbcc Resolved Issue 400 2010-06-24 08:58:52 +00:00
deniszgonjanin
a731e2a5f5 Merge branch 'master' of git@github.com:bigbluebutton/bigbluebutton 2010-06-24 07:46:08 +00:00
Richard Alam
bb39817399 - remove logging of mouse location in client 
- sign deskshare applet jar
 2010-06-24 09:42:32 -04:00
deniszgonjanin
267378b7dd Added a new UserManager, a simple API for modules to get notices of user join/leave and presenter events 2010-06-24 07:45:15 +00:00
deniszgonjanin
13790e0bbb Fix for several 0.7 release bugs, as well as a new way for modules to receive updates about users joining and leaving 2010-06-24 07:42:16 +00:00
Richard Alam
9fb41dc1e4 - retry 3 times to get an audio port before failing 2010-06-23 16:51:45 -04:00
Richard Alam
e23ed12939 - handle webvoiceconf that gets passed to the client 2010-06-22 15:41:48 -04:00
Richard Alam
ab9caa1616 - add webVoiceConf API so third parties can pass in different extension fo voip 2010-06-22 11:24:22 -04:00
Richard Alam
b260c08f3e Merge branch 'master' into voip-fix 2010-06-21 16:32:18 -04:00
Richard Alam
30251f0700 - has end-to-end call...just need to close rtp ports properly 2010-06-21 15:13:00 -04:00
Richard Alam
e4d905ba49 - can now call into echo test app 2010-06-21 13:08:41 -04:00
deniszgonjanin
a3b4603aa3 Merge branch 'master' of git@github.com:bigbluebutton/bigbluebutton 2010-06-18 21:05:33 +00:00
deniszgonjanin
6bb8d60901 Changed bug where thumbnail numbers are wrong when displaying multiple presentations in a session 2010-06-18 21:04:42 +00:00
Richard Alam
f13384771c Merge branch 'master' into voip-fix 2010-06-18 11:42:25 -04:00
Richard Alam
be908218e9 - checkpoint 4: just moving things around 2010-06-18 11:08:31 -04:00
Richard Alam
38562311f3 - modify how we calculate the checksum to determine if the block has changed. Previously, we 
only looked at the 5th column of the block (BUG). Now, we check every 13th pixel of the
   block from bottom-left to top-right.
 2010-06-16 14:42:01 -04:00
Richard Alam
fd377d11c6 - add new directive in nginx conf to expire BigBlueButton.html every minute to prevent caching. 2010-06-14 14:20:09 -04:00
deniszgonjanin
1459c5733c Merge branch 'master' of git@github.com:bigbluebutton/bigbluebutton 2010-06-11 19:33:28 +00:00
deniszgonjanin
9cbce9eed3 Changes to the layout manager to better support webcam placement and small resolutions 2010-06-11 19:32:21 +00:00
Richard Alam
9a4666baef - remove ${} from deskshare in config.xml.template 2010-06-11 13:06:22 -04:00
Richard Alam
5dbf181ee0 - remove the Move effect of the mouse pointer as it looks jerky 2010-06-11 10:27:55 -04:00
Richard Alam
21cd115c77 - remove the extra param to prevent caching of swf files as the swf files are now unique for each build 2010-06-10 16:10:24 -04:00
Richard Alam
354ad3d1e1 - renamed config.xml to config.xml.dev. The config.xml is changed by each developer and sometimes gets checked-in 
which is a little annoying. Developers must now copy config.xml.dev to config.xml. The config.xml is added to
   .gitignore so it doesn't get checked-in.
 2010-06-10 16:05:37 -04:00
Richard Alam
5b33d4cab7 - fix xml format 2010-06-10 14:54:47 -04:00
Richard Alam
2cde0f49a5 - missed to add placeholder to the PhoneModule 2010-06-10 14:47:56 -04:00
Richard Alam
a3cb2a00cf - there's one more place to put the placeholder 2010-06-10 14:18:41 -04:00
Richard Alam
4e40dd01f4 - missed a few lines to put VERSION placeholder 2010-06-10 13:51:36 -04:00
Richard Alam
5140081f03 - add VERSION placeholder which will get substituted by build version 2010-06-10 13:40:03 -04:00
Richard Alam
fe363ddfae - precompute x and y coordinate before assigning to cursorImg to prevent flickering and jerky mouse pointer 2010-06-10 13:27:29 -04:00
Richard Alam
1d820bc527 - fix build to build VIewersModule 2010-06-10 11:40:39 -04:00
Richard Alam
efcf140dda Merge branch 'master' of git@github.com:bigbluebutton/bigbluebutton 2010-06-10 11:40:23 -04:00
Sebastian
55bee72043 Updated config.xml in bigbluebutton-client 2010-06-10 11:11:57 -04:00
Richard Alam
813e38c293 - modify build.xml to use an external locale.xml for supported locales 
- have to include a new anat-contrib.jar (need to figure out how to externalise this)
 2010-06-09 17:41:30 -04:00
Richard Alam
580f9a27c7 - create a config.xml template so we can substitute build numbers to create config.xml. This way, we get around the 
caching problem of modules when we have new releases.
 2010-06-08 17:33:16 -04:00
deniszgonjanin
250e8bb0e4 Changed default chat selected size to 10pt 2010-06-07 20:02:10 +00:00
deniszgonjanin
c95017413c changed back config.xml to a valid dev format 2010-06-07 19:57:36 +00:00
deniszgonjanin
2fe617e855 Localization string fix for whiteboard button 2010-06-07 19:41:39 +00:00
deniszgonjanin
2f1f433849 Fix for the bug where ChatWindow may obscure the whiteboard toolbar 2010-06-07 18:06:51 +00:00
Richard Alam
cc46c01c77 - modify cursor so that it's more accurate on it's location 2010-06-07 13:28:23 -04:00
deniszgonjanin
b7c0835d38 Added localization strings for Desktop Sharing. en_US is frozen for 0.7 2010-06-07 15:13:34 +00:00
deniszgonjanin
a972799167 Added localization strings to the chat options box and for the new switch presenter button 2010-06-07 14:50:04 +00:00
deniszgonjanin
b542aaab89 Removed old Login and Join modules from the client 2010-06-07 13:16:20 +00:00