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

11667 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Gabriel Campes
be9e582a1d Add kick user to HTML5 2015-12-04 14:38:19 -02: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
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
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
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
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
Maxim Khlobystov
04528eeafe Made the horizontal border between chat and presentation areas one pixel wide on mobile. 2015-11-28 21:44:41 -08:00
Maxim Khlobystov
7cd8702d98 Removed border radius on both chat and presentation areas for mobile devices. 2015-11-28 21:36:54 -08:00
Maxim Khlobystov
ad0a23c02e Changed the mobile navbar icons (thus reducing the number of animations) and redesigned the Settings menu. 2015-11-28 21:18:58 -08:00
Maxim Khlobystov
f7eb9b2a06 Included the navbar under the dark overlay when offset menu is open in portrait, removed some redundant code. 2015-11-28 18:49:53 -08:00
Oleksandr Zhurbenko
cb33ef7586 presentationProgress() didn't work and didn't display slide numbers for a presenter 2015-11-27 16:54:26 -08:00
Oleksandr Zhurbenko
ab7affc1f2 Got rid of exceptions in the console 2015-11-27 13:40:33 -08:00
Oleksandr Zhurbenko
d7287a9309 Unnecessary important 2015-11-27 12:20:03 -08:00
Anton Georgiev
fe67618332 Merge pull request #2916 from antobinary/pr-test 
html5client: fix bug-shapes were flushed no matter which meeting ends
 2015-11-27 11:45:47 -05:00
Anton Georgiev
4ca1c58e9f Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into pr-test 2015-11-27 16:40:45 +00:00
Anton Georgiev
0aa7038ae1 fix bug-shapes were flushed no matter which meeting ends 2015-11-27 16:40:31 +00:00
Oleksandr Zhurbenko
c14995a14b Unused and duplicated code 2015-11-26 17:04:54 -08:00
Oleksandr Zhurbenko
cc92e186ca Corrected the centering for raise hand button in case when there is no current presentation 2015-11-26 17:03:06 -08:00
Oleksandr Zhurbenko
38eaf0252d Removed vertical scrolling in the desktop view 2015-11-26 15:38:04 -08:00
Ghazi Triki
b50badc886 Renamed "swfdump" to "swfdumpfx" to avoid any collision with any existing install of SWFTools or Flex SDK. 2015-11-26 21:58:14 +01:00
Ghazi Triki
1da0bfe503 Inject maxSwfShapes to SwfAnalyser class. 2015-11-26 21:35:51 +01:00
Ghazi Triki
57eda6e54b Improved issue detection in presentation generated SWF files. 2015-11-26 19:34:50 +01:00
Ghazi Triki
9d6f04ed16 Added SwfAnalyser to check the converted swf result. 2015-11-25 21:29:05 +01:00
Anton Georgiev
1b0dca557d remove (presenter) in useritem 2015-11-24 19:40:45 +00:00
Anton Georgiev
ef79c7f3f3 Merge pull request #2912 from antobinary/pr-test 
html5client: Login error pop-up removed; reset the listenOnly defaults
 2015-11-24 14:30:01 -05:00
Anton Georgiev
d5698825c1 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into pr-test 2015-11-24 19:09:38 +00:00
Anton Georgiev
b2fd1c32a7 try to re-join instead of alerting error; reset listenOnly defaults 2015-11-24 19:09:00 +00:00
Ghazi Triki
47f8a7c493 Fixed destination file command parameter for Pdf2Swf page conversion. 2015-11-24 17:01:47 +01:00
Ghazi Triki
98e966bef1 Fixed NuProcessBuilder use for the second command in Pdf2SwfPageConverter. 2015-11-24 16:52:21 +01:00
Ghazi Triki
ce31bdd369 Pdf2SwfPageConverter is now using NuProcess library instead of the native Java Process. 2015-11-24 16:47:24 +01:00
Anton Georgiev
98e170abb5 Merge pull request #2911 from antobinary/pr-test 
html5client: fix for whiteboard annnotations issue
 2015-11-23 17:05:56 -05:00
Anton Georgiev
c59b3ed82c Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into pr-test 2015-11-23 22:02:19 +00:00