Commit Graph

1185 Commits

Author SHA1 Message Date
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
Richard Alam
0eabfd09a1 - update BigBlueButton.html to flex 3.5 2010-08-05 05:10:53 -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
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
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
4ce8093924 Renamed HighlighterModule to WhiteboardModule to match the server code and avoid confusion 2010-07-17 20:05:57 +00: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
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
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
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
ff452ff11a - change how VERSION is put for deskshare standalone 2010-07-04 10:56:58 -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
Leif Jackson
9decad03c6 Inital import of freeswitch intergration 2010-06-29 04:51:31 +00:00
Richard Alam
5b3a3252db - applet shouldn't tunnel by default 2010-06-25 11:03:03 -04:00
Richard Alam
bb39817399 - remove logging of mouse location in client
- sign deskshare applet jar
2010-06-24 09:42:32 -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
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
8c11bfe04b - applet with systray menu disabled 2010-06-04 14:58:33 -04:00
Richard Alam
adba1c0a47 - init scaleW and scaleH to captureW and captureH in the applet 2010-06-04 11:17:34 -04:00
Richard Alam
053fb7a266 - move files required for deployment from html-template to resources. The files get deleted
when the SDK is changed from FlexBuilder. Also, when someone does a clean on FB, the generated
  BigBlueButton.html file gets overwritten byt what's in html-template. So it's difficult to
  test changes to BigBlueButton.html
2010-06-03 14:31:37 -04:00