BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,645 Commits 13 Branches 260 Tags 1.1 GiB
c8acfbf65a
Commit Graph

12645 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Travis Kemen
1a77db630a Remove comment from block where it doesn't belong 2015-12-31 07:28:43 -06:00
Travis Kemen
aac732ebec Remove newline that was was added 2015-12-31 07:24:54 -06:00
Travis Kemen
4bf19626c1 Use OR if statements to make this cleaner. 2015-12-31 07:22:02 -06:00
Felipe Cecagno
8f08e13dcc Merge remote-tracking branch 'bigbluebutton/master' into mconf 
Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/ConnectionInvokerService.java
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
 2015-12-30 18:35:13 -02:00
Travis Kemen
6c9238b105 A few fixes for event socket differences between FreeSWITCH 1.4 and 1.6 2015-12-29 19:30:48 -06:00
Felipe Cecagno
a340103fad make the shared notes default font size configurable by config.xml 2015-12-22 17:45:16 -02:00
Felipe Cecagno
785436fb74 fix empty paragraph representation in the html shared notes format 2015-12-22 16:12:21 -02:00
Felipe Cecagno
08ebb0b79d replace font tag on formatted shared notes by the span style attribute; remove textformat tag; improve readability 2015-12-21 17:14:55 -02:00
Felipe Cecagno
af1322e08c fix wrong font size on the formatted shared notes 2015-12-21 14:09:33 -02:00
Richard Alam
50cf177607 Merge pull request #2933 from riadvice/document-conversion 
Updated faulty PDF file conversion mechanism
 2015-12-18 14:23:14 -05:00
Ghazi Triki
e0dd7a174f Added missing Pdf2PngPageConverterHandler class. 2015-12-18 19:33:38 +01:00
Ghazi Triki
b51dbd94b5 Updated faulty PDF file conversion mechanism. Now, we go through the following process: 
- Extract the PDF page to a single PDF file.
- Convert the PDF file to a PNG image.
- Conert the PNG image to a SWF file.
 2015-12-17 20:47:05 +01:00
Pedro Beschorner Marin
701e9b0cd4 Fixed main reconnection 2015-12-17 18:37:34 +00:00
Pedro Beschorner Marin
51262299bb Cleanup 2015-12-17 18:29:02 +00:00
Felipe Cecagno
ad7e3999e7 include size for the download formats on the getRecordings api call 2015-12-17 13:37:02 -02:00
Felipe Cecagno
de75b79eab 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
Felipe Cecagno
f673122da2 sanitize the parameters of resizeAndMoveSlide, so MeetingActor won't throw an Exception because of NaN 2015-12-15 12:51:12 -02:00
Felipe Cecagno
2c880f7e5f fix exception handling on scala actors (print instead of die) 2015-12-15 12:51:12 -02:00
Anton Georgiev
f6932b18d3 Merge pull request #2931 from OZhurbenko/chat-improvements 
UI improvements and bug fixes
 2015-12-14 14:00:19 -05:00
Pedro Beschorner Marin
29f2498497 Fixed master locale status when it loads as default 2015-12-14 18:12:15 +00:00
Oleksandr Zhurbenko
da7242737b Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into chat-improvements 
Conflicts:
	bigbluebutton-html5/app/client/views/whiteboard/whiteboard.coffee
 2015-12-13 20:20:10 -08:00
Oleksandr Zhurbenko
b051765713 Fixed position of Raise Hand button in tablet/cellphone portrait views 2015-12-13 20:07:14 -08:00
Fred Dixon
47f1139b8b Merge pull request #2929 from riadvice/document-conversion 
Revert back pdf2swf conversion option to 'poly2bitmap'
 2015-12-11 06:38:05 -05:00
Ghazi Triki
3c236b2b6a Revert back pdf2swf conversion option to 'poly2bitmap' 2015-12-11 09:12:47 +01:00
Fred Dixon
3730325324 Merge pull request #2928 from bigbluebutton/ffdixon-remove-test-code 
Update create.jsp
 2015-12-10 20:03:15 -05:00
Fred Dixon
aece25f2e8 Update create.jsp 
Removed test code in create API example.
 2015-12-10 20:03:06 -05:00
