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

12746 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Felipe Cecagno
438e90a2e1 fix duplicated publish video windows after reconnection #2808 
The problem was that we were handling the reconnecton succeeded event to start streaming again, but this event is dispatched for every connection, not only for the video connection, and it was causing restream to be called multiple times after the reconnection, eventually duplicating the publish windows; when it occurred, the user was publishing two separate video streams.
The solution was to use the ConnectedEvent used only by the video connection, which also carries the information if that connection is due to a reconnect.
It looks like the current solution to restream after a reconnect doesn't work if the user was publishing two cameras at the same time. In that case, I think only the second camera will be published again.
 2016-02-03 10:29:01 -02:00
Anton Georgiev
227ae1bb72 Merge pull request #2991 from OZhurbenko/meteor-whiteboard 
Reworked server-side ES6
 2016-02-02 16:01:24 -05:00
Oleksandr Zhurbenko
b19f22740b Changed WhiteboardPaper.cursor.cursor to cursorDOM 
Resolves #2955
 2016-02-01 12:55:53 -08:00
jfederico
84e4221c47 bigbluebutton-web: Extended filterRecordingsByMetadata in order to support wildcards 2016-02-01 15:08:51 -05:00
Oleksandr Zhurbenko
d0112ff7b7 Corrections 2016-02-01 10:38:15 -08:00
jfederico
f6453e3bc4 bigbluebutton-web: Removed methods not used after refactoring 2016-02-01 10:22:17 -05:00
Fred Dixon
10b1f4eb4b Merge pull request #2994 from ffdixon/minor-fixes 
Minor fixes
 2016-01-30 19:53:38 -05:00
Fred Dixon
b9c6c62810 Added <meta charset=utf-8 /> to playback.html Fixes #2975 2016-01-30 19:46:58 -05:00
Fred Dixon
3dbfd83747 Load get_flash_player.gif from BigBlueButton server 2016-01-30 11:32:25 -05:00
Fred Dixon
ef79077e09 Fixed undefined error when loading BigBlueButton.html 2016-01-30 11:31:35 -05:00
Oleksandr Zhurbenko
34ff1e19ba Reworked ES6 on the server side 2016-01-29 17:33:40 -08:00
jfederico
ab6db94d9a bigbluebutton-web: Refactoring some methods in RecordingService for reducing duplication 2016-01-29 18:32:39 -05:00
Chad Pilkey
16cdf9c5bb Merge pull request #2990 from fcecagno/fix-2985 
fix #2985
 2016-01-29 18:18:35 -05:00
RafaFP
86f1c83055 Fixed identation and unnecessary changes made to the code. 
refs #1827
 2016-01-29 20:25:50 +00:00
RafaFP
c090f77e2c Added a window to ask if the user wants to save a current unsaved custom layout when the user wants to save the layouts to a file. 
refs #1827
 2016-01-29 20:19:01 +00:00
Felipe Cecagno
7804e734e4 fix #2985 
close button on the publish window now closes both remote and local windows
 2016-01-29 17:29:39 -02:00
jfederico
f23158ccd7 bigbluebutton-web: Fixed issue with recordings not publishing/unpublishing 2016-01-29 13:36:24 -05:00
Felipe Cecagno
301a07773b fix issue with webrtc introduced on latest merge 2016-01-29 15:46:32 -02:00
jfederico
87eee3746f bigbluebutton-web: Added state to the new xml template 2016-01-29 11:03:07 -05:00
jfederico
e12d3fa639 Cleaned up ApiController after merge 2016-01-29 10:24:30 -05:00
jfederico
440bc6ece7 Cleaned up merge conflicts in RecordingService.java 2016-01-28 16:59:16 -05:00
jfederico
e1e3aa6055 Merge branch 'pedrobmarin-getRecordings' into jfederico-getRecordings 
# Conflicts:
#	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
#	bigbluebutton-web/src/java/org/bigbluebutton/api/RecordingService.java
 2016-01-28 15:36:19 -05:00
jfederico
de1ee8575d Reformatted files in conflict 2016-01-28 14:03:57 -05:00
jfederico
2f3bd5b3ce Reformatted files with conflicts 2016-01-28 13:58:05 -05:00
Pedro Beschorner Marin
d74c571958 Akka actors now print and log the exceptions and are kept alive 2016-01-28 18:15:24 +00:00
Jesus Federico
a0702903eb Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2016-01-28 09:06:53 -08:00
jfederico
9941668094 Updated .gitignore and removed config files specific for eclipse from bigbluebutton-web 2016-01-28 12:05:13 -05:00
jfederico
a0c2e337cd bigbluebutton-web: Changed approach for filtering states/recordIDs. the query is now based on recordID and state parameters instead of filter 2016-01-28 11:45:12 -05:00
Felipe Cecagno
d6b9a26e0d fix missing relayTimeout property removed on last merge 2016-01-28 14:37:09 -02:00
Richard Alam
c58767e74e Merge pull request #2982 from ritzalam/guard-against-NaN-in-presentation-messages 
Guard against na n in presentation messages
 2016-01-28 11:21:21 -05:00
