BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8caa85f333
bigbluebutton-Github/bigbluebutton-web
History
Felipe Cecagno 8caa85f333 Merge branch '090-change-role' into mconf-live0.6.1 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsService.java
	bigbluebutton-client/src/org/bigbluebutton/common/Images.as
	bigbluebutton-client/src/org/bigbluebutton/modules/users/maps/UsersMainEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageSender.as
	bigbluebutton-client/src/org/bigbluebutton/modules/videoconf/views/ToolbarButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
2014-11-23 21:58:27 -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 cleanup 2014-11-23 21:13:46 -02:00
lib - follow redirects when downloading presentation 2014-10-22 02:43:03 -07:00
src Merge branch '090-change-role' into mconf-live0.6.1 2014-11-23 21:58:27 -02:00
test - cleanup. We'll have to re-implement these tests 2014-07-30 14:26:39 -07: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