Commit Graph

2178 Commits

Author SHA1 Message Date
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
3a7f008ebd - fix presentation windo bug becoming very small when minimized (fix from Mariusz) 2010-07-20 15:08:41 -04:00
Richard Alam
04eabdacbb - rename package 2010-07-20 11:35:03 -04:00
Richard Alam
1bde953703 - setup dependencies 2010-07-20 11:31:57 -04:00
Richard Alam
2e2ba473fe - ignore eclipse IDE files and dir 2010-07-20 11:28:32 -04:00
Richard Alam
b389ac4a6c Merge branch 'master' into record-and-playback-feature 2010-07-20 10:34:57 -04:00
BigBlueButton
333dd13d6b - fixed few issues and cleaned up 2010-07-19 20:23:28 +00:00
BigBlueButton
ea156fe61e Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2010-07-19 19:45:52 +00:00
BigBlueButton
cad05a9ce1 - bbb-scheduling has been removed from bbb-web 2010-07-19 19:27:24 +00: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
Richard Alam
6d007a64fd - rename message-recorder to events-recorder 2010-07-19 13:04:39 -04:00
Richard Alam
736514e9b0 - renaming to playback-client 2010-07-19 12:17:46 -04:00
Richard Alam
a9679acbcf - cleanup unused folder 2010-07-19 12:16:53 -04:00
Richard Alam
c1edb67290 - moved the record-and-playback folder from labs 2010-07-19 12:16:11 -04:00
Sebastian
8f91aa3452 Removed the output of arguments given in a constructor 2010-07-19 11:43:36 -04:00
Richard Alam
fd9dac1a4f Merge branch 'master' into record-and-playback-feature 2010-07-19 11:33:28 -04:00
Richard Alam
af873d63e8 - ignore bbb_conf_api.jsp as it's dynamically generated 2010-07-19 11:32:29 -04:00
Sebastian
08addc917c Updated the bbb_api.php 2010-07-19 10:53:39 -04: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
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
Sebastian
54ccec0c51 Modified an error message 2010-07-15 12:55:42 -04:00
Sebastian
ae5baa22ab Added a sleep 5 to give the server more time to start up 2010-07-15 12:51:14 -04: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
Sebastian
c310fbda33 Updated the index.html 2010-07-15 10:12:32 -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
Richard Alam
0e3286667b - change the api version to 0.7 2010-07-14 16:36:08 -04:00
Richard Alam
cbb58ca839 - adding join-mock to setupdev client 2010-07-14 16:30:53 -04:00
Sebastian
27e45ae4a5 Added a check for host comparison with the ip 2010-07-14 11:55:33 -04:00
Sebastian
e40edd9e82 Fixed bugtracking #113 2010-07-14 11:30:49 -04: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
Sebastian
cc3af139e7 Changed How-To-Videos to View Intro Videos 2010-07-14 09:17:30 -04: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
8ec4baf02d Merge branch 'master' of git@github.com:bigbluebutton/bigbluebutton 2010-07-13 16:57:23 +00:00
Sebastian
369c66001e Fixed a bug for cacheexceptionhandler 2010-07-13 19:09:50 -04:00
Sebastian
094bb00205 Removed a check for root 2010-07-13 18:59:07 -04:00
Sebastian
8f195e093b Updated checking, added output of main memory 2010-07-13 17:13:49 -04:00