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

12204 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Felipe Cecagno
d1cfabdfa5 new deskshare applet signed by rnp 2016-01-04 15:49:53 -02:00
Felipe Cecagno
ffcfd0f3fb remove special characters which was causing bbb-fsesl-client fail to build 2016-01-04 15:26:59 -02:00
Felipe Cecagno
019cfa6cfb Merge remote-tracking branch 'mconf/mconf-live0.7.3' into mconf 
Conflicts:
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/CollectorActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	bigbluebutton-apps/src/main/scala/org/bigbluebutton/freeswitch/FreeswitchConferenceActor.scala
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.9.0.jar
	bigbluebutton-client/resources/prod/lib/bbb_webrtc_bridge_sip.js
	bigbluebutton-client/src/org/bigbluebutton/main/views/RecordButton.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/views/components/CustomRichTextEditor.as
 2016-01-04 15:14:27 -02:00
Felipe Cecagno
945e4cdce0 Merge remote-tracking branch 'bigbluebutton/master' into mconf 2016-01-04 13:51:27 -02: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
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