BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,876 Commits 13 Branches 260 Tags 1.1 GiB
4fedbf9882
Commit Graph

10876 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pedro Beschorner Marin
96a000ed99 Adding new RichTextEditor mxml 2015-10-19 11:49:13 -02:00
Felipe Cecagno
385b043146 Merge branch 'mconf-live0.7.3' of github.com:RafaFP/bigbluebutton into mconf-live0.7.3 2015-10-19 11:25:39 -02:00
Felipe Cecagno
1f9ed04243 Merge branch 'mconf-live0.7.3' of github.com:pedrobmarin/bigbluebutton into mconf-live0.7.3 2015-10-19 11:25:06 -02:00
Richard Alam
25cd1701c6 Merge pull request #2844 from ritzalam/update-deskshare-0.9.0-jar 
- update 0.9 deskshare signed jar with new cert
 2015-10-16 16:20:51 -04:00
Richard Alam
3afe92a5b7 - update 0.9 deskshare signed jar with new cert 2015-10-16 20:18:45 +00:00
Felipe Cecagno
762d1e9a56 another patch to fix the long wav files problem 2015-10-16 14:53:20 -03:00
Felipe Cecagno
ec96c89105 Merge remote-tracking branch 'bigbluebutton/v0.9.0-release' into mconf-live0.7.1-ssl 
Conflicts:
	bigbluebutton-client/resources/prod/MconfLive.html
 2015-10-15 15:22:05 -03:00
Calvin Walton
f6adcde830 Update Firefox 41 hang workaround for 41.0.2 
Cherry-picked from b4e3561 on master.
 2015-10-15 14:17:55 -04:00
Calvin Walton
fe8cf13b11 Convert audio_size to a number before subtracting header size 2015-10-15 15:11:45 -03:00
Calvin Walton
43e943d61d Need to convert bit_rate to an integer 2015-10-15 15:11:44 -03:00
Calvin Walton
30e6a98a8b Fix some reference errors in wav detection 2015-10-15 15:11:44 -03:00
Calvin Walton
8332daf093 record-and-playback: Handle FreeSWITCH wav files >4GB 
FreeSWITCH writes wav files >4GB long with incorrect values in the length
field in the header. Recalculate the length based on file size, and ensure
that ffmpeg reads the complete audio file rather than stopping.
 2015-10-15 15:11:44 -03:00
Fred Dixon
25be565449 Merge pull request #2833 from ffdixon/v0.9.0-release 
Apply fix for #2832 to BigBlueButton 0.9.1
 2015-10-09 16:27:03 -04:00
Fred Dixon
e3c8520f67 Apply fix for this bug https://github.com/bigbluebutton/bigbluebutton/issues/2832 2015-10-09 16:22:30 -04:00
RafaFP
7e4946865a Fixed the buttons delay on disappearing and killed the connection for good if on flash microphone. 
refs #1800
 2015-09-21 22:22:00 +00:00
Pedro Beschorner Marin
9360a318f4 Fixed DirectClientMessage session reconnect problem 2015-09-21 21:33:16 +00:00
Pedro Beschorner Marin
eac7c9c4d4 Ejecting voice user after a Flash mic reconnection 2015-09-18 15:19:07 +00:00
Pedro Beschorner Marin
655ed560ed Better control for bigbluebutton reconnection 2015-09-17 18:24:30 +00:00
Pedro Beschorner Marin
003977982c Fixed missing WebRTC audio icon 2015-09-17 15:18:48 +00:00
Pedro Beschorner Marin
6ee634d53e Fixed missing reconnected user name in users list 2015-09-16 20:11:10 +00:00
Pedro Beschorner Marin
d53b1d058e Fixed deskshare reconnection issue #1802 2015-09-16 16:03:47 +00:00
RafaFP
0284ee0048 Latest version of the implementation of the feature #1734. 
Data on Playback, Metadata and Download are now present on the publish_ended event.
If the related content is absent it will be returned empty, if otherwise present all child tags and data will be presented.

 refs 1734
 2015-09-14 15:55:06 +00:00
Felipe Cecagno
b17719e8cf added proxyType to best on some connections preparing the client to use rtmps 2015-09-12 19:59:32 -03:00
Fred Dixon
3a309f9119 Fixed error in parsing config.xml in bbb-conf 2015-09-12 19:48:15 -03:00
Fred Dixon
13db512b9d Updated bbb-conf to update URLS for http/https and rtmp/rtmps 2015-09-12 19:39:11 -03:00
Felipe Cecagno
fa35cc7e49 update bbb-conf in order to enable and disable the secure websocket interface on freeswitch when using --enablewebrtc and --disablewebrtc 2015-09-12 14:14:01 -03:00
Felipe Cecagno
3e75ddbcee update the websocket server address if the page is loaded using https (so the socket server must be secure as well) 2015-09-12 14:13:18 -03:00
Calvin Walton
56fb7c8b06 Use protocol-relative links to load the 'get flash' button image 
This fixes a mixed content warning when loading the client over https
 2015-09-12 12:35:59 -03:00