jfederico
c9abb24a06 record-and-playback: Formatted xml produced for metadata.xml after adding playback 2016-01-28 10:13:45 -05:00
Pedro Beschorner Marin
1edc10f000 Merge remote-tracking branch 'bigbluebutton/master' into speedup-getrecordings 2016-01-28 12:42:06 +00:00
Chad Pilkey
7b978b9cd6 Merge pull request #2986 from capilkey/descriptive-emoticon-tooltips 
Added more descriptive tooltips for the emoticon buttons
 2016-01-27 18:40:36 -05:00
RafaFP
480df6e90b User can no longer create a custom layout that has the same name as any other layouts on his list. 
When a user tries to do so, he will be propted by a popup window to confirm the overwriting of the previous layout.
If the user confirms this choice, then the previous layout will be removed and the new one takes it's place.
If the user denies the overwriting then he will return to the naming window to change the name of the custom layout.

refs #1825
 2016-01-27 22:17:10 +00:00
Oleksandr Zhurbenko
1775053d39 Changes the default value for the presentation's title when it gets removed 2016-01-27 13:58:56 -08:00
Chad Pilkey
58380dd6fd added more descriptive tooltips for the emoticon buttons 2016-01-27 12:36:54 -08:00
Anton Georgiev
e26ae3d077 Merge pull request #2984 from OZhurbenko/meteor-whiteboard 
Fixes for issues #2955, #2942, #2941, #2984
 2016-01-27 15:24:55 -05:00
Pedro Beschorner Marin
23f9d226cc Removed identation whitespaces of get-recordings XML when building it. 2016-01-27 18:00:49 +00:00
Pedro Beschorner Marin
5e79f26709 Added CDATA fields to FreeMarker template 2016-01-27 14:52:22 +00:00
Pedro Beschorner Marin
3cb59b8951 FreeMarker template in a separated file 2016-01-27 14:27:06 +00:00
jfederico
7ef3e62940 bigbluebutton-web: The statuses processing and processed can be returned by getRecordings 2016-01-26 17:17:28 -05:00
jfederico
983e58922e record-and-playback: metadata.xml is generated by process script instead of publish 2016-01-26 17:16:28 -05:00
Felipe Cecagno
2a3b95daf7 Merge remote-tracking branch 'bigbluebutton/master' into mconf 
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersApp.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/UsersModel.scala
	bbb-video/src/main/webapp/WEB-INF/bigbluebutton-video.properties
	bigbluebutton-apps/src/main/java/org/bigbluebutton/red5/client/messaging/ConnectionInvokerService.java
	bigbluebutton-client/locale/en_US/bbbResources.properties
	bigbluebutton-client/locale/pt_BR/bbbResources.properties
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/AutoReconnect.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/events/ConnectionFailedEvent.as
	bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/managers/WebRTCCallManager.as
	bigbluebutton-client/src/org/bigbluebutton/modules/phone/maps/FlashCallEventMap.mxml
	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
	bigbluebutton-config/bin/bbb-conf
 2016-01-26 18:33:31 -02:00
Fred Dixon
3c2217e5a1 Merge pull request #2983 from fcecagno/compiling-fsesl-client 
Compiling bbb-fsesl-client
 2016-01-26 15:06:39 -05:00
Felipe Cecagno
4ca7fe7ef7 remove weird characters that prevents bbb-fsesl-client to be compiled successfully 2016-01-26 18:00:44 -02:00
jfederico
1204ae9f2a recording-and-playback: Added initial metadata.xml as part of the processing 2016-01-26 14:25:02 -05:00
Pedro Beschorner Marin
6307b47ba8 Creating getRecordings XML response with FreeMarker 2016-01-26 18:59:36 +00:00
Richard Alam
b3bec76ae7 - cleanup formatting 2016-01-25 19:00:23 +00:00
Richard Alam
7e60610dc5 - sometimes presentation message send a NaN value which results in exception in the MeetingActor. 
If the message contains a NaN, set the value to zero.
 2016-01-25 18:57:50 +00:00
RafaFP
1503b1e031 Fixed the bad alignment of the components. Implemented the saving of new layout by Enter Key in the TextInput field. 
refs#1826
 2016-01-25 18:53:51 +00:00