Chad Pilkey
cfd3446123
Merge remote branch 'upstream/master'
...
Conflicts:
README
bigbluebutton-client/.gitignore
bigbluebutton-client/resources/prod/BigBlueButton.html
bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
bigbluebutton-web/grails-app/conf/bigbluebutton.properties
2012-08-07 19:56:23 +00:00
Chad Pilkey
d6931fb0a8
fixed layout module startup error
2012-07-30 18:24:59 +00:00
Ajay Gopinath
715cb602c3
Finished text tool 'options'.
2012-07-09 16:43:03 -04:00
Richard Alam
247967cb28
- adding some more file to ignore
2012-04-26 14:29:50 +00:00
Richard Alam
faf6520e74
separate building of locales as it takes a long time for the client to build. The steps now are
...
ant
ant localization
Also, fix bundle problem when building locates by adding the required resources. Otherwise, Flash will
choke when the bundled resource (e.g. effects) hasn't been compiled when loading the locale SWF file.
2011-09-20 14:50:41 -04:00
deniszgonjanin
20c97bfece
Ant task for generating ASDoc documentation for the client. Docs generated under bigbluebutton-client/asdoc. Added that directory to client's .gitignore
2011-02-11 22:41:38 +00:00
@deniszgonjanin
060b7483b0
Added support for logo branding in the lower right corner of the client
2010-12-13 20:20:27 +00:00
deniszgonjanin
663952367c
Small UI tweeks. Removed .actionScriptProperties and .flexProperties from bbb-client/.gitignore
2010-09-01 16:03:45 +00:00
Richard Alam
6ef5a7ea0c
Merge branch 'merging-fs-support'
2010-07-23 16:36:30 -04: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
Leif Jackson
9decad03c6
Inital import of freeswitch intergration
2010-06-29 04:51:31 +00:00
Richard Alam
4692c42d6b
- remove dynamically generated linker-report.xml and add to .gitignore
2010-06-24 12:45:57 -04:00
BigBlueButton
07f6264e5c
fixes #393 by returning the supplied user ID in the getMeetingInfo call
2010-05-31 17:13:36 +00:00
Richard Alam
bde5d81edc
- init cursor to prevent exceptions when server is sending cursor updates befor the display inits
2010-05-28 11:07:55 -04:00
