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

11363 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oleksandr Zhurbenko
5c9b42fb0f Removed the duplicated call of the displayThisSlide() 2016-01-19 15:04:00 -08:00
Oleksandr Zhurbenko
edfaf08757 Typo left after switching to ES6 2016-01-18 11:49:53 -08:00
Oleksandr Zhurbenko
7c56af1f16 Removed callingLocation from BBB.getCurrentSlide 2016-01-18 11:48:36 -08:00
Chad Pilkey
f08f38f6d3 Merge pull request #2949 from capilkey/webrtc-reconnect 
Reduce WebRTC reconnect attempts
 2016-01-15 12:10:33 -05:00
Anton Georgiev
129db8daf4 Merge pull request #2950 from gthacoder/meteor-client-es6 
HTML5 client: move to ES6.
 2016-01-15 11:44:30 -05:00
Maxim Khlobystov
ec8c1f83ab Fixed a small typo. 2016-01-15 11:41:16 -05:00
Maxim Khlobystov
cc6ffe15df Got all the single-line comments back. 2016-01-15 00:46:41 -05:00
Fred Dixon
2fd4248501 Merge pull request #2952 from ffdixon/update-config-ssl-port 
Added check for displaying 443 ssl port when doing bbb-conf --check
 2016-01-14 18:52:33 -05:00
Fred Dixon
f7294d30d3 Added check for displaying 443 ssl port when doing bbb-conf --check 2016-01-14 18:51:38 -05:00
Richard Alam
73d00517cf Merge branch 'pedrobmarin-reconnect-fixes' 2016-01-14 20:13:08 +00:00
Richard Alam
e58b527c0f - remove println 2016-01-14 20:08:36 +00:00
Richard Alam
d79d763857 Merge branch 'reconnect-fixes' of https://github.com/pedrobmarin/bigbluebutton into pedrobmarin-reconnect-fixes 2016-01-14 19:43:08 +00:00
Maxim Khlobystov
a844cb9356 Started using ES2015 inheritance for the whiteboard models instead of the auxiliary function created by the transpiler. 2016-01-13 18:30:58 -05:00
Chad Pilkey
1bc100f4c7 reduced webrtc retry attempts from 5 to 3 2016-01-13 13:05:22 -08:00
Chad Pilkey
008d59c85d Merge pull request #2947 from mconf/webrtc-reconnect 
WebRTC reconnect
 2016-01-13 15:25:33 -05:00
Pedro Beschorner Marin
afb1cc44d6 Fixed SIP mic reconnection 2016-01-13 15:01:04 +00:00
Pedro Beschorner Marin
28bf1c9084 Fixed global audio reconnection 2016-01-13 13:50:38 +00:00
Maxim Khlobystov
e74ebe25fb Removed unnecessary CoffeeScript dependancy. 2016-01-12 15:24:12 -05:00
Maxim Khlobystov
52220a42cb Moved to ES2015. 2016-01-12 15:15:16 -05:00
Pedro Beschorner Marin
96d30fc9c1 Fixed main reconnection 2016-01-12 18:40:34 +00:00
Felipe Cecagno
0660f7ebf4 remove pt_BR translation 2016-01-12 15:55:22 -02:00
Felipe Cecagno
d98bee07cf Merge webrtc-reconnect into bigbluebutton/master 
Conflicts:
	bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/AutoReconnect.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/WebRTCCallManager.as
 2016-01-12 15:27:01 -02:00
Richard Alam
f4980efefc Merge pull request #2944 from capilkey/1.0-accessibility 
Fixes for issues #2898, #2788, #2789
 2016-01-11 11:26:17 -05:00
Fred Dixon
c579737b1a Merge pull request #2946 from ffdixon/restart-libreoffice-once-a-day 
Added check to restart libreoffice if no users are logged in
 2016-01-10 18:43:33 -05:00
Fred Dixon
a91da95072 Added check to restart libreoffice if no users are logged in 2016-01-10 18:41:30 -05:00
Fred Dixon
a069816991 Merge pull request #2945 from ffdixon/fix-2930 
Made bbb-conf more resilient to commented parameters
 2016-01-10 16:35:21 -05:00
Fred Dixon
a0e0fc1520 Fix for #2930 2016-01-10 16:32:41 -05:00
Chad Pilkey
3422070be6 fix issue #2788 2016-01-08 15:20:29 -08:00
Chad Pilkey
8c0f2db056 fix issue #2789 2016-01-08 15:07:39 -08:00
Chad Pilkey
3e9d6348ff update the video module to conform for accessibility 2016-01-08 15:00:23 -08:00
Chad Pilkey
21d14aaa01 fixed the TabIndexer 2016-01-07 14:32:13 -08:00
Anton Georgiev
38bc6d4dfe Merge pull request #2937 from kemen04/fs-1.6 
A few fixes for event socket differences between FreeSWITCH 1.4 and 1.6
 2016-01-02 22:17:02 -05:00
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
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
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
Anton Georgiev
f6932b18d3 Merge pull request #2931 from OZhurbenko/chat-improvements 
UI improvements and bug fixes
 2015-12-14 14:00:19 -05: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