bigbluebutton-Github

History

Ghazi Triki a2feb9bf5b Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into master-merge-2.0 # Conflicts: # akka-bbb-apps/src/main/scala/org/bigbluebutton/core/domain/MeetingStatus.scala # akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala # bbb-common-web/src/main/scala/org/bigbluebutton/api2/BbbWebApiGWApp.scala # bigbluebutton-client/branding/default/style/css/V2Theme.css # bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.fla # bigbluebutton-client/branding/default/style/css/assets/swf/v2_skin.swf # bigbluebutton-client/locale/en_US/bbbResources.properties # bigbluebutton-client/src/org/bigbluebutton/main/model/users/JoinService.as # bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as # bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml # bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml # bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/AddChatTabBox.mxml # bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatMessageRenderer.mxml # bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatWindowEventHandler.as # bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as # bigbluebutton-client/src/org/bigbluebutton/modules/users/views/MediaItemRenderer.mxml # bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/maps/VideoEventMap.mxml # bigbluebutton-html5/private/config/development/server/log.yaml		2018-01-23 12:27:42 +01:00
..
project	- fix compile issues	2017-05-10 14:24:36 -07:00
scala	- get metadata xml	2017-09-01 15:00:38 -07:00
src	Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into master-merge-2.0	2018-01-23 12:27:42 +01:00
.gitignore	- build getMeetings and getMeetingInfo responses using freemarker	2017-03-09 20:32:14 +00:00
build.sbt	Merge branch 'information-bar' of https://github.com/riadvice/bigbluebutton	2017-10-03 14:04:12 -07:00
deploy.sh	- try to consolidate meeting state in one place	2017-06-15 19:09:32 -07:00
README.md	- build getMeetings and getMeetingInfo responses using freemarker	2017-03-09 20:32:14 +00:00

README.md

see http://code.google.com/p/bigbluebutton/wiki/DevelopingBBB