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

12102 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Anton Georgiev
f5adeb34d8 reuse existing functionality 2015-12-03 23:15:29 +00:00
Anton Georgiev
f1d547bf42 clear slide when presenter removes current presentation 2015-12-03 23:04:17 +00:00
Anton Georgiev
0fa709441d Merge pull request #2922 from antobinary/pr-test 
html5client: reworked viewing slide change; moved the cursor out of Presentation collection
 2015-12-03 15:24:21 -05:00
Anton Georgiev
007911ad85 remove extra callback 2015-12-03 20:23:20 +00:00
Anton Georgiev
1e4477d1c2 moved the cursor into its own collection 2015-12-03 20:01:27 +00:00
Pedro Beschorner Marin
59cd4f64bf Refactored shared notes app 2015-12-03 17:44:17 +00:00
Anton Georgiev
59f1ff2394 force display of slide even if .rendered does not trigger. Will need to decouple pointer coord from Presentation 2015-12-03 17:03:04 +00:00
Pedro Beschorner Marin
20231003ae Fixed additional note creation 2015-12-03 16:19:24 +00:00
Oleksandr Zhurbenko
3581e8abeb Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into chat-improvements 
Conflicts:
	bigbluebutton-html5/app/client/stylesheets/whiteboard.less
 2015-12-02 17:09:51 -08:00
Richard Alam
0bba549b38 - sometimes we see multiple wav files on recorded meetings. This was due to starting recording again 
when the user gets disconnected from bbb-apps but still connected to audio.
 2015-12-02 23:03:44 +00:00
Richard Alam
d74f97928c Merge pull request #2906 from ritzalam/cancel-message-sending-task 
- cancel the message sending task when it takes a long time to compl…
 2015-12-02 17:04:42 -05:00
Richard Alam
adffa270ff Merge pull request #2919 from ritzalam/fix-multiple-audio-recordings 
- fix where 2 events are recorded in redis for each voice event.
 2015-12-02 16:44:44 -05:00
Richard Alam
c024cd570c - fix where 2 events are recorded in redis for each voice event. 2015-12-02 21:37:18 +00:00
Pedro Beschorner Marin
ee3864e5ce Fixed sharednotes MAIN_WINDOW 2015-12-02 18:39:35 +00:00
Pedro Beschorner Marin
e868fb3cc9 Fixed user role change 2015-12-01 14:45:44 +00:00
Oleksandr Zhurbenko
bd6db1afb6 Corrected styling for whiteboard controls and an upload container 2015-11-30 17:46:38 -08:00
Anton Georgiev
e3d782b381 Merge pull request #2917 from gthacoder/meteor-client 
HTML5 client: redesigned mobile navbar and offset menus + small mobile view adjustments.
 2015-11-30 14:28:54 -05:00
Pedro Beschorner Marin
1a739fbb8e Fixed client userJoined message receiver 2015-11-30 19:17:34 +00:00
Felipe Cecagno
03964f2a25 update pubsub message handler on bbb-apps to work with the shared notes message sender 2015-11-30 15:19:03 -02:00
Felipe Cecagno
555e037d79 fix merge and refactor a few pieces to fit better on BigBlueButton 1.0.0 2015-11-30 01:06:38 -02:00
Oleksandr Zhurbenko
ff33347114 Took the whiteboard controls out of the whiteboard container, removed check for the opened upload window 2015-11-29 11:45:08 -08:00