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

11592 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Richard Alam
f71cfe343c Merge pull request #3011 from jfederico/master 
Fix for bug in scripts for processing recordings
 2016-02-09 17:56:20 -05:00
jfederico
0c2eaf5f11 record-and-playback: Fixed bug in original state of recordings. 2016-02-09 17:26:29 -05:00
Jesus Federico
3346a93a72 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2016-02-09 13:31:45 -08:00
Richard Alam
5189dd684a Merge pull request #3010 from capilkey/fix-3009 
Show chat options tab when private chat disabled
 2016-02-09 14:23:18 -05:00
Chad Pilkey
7687d9dd00 show chat options tab when private chat disabled 2016-02-09 11:15:17 -08:00
Fred Dixon
a9c9b6fe57 Merge pull request #3008 from capilkey/fix-emoji-tooltips 
Cleaned up undefined emoji strings
 2016-02-08 18:21:18 -05:00
Chad Pilkey
9e0c169c5d removed undefined emoji tooltip strings 2016-02-08 15:09:05 -08:00
Richard Alam
6eb7c446e1 Merge pull request #3007 from capilkey/1.0-access-bugfix1 
Four minor accessibility fixes
 2016-02-08 17:22:36 -05:00
jfederico
f92200c692 bigbluebutton-web: On changeState, create the directory named by the pathname, including any necessary but nonexistent parent directories. 2016-02-08 16:59:38 -05:00
jfederico
c40f499b94 bigbluebutton-web: Closed DirectoryStream after the directory is processed 2016-02-08 16:48:40 -05:00
Chad Pilkey
9264f50ae5 adjusted the ShortcutWindow sizing 2016-02-08 13:07:47 -08:00
Chad Pilkey
d5db28ac3c removed unused functions from JS 2016-02-08 13:07:08 -08:00
Chad Pilkey
c40087ffac fixed some html labelling in the client 2016-02-08 13:06:34 -08:00
Chad Pilkey
addfe4e502 increase contrast on some font colours 2016-02-08 13:02:00 -08:00
Fred Dixon
fdb9e11562 Merge pull request #3006 from ffdixon/lower-latency-video-profile 
Added Low Latency (h.263) option to profiles.xml. 

While turning off h.264 encoding reduces quality, it also reduces latency.  The use case for this profile is instruction that requires lower latency such as music training.
 2016-02-08 12:15:20 -05:00
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