BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7dba55cdbb
bigbluebutton-Github/bigbluebutton-web
History
Felipe Cecagno f6d6e4e40c Merge branch '090-guest-role' into HEAD 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/meeting/messaging/redis/MeetingMessageHandler.java
	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/core/api/MessageNames.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/OutMessages.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/api/ValueObjects.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/users/UsersApp.scala
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/src/org/bigbluebutton/main/views/LoadingBar.mxml
	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
2015-01-25 18:36:30 -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 branch '090-guest-role' into HEAD 2015-01-25 18:36:30 -02:00
lib - follow redirects when downloading presentation 2014-10-22 02:43:03 -07:00
src Merge branch '090-guest-role' into HEAD 2015-01-25 18:36:30 -02:00
test sending the externalMeetingId from bbb-web to bbb-apps, so bbb-apps can use it on redis pubsub message meeting_created_message 2014-11-11 17:54:17 -02: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 - modify lib path 2014-10-22 02:44:15 -07: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 - follow redirects when downloading presentation 2014-10-22 02:43:03 -07: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