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

11477 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fred Dixon
f1d322f3e2 Added Low Latency (h.263) profile 2016-02-08 12:11:48 -05:00
Fred Dixon
8183072337 Merge pull request #3005 from bigbluebutton/ffdixon-bump-copyright-date 
Update index.html
 2016-02-06 13:55:50 -05:00
Fred Dixon
4f73858521 Update index.html 
Bump the copyright date.
 2016-02-06 13:55:43 -05:00
Richard Alam
1bb029fb1b Merge pull request #3003 from ritzalam/fix-issue-2812-v2 
- fix issue 2812 by setting end time when last user leaves
 2016-02-04 17:43:26 -05:00
Richard Alam
40ba49113e - fix issue 2812 by setting end time when last user leaves 2016-02-04 22:40:06 +00:00
Richard Alam
c31857b9da Merge pull request #3001 from bigbluebutton/getRecordings-merged-enhancements 
Get recordings merged enhancements
 2016-02-04 17:01:03 -05:00
Richard Alam
1e0be140a2 Change API version to 1.0 2016-02-04 14:43:59 -05:00
Richard Alam
5d2ab077cb Merge pull request #2999 from ritzalam/make-desktop-sharing-stop-when-tunneling 
- desktop sharing doesn't stop when the applet is tunneling. Catch t…
 2016-02-04 14:20:38 -05:00
Richard Alam
328c948156 Merge pull request #2997 from capilkey/fix-2437-regression 
Put the fix for #2437 back in
 2016-02-04 14:19:24 -05:00
Richard Alam
dbf02ba36e - desktop sharing doesn't stop when the applet is tunneling. Catch the exception and stop the applet. 2016-02-04 19:13:47 +00:00
Chad Pilkey
1da5edfd35 changed the flash client canvas height to calculated value 2016-02-03 15:30:58 -08:00
Richard Alam
8547360280 Merge pull request #2996 from fcecagno/fix-2808 
fix duplicated publish video windows after reconnection #2808
 2016-02-03 10:55:46 -05:00
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
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
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
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
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
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
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