BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
03aa1aada3
bigbluebutton-Github/bbb-api-demo/src/main/webapp
History
Richard Alam 58c239bc43 Merge branch 'master' into merge-bbb-1.1-dev-java8-with-master 
Conflicts:
	akka-bbb-apps/build.sbt
	akka-bbb-apps/src/main/java/org/bigbluebutton/core/api/IBigBlueButtonInGW.java
	akka-bbb-apps/src/main/resources/application.conf
	akka-bbb-apps/src/main/scala/org/bigbluebutton/Boot.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingModel.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/RecorderActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/InMessages.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/WhiteboardApp.scala
	akka-bbb-fsesl/build.sbt
	akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/pubsub/receivers/RedisMessageReceiver.java
	akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/ConnectionManager.java
	akka-bbb-fsesl/src/main/java/org/bigbluebutton/freeswitch/voice/freeswitch/FreeswitchApplication.java
	bbb-common-message/build.sbt
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Constants.java
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/MessagingConstants.java
	bbb-common-message/src/main/java/org/bigbluebutton/common/messages/Util.java
	bigbluebutton-apps/build.gradle
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/pubsub/redis/RedisPubSubMessageHandler.java
	bigbluebutton-apps/src/main/webapp/WEB-INF/red5-web.xml
	bigbluebutton-client/build.xml
	bigbluebutton-client/resources/config.xml.template
	bigbluebutton-client/resources/prod/BigBlueButton.html
	bigbluebutton-client/src/org/bigbluebutton/common/Images.as
	bigbluebutton-client/src/org/bigbluebutton/main/maps/ApplicationEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/Conference.as
	bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/utils/JavaCheck.as
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
	bigbluebutton-web/build.gradle
	bigbluebutton-web/grails-app/conf/spring/resources.xml
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/domain/Meeting.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MeetingMessageHandler.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/RedisMessagingService.java
	record-and-playback/core/scripts/bigbluebutton.yml
2016-05-16 11:35:36 -04:00
..
css Added demo4/jquery.min.js (older version) for demo4.jsp 2011-11-20 11:15:07 -08:00
images First pass at adding demo11.jsp and demo11.html which gives examples of using the new BigBlueButton JavaScript API 2013-03-17 20:38:49 -04:00
js Added demo4/jquery.min.js (older version) for demo4.jsp 2011-11-20 11:15:07 -08:00
pdfs Simplifed Matterhorn demo and added default slide 2011-09-23 20:23:25 -07:00
WEB-INF Maven structure for bbb-api-demo. Copied jsp files from last bbb-api-demo and 2011-05-26 10:17:59 +00:00
bbb_api.jsp bbb demo joins the conference as no breakout room 2016-02-02 08:46:50 +01:00
bbb_jopenid.jsp Added demo_openid.jsp to join using OpenID on Google and Yahoo 2012-07-30 11:34:18 -04:00
BigBlueButton.pptx - add a PPT file into pre-upload demo 2011-08-24 18:13:26 +00:00
create.jsp Update API demos to work with https 2016-02-28 13:59:45 -05:00
demo1.jsp Update API demos to work with https 2016-02-28 13:59:45 -05:00
demo2.jsp Update API demos to work with https 2016-02-28 13:59:45 -05:00
demo3.jsp Added example of moderator-only welcome message 2014-08-21 20:48:41 -04:00
demo4_helper.jsp removing some meeting information in the demos 2012-03-29 13:30:08 -07:00
demo4.jsp Fixed incorrect path for demo4.jsp 2011-11-20 11:42:40 -08:00
demo6.jsp Update API demos to work with https 2016-02-28 13:59:45 -05:00
demo7.jsp Update API demos to work with https 2016-02-28 13:59:45 -05:00
demo8.jsp Update API demos to work with https 2016-02-28 13:59:45 -05:00
demo9.jsp Update API demos to work with https 2016-02-28 13:59:45 -05:00
demo10_helper.jsp Update demo10_helper.jsp 2015-02-21 15:46:50 -07:00
demo10.jsp Update API demos to work with https 2016-02-28 13:59:45 -05:00
demo11.html Added missing div to fix WebRTC audio for JavaScript API demo 2016-02-26 18:27:42 +00:00
demo11.jsp Update API demos to work with https 2016-02-28 13:59:45 -05:00
demo12.jsp Update API demos to work with https 2016-02-28 13:59:45 -05:00
demo_footer.jsp Update demo_footer.jsp 2016-01-25 07:45:18 -05:00
demo_header.jsp added link to html5client demo. Rm meetingName box 2015-02-19 19:03:53 +00:00
demo_mozilla_persona.jsp Update API demos to work with https 2016-02-28 13:59:45 -05:00
demo_openid.jsp Update API demos to work with https 2016-02-28 13:59:45 -05:00
demoHTML5.jsp log in user properly 2016-05-12 19:22:51 +00:00
error.jsp All jsp files inside webapp 2011-06-16 00:54:53 +00:00
mobile.jsp updated the mobile demo to work with the upcoming BBB AIR Mobile app 2014-11-11 11:32:19 -08:00
polling.gif finish demo recording 2011-06-24 16:28:32 +00:00