Fred Dixon
194f2dc7c7 Merge pull request #2927 from ffdixon/fix-2913 
Escaped username string displayed to prevent JavaScript injection.
Fixes #2913
 2015-12-10 15:57:10 -05:00
Fred Dixon
eaa0de2e10 Escaped username string displayed to prevent JavaScript injection. Fixes #2913 2015-12-10 15:54:36 -05:00
Richard Alam
7037123e7d Merge pull request #2920 from ritzalam/do-not-start-recording-on-auto-reconnect 
- sometimes we see multiple wav files on recorded meetings. This was…
 2015-12-10 15:51:04 -05:00
Richard Alam
5b747137bf Merge pull request #2914 from riadvice/document-conversion 
Document conversion update using swfdump and NuProcess library
 2015-12-10 15:50:56 -05:00
Ghazi Triki
febc7ca9ea - Implemented a new logic for detecting heavy converted swf files from PDF, using obejct placements, text and bitmap count. 
- pdf2swf conversion fallback to 'bitmap' instead of 'poly2bitmap' to garantee that file can be opened fast with flash player.
 2015-12-10 19:58:21 +01:00
Felipe Cecagno
84ebeb2757 Merge branch 'mconf-live0.7.3' of github.com:mconf/bigbluebutton into mconf-live0.7.3 2015-12-09 23:42:45 -02:00
Felipe Cecagno
1dc6a675e4 use BigInteger to calculate the recording size 2015-12-09 23:42:22 -02:00
Felipe Cecagno
f49d758582 change attribute on bbb_webrtc_bridge due to a new version if sip.js, from iceGatheringTimeout to iceCheckingTimeout 2015-12-08 17:43:14 -02:00
Felipe Cecagno
5d1534df8c Merge remote-tracking branch 'bigbluebutton/v0.9.0-release' into mconf-live0.7.3 
Conflicts:
	bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.9.0.jar
	bigbluebutton-client/resources/prod/lib/sip.js
 2015-12-08 17:42:43 -02:00
Felipe Cecagno
dd99398ff7 fix the notes save button emphasized property 2015-12-08 17:38:05 -02:00
Felipe Cecagno
15ad366550 move the shared notes icons to branding 2015-12-08 17:38:05 -02:00
Felipe Cecagno
97daf0e9f5 add a menu next to the save notes button so the user can save both formatted or unformatted notes; create a new class WellPositionedMenu which will automatically position a menu next to a button or any other display object; cleanup 2015-12-08 17:38:05 -02:00
Felipe Cecagno
66379edc1d fix deskshare on java 1.9 2015-12-08 17:38:05 -02:00
Felipe Cecagno
59dce70b6a add the byte order mark for UTF-8 when saving notes, so it will be displayed properly in the browsers 2015-12-08 17:38:04 -02:00
Pedro Beschorner Marin
01d4e3af1a Adjusting emoji display size 2015-12-08 17:16:31 +00:00
Pedro Beschorner Marin
9cb63f2129 Fixed extended-status 2015-12-08 16:45:00 +00:00
Anton Georgiev
65ad30c46d Merge pull request #2925 from Gcampes/master 
Add set presenter to HTML5
 2015-12-07 13:05:42 -05:00
Gabriel Campes
791290e8b9 Add set presenter to HTML5 2015-12-07 13:33:52 -02:00
Anton Georgiev
2005680bae Merge pull request #2924 from Gcampes/master 
Add Kick user to HTML5
 2015-12-04 13:00:07 -05:00
Pedro Beschorner Marin
915cc99e0a Minor adjust in donwload presentation button size 2015-12-04 17:59:25 +00:00
Pedro Beschorner Marin
5ce45fdef2 Fixed responseToAllGuests 2015-12-04 16:56:28 +00:00
Gabriel Campes
be9e582a1d Add kick user to HTML5 2015-12-04 14:38:19 -02:00
Pedro Beschorner Marin
438e5fc1e6 Fixed guest policy getting, setting an changed messages 2015-12-04 15:16:09 +00:00
Anton Georgiev
ed8b38478c Merge pull request #2923 from antobinary/pr-test 
html5client:clear slide when presenter removes current presentation
 2015-12-03 18:17:01 -05:00