Commit Graph

110 Commits

Author SHA1 Message Date
Fred Dixon
0bae307f5e Fixed formatting of README.md 2017-06-12 17:02:12 -04:00
Pedro Beschorner Marin
e47cd67903 Merge remote-tracking branch 'mconf/mconf-live0.7.5' into merging-to-1.0
Conflicts:
	bbb-video/build.gradle
	bbb-voice/build.gradle
	bigbluebutton-apps/build.gradle
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/freeswitch/FreeswitchConferenceActor.scala
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/build.xml
	bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml
	bigbluebutton-web/src/groovy/org/bigbluebutton/api/RecordingServiceHelperImp.groovy
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/RecordingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/MessagingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/messaging/RedisMessagingService.java
	deskshare/app/build.gradle
	deskshare/build.gradle
2016-06-20 16:11:04 +00:00
Felipe Cecagno
89eb28393e include extra recording events to bbb-webhooks (fix #257) 2016-06-12 22:32:11 -03:00
Felipe Cecagno
66392e0a6b Merge remote-tracking branch 'mconf/mconf-live0.7.4' into mconf
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/freeswitch/FreeswitchConferenceActor.scala
	bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.9.0.jar
	bigbluebutton-client/resources/prod/bbb-deskshare-applet-unsigned-0.9.0.jar
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
2016-03-02 00:19:30 -03:00
Leonardo Crauss Daronco
af645999cb Webhooks: use events to keep track of audios and videos in a conference
Added to the default list of events the events triggered when a user
joins/leaves the voice conference and when shares/unshares a webcam.
2016-01-21 14:17:15 -02:00
Leonardo Crauss Daronco
5ffd2439bd Fix "ReferenceError: hook is not defined" when removing hook 2015-11-13 17:12:12 -02:00
Leonardo Crauss Daronco
0a9376f9b2 Fix "ReferenceError: hook is not defined" when removing hook 2015-11-12 16:43:11 -02:00
Leonardo Crauss Daronco
f9dad0afcd Update the web hooks README, moving info to docs.bigbluebutton.org
Most of the content is being moved to
http://docs.bigbluebutton.org/labs/webhooks.html
2015-05-07 11:41:04 -04:00
Felipe Cecagno
6ad7ce3318 updating post_catcher in order to listen on localhost 2015-05-06 11:25:42 -03:00
Felipe Cecagno
6e516c6df8 promote bbb-webhooks to a well-supported module (removed from labs) 2015-05-06 00:11:02 -03:00