Commit Graph

2395 Commits

Author SHA1 Message Date
Sebastian
bffd3a60f5 Added extra error checking in bbb-conf 2010-06-30 15:28:54 -04:00
Sebastian
3c8333f8c1 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton
Conflicts:
	bigbluebutton-web/grails-app/conf/bigbluebutton.properties
2010-06-30 15:21:22 -04:00
Sebastian
a35ac1d846 Updated bigbluebutton.properties 2010-06-30 15:20:02 -04:00
Richard Alam
2c98d5c5e4 - add README 2010-06-30 11:59:58 -04:00
Richard Alam
ca975a9778 - remove IDE specific files 2010-06-30 11:58:57 -04:00
Richard Alam
4703f6c5bf - Removing IDE specific files 2010-06-30 11:23:14 -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
Richard Alam
1b2e7b1dc5 - merge in sebs changes
Conflicts:
	bigbluebutton-web/grails-app/conf/bigbluebutton.properties
2010-06-29 13:37:17 -04:00
Richard Alam
7042903b4b - remove loggedOutUrl value to easily easily maintain post-install script 2010-06-29 13:31:30 -04:00
Sebastian
552eb9edea removed the comment from bigbluebutton.properties and removed the link to redirect the server to www.bigbluebutton.org 2010-06-29 13:27:48 -04:00
Sebastian
adcff2c058 Updated the url in demo_footer.jsp 2010-06-29 13:24:53 -04:00
Leif Jackson
3c1ac567f7 update flex AS properties to include test 2010-06-29 06:59:02 +00:00
Leif Jackson
c2e97c4b60 NPE exception in Action event handler 2010-06-29 06:58:40 +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
Leif Jackson
544e4eb74c import of esl-client java library from freeswitch-contrib
commit 38196eac648033cd7570617f1bc94ee6c47f4209
    Author: David Varnes <david.varnes@gmail.com>
    Date:   Tue Jan 5 14:04:56 2010 +0000

        friendlier pom settings for testers

        git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk/contrib@16152 d0543943-73ff-0310-b7d9-9358b9ac24b2

    With changes applied esl-client-bbb.patch to fork for BBB development
2010-06-29 04:45:51 +00:00
BigBlueButton
9b1be73d61 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2010-06-28 20:11:11 +00:00
BigBlueButton
3ced173986 - modify to checkout code from git and setup dev env for client|web|apps 2010-06-28 20:10:29 +00:00
Sebastian
56c43c3f01 Fixed a bug in switching from meetme to konference and vice versa 2010-06-28 15:28:41 -04:00
Sebastian
ce2e493c01 fixed a bug in the --salt function 2010-06-28 14:35:31 -04: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
Sebastian
e8914c0be0 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2010-06-25 16:06:53 -04:00
Sebastian
626fcab4c7 added a 32bit version of app_konference.so fuer lucid 2010-06-25 15:58:42 -04:00
sebastian
dc8314e30d Added a version of app_konference.so for lucid for 64bit 2010-06-25 15:57:49 -04:00
Sebastian
1650910977 added a 32bit version of app_konference.so fuer lucid 2010-06-25 15:50:58 -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
171eb20845 Merge branch 'master' of git@github.com:bigbluebutton/bigbluebutton 2010-06-25 13:21:29 -04:00
Richard Alam
36431188c0 - update locales 2010-06-25 13:21:04 -04:00
firstuser
ed4ceb712b Added the ability to change the security salt 2010-06-25 12:11:36 -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
9e38133fe3 - upgrade version to 0.7 2010-06-25 11:07:45 -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