RafaFP
4325e98bf2 Implemented the code to add the "playback", "meta" and "download" tags from the XML to the publish_ended. 
Added code to guarantee that a hash is passed even when the tags do not exist in the XML.

 #feature 1734
 2015-09-11 21:12:09 +00:00
RafaFP
2a85811d40 Implemented hash data gathering dinamically, still have to use TRY to catch the nil exception. 
If the hash is nil the publish_ended post is skipped.

Must validate the tag values and add the download tag.
 2015-09-11 18:20:47 +00:00
Felipe Cecagno
ed366e6b21 Merge branch '090-recordings-size' into mconf-live0.7.3 
Conflicts:
	bigbluebutton-web/src/java/org/bigbluebutton/api/MeetingService.java
	bigbluebutton-web/src/java/org/bigbluebutton/api/domain/Recording.java
 2015-09-08 17:43:20 -03:00
Felipe Cecagno
32957898f6 refactored part of the bbb-0.9-recording-size code in order to include the size on the download size for mconf_encrypted and the playback size for the others; included raw_size for all available formats 2015-09-08 17:18:02 -03:00
Felipe Cecagno
8288d52d1c Merge branch '090-multinotes-rich-text' of github.com:pedrobmarin/bigbluebutton into mconf-live0.7.3 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/views/SharedNotesWindow.mxml
 2015-09-07 23:44:37 -03:00
Felipe Cecagno
ac4f58c997 Merge branch 'fix-issue-1716' of github.com:pedrobmarin/bigbluebutton into mconf-live0.7.3 
Conflicts:
	bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/views/SharedNotesWindow.mxml
 2015-09-07 23:26:00 -03:00
Felipe Cecagno
a7b220e207 Merge branch '090-multinotes' into mconf-live0.7.3 2015-09-07 23:19:16 -03:00
Felipe Cecagno
769fa2feac Merge branch 'mconf-live0.7.2' into mconf-live0.7.3 2015-09-07 21:14:23 -03:00
Felipe Cecagno
6d387239ab fixed video log when FFmpeg starts to publish an h263 stream 2015-09-07 13:27:16 -03:00
Mario Gasparoni
6850035e2a Bug #1777 : h263 video hanging 
Solved rc when triggering the transcoder.
Rotated streams don't trigger a relay anymore
Some refactoring

Conflicts:
	bbb-video/src/main/java/org/bigbluebutton/app/video/VideoApplication.java
 2015-09-07 11:36:23 -03:00
Mario Gasparoni
61833e964f Fixing h263 video streaming when input has audio 2015-09-07 11:25:29 -03:00
Felipe Cecagno
8c83731ccc check if scope is null on bbb-video when the user stops broadcasting in order to avoid NPE 2015-09-07 11:25:29 -03:00
mariogasparoni
5aaf1fa21f Fixing closing process of the h263 transcoder 
h263 transcoder is closed when user is disconnected
also some refactoring
 2015-09-07 11:25:29 -03:00
Felipe Cecagno
261ae44f10 Merge branch 'fix-1723' into mconf-live0.7.3 2015-09-03 15:29:34 -03:00
Felipe Cecagno
d5c0047611 Merge branch 'feature-1733' into mconf-live0.7.3 2015-09-03 15:23:15 -03:00
Felipe Cecagno
6dbf18c2e5 cleanup 2015-09-03 15:22:54 -03:00
Felipe Cecagno
3c4055ec01 removed extra add_circle_outline icon from previous commit (use css style instead) 2015-09-03 15:16:16 -03:00
Felipe Cecagno
c99e3fbfb4 Merge branch 'feature-1745' into mconf-live0.7.3 2015-09-03 14:24:33 -03:00
Felipe Cecagno
7063cfa833 included the "Default language" option to the list of languages 2015-09-03 14:04:29 -03:00
Felipe Cecagno
40ce5f8877 changed the logic we store locales on ResourceUtil, so we can do a better job changing the language names and ordering them 2015-09-03 12:42:16 -03:00
RafaFP
eb1b5aee49 Included playback data to the event of "publish_ended" 
#refs 1734
 2015-09-01 16:13:10 +00:00
RafaFP
8602d3c263 Added the link and duration info to the publish_ended event. 
#refs 1734
 2015-08-31 20:29:00 +00:00