BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,277 Commits 13 Branches 260 Tags 1.1 GiB
JavaScript 42.4%
Scala 16.8%
TypeScript 15.5%
Java 11.9%
Ruby 4%
Other 9.4%
5742f2764a
Go to file
Richard Alam 5742f2764a Merge remote branch 'ajay/bbb-whiteboard-additions' into merge-whiteboard-features 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/whiteboard/AddShapeWhiteboardRecordEvent.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/whiteboard/WhiteboardEventRecorder.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/IWhiteboardRoomListener.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/Page.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/ShapeGraphic.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardRoom.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/whiteboard/WhiteboardService.java
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/src/org/bigbluebutton/common/Images.as
	bigbluebutton-client/src/org/bigbluebutton/common/assets/images/text_icon.png
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/WhiteboardCanvasModel.as
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/DrawProxy.as
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/DrawObject.as
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/DrawObjectFactory.as
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/Ellipse.as
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/Pencil.as
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/Rectangle.as
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/business/shapes/ShapeFactory.as
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/managers/PageManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/managers/WhiteboardManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/maps/WhiteboardCanvasEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardCanvas.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
2012-07-16 18:08:21 +00:00
bbb-api-demo Finalized licenses and deleted random backup files and cleaned up repo. 2012-07-15 14:49:42 -04:00
bbb-common-message - upgrade version of bbb-commons to 0.8 2011-01-12 09:50:36 -05:00
bbb-video - update red5 to latest (r4316) 2012-04-22 15:03:43 +00:00
bbb-voice - update red5 to latest (r4316) 2012-04-22 15:03:43 +00:00
bbb-voice-conference/config set rtp timeout to 5 minutes so that FS kicks user out if a user is disconnected 2011-09-23 15:09:45 -04:00
bigbluebutton-apps Merge remote branch 'ajay/bbb-whiteboard-additions' into merge-whiteboard-features 2012-07-16 18:08:21 +00:00
bigbluebutton-client Merge remote branch 'ajay/bbb-whiteboard-additions' into merge-whiteboard-features 2012-07-16 18:08:21 +00:00
bigbluebutton-config Updated Copyright to 2012 2012-06-08 21:02:53 -04:00
bigbluebutton-web Finalized licenses and deleted random backup files and cleaned up repo. 2012-07-15 14:49:42 -04:00
deskshare - updating deskshare applet filename to 0.8 2012-06-05 21:09:37 +00:00
esl-client-bbb - cleanup 2012-01-12 18:45:59 +00:00
labs Updated README on bbb-api-php and bbb-api-php-legacy placed in labs 2012-04-05 11:07:10 -04:00
record-and-playback Finished basis for text tool. Stil need to add identification for individual objects/add text customization/fix glitches. 2012-07-04 12:28:29 -04:00
.gitignore Finalized licenses and deleted random backup files and cleaned up repo. 2012-07-15 14:49:42 -04:00
README small change to test 2011-08-02 11:47:20 -07:00

README 

- see http://code.google.com/p/bigbluebutton