Felipe Cecagno 79c3c12256 Merge branch 'merge-presentation-deskshare' into mconf ... Conflicts: bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopPublishWindow.mxml bigbluebutton-client/src/org/bigbluebutton/modules/deskshare/view/components/DesktopViewWindow.mxml bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/PresentationWindow.mxml bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml record-and-playback/presentation/playback/presentation/0.9.0/lib/writing.js		2016-09-14 14:49:48 -03:00
..
core	Merge branch 'mconf-live0.7.5' of github.com:mconf/bigbluebutton into mconf	2016-09-01 18:00:43 -03:00
matterhorn	After checking we bumped projects version and Flex locales to 0.9.0 with some fixes	2014-08-13 12:20:10 +01:00
mconf_decrypter/scripts	enable mconf-decrypter to fetch the recordings even if mconf-live is using a self-signed certificate	2016-09-01 17:56:55 -03:00
mconf_encrypted/scripts	changed the method of pack and unpack the encrypted format, from zip to tar, and making it by an external command instead of doing it in ruby (more efficient)	2015-12-15 16:45:22 -02:00
presentation	Merge branch 'merge-presentation-deskshare' into mconf	2016-09-14 14:49:48 -03:00
presentation_export	update presentation_export playback to be responsive as the playback format	2016-09-01 14:07:33 -03:00
slides	Delete the 'slides' processing scripts	2014-11-13 11:15:43 -02:00
changelog.md	a log file by meeting in archive phase	2013-04-29 16:03:21 -05:00
deploy.sh	fix merge and refactor a few pieces to fit better on BigBlueButton 1.0.0	2015-11-30 01:06:38 -02:00