bigbluebutton-Github/bigbluebutton-html5/app/server/collection_methods
Maxim Khlobystov 5c0cb9c3d8 Merge branch 'meteor-client-pdf-conversion' of https://github.com/gthacoder/bigbluebutton into development
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/PesentationMessageToJsonConverter.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonInGW.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/PresentationModel.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/red5/PresentationClientMessageSender.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/apps/presentation/redis/PresentationEventRedisRecorder.scala
2015-08-06 16:21:31 -04:00
..
chat.coffee adapt html5 client to message changes 2015-06-16 15:58:45 +00:00
meetings.coffee pick lockOnJoin from a settings file 2015-04-23 21:09:28 +00:00
presentations.coffee presentation slide switch-permissions 2015-05-06 19:58:25 +00:00
shapes.coffee Prevent slowdown on firefox when deleting lots of shape messages 2015-05-05 18:33:08 -04:00
slides.coffee Added changes to HTML5 client to handle SVG URI field. 2015-07-15 17:17:19 -04:00
users.coffee Moving functionality into BBB bridge 2015-05-05 13:15:33 -07:00