BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2a3b95daf7
bigbluebutton-Github/bigbluebutton-web
History
Felipe Cecagno 2a3b95daf7 Merge remote-tracking branch 'bigbluebutton/master' into mconf 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersModel.scala
	bbb-video/src/main/webapp/WEB-INF/bigbluebutton-video.properties
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/ConnectionInvokerService.java
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/AutoReconnect.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/ConnectionFailedEvent.as
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/WebRTCCallManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/maps/FlashCallEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
	bigbluebutton-config/bin/bbb-conf
2016-01-26 18:33:31 -02:00
..
.settings - refactor presentation classes from groovy to java...java has better tool support for eclipse 2009-12-22 21:06:23 +00:00
grails-app Merge remote-tracking branch 'bigbluebutton/master' into mconf 2016-01-26 18:33:31 -02:00
lib - follow redirects when downloading presentation 2014-10-22 02:43:03 -07:00
src Merge remote-tracking branch 'bigbluebutton/master' into mconf 2016-01-26 18:33:31 -02:00
test removed the calls from bbb-web related to the webhooks 2015-05-18 12:38:00 -03:00
web-app - upgrade bigbluebutton-web to grails 2.3.6 2014-02-25 15:46:06 +00:00
wrapper - upgrade bigbluebutton-web to grails 2.3.6 2014-02-25 15:46:06 +00:00
.classpath - add ping/pong message between different components to verfiy that we have working path 2015-08-20 20:44:40 +00:00
.gitignore - merge some new stuff 2012-07-29 16:06:39 +00:00
application.properties After checking we bumped projects version and Flex locales to 0.9.0 with some fixes 2014-08-13 12:20:10 +01:00
build.gradle Pdf2SwfPageConverter is now using NuProcess library instead of the native Java Process. 2015-11-24 16:47:24 +01:00
COPYING.LESSER - upgrade bigbluebutton-web to grails 2.3.6 2014-02-25 15:46:06 +00:00
grailsw - upgrade bigbluebutton-web to grails 2.3.6 2014-02-25 15:46:06 +00:00
grailsw.bat - upgrade bigbluebutton-web to grails 2.3.6 2014-02-25 15:46:06 +00:00
INSTALL - upgrade bigbluebutton-web to grails 2.3.6 2014-02-25 15:46:06 +00:00