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

11528 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Richard Alam
36cff83b6f - tell user that he has been ejected from the meeting. 2016-01-19 16:58:14 +00:00
Richard Alam
c66c180040 - make the flash client not attempt to reconnect when the user has been ejected from the meeting. 2016-01-19 16:16:12 +00:00
Jesus Federico
1cb3fe6601 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2016-01-19 07:34:34 -08:00
Fred Dixon
2b06f71031 Merge pull request #2963 from ffdixon/logout-message 
Updated text for logout message:
 2016-01-19 08:58:27 -05:00
Fred Dixon
066749e4ca Updated text for logout message: 2016-01-19 08:57:34 -05:00
Fred Dixon
3e153efe5f Merge pull request #2961 from capilkey/chat-audio-cue-cont 
Changes to the chat audio cue control
 2016-01-18 18:07:54 -05:00
Oleksandr Zhurbenko
edfaf08757 Typo left after switching to ES6 2016-01-18 11:49:53 -08:00
Oleksandr Zhurbenko
7c56af1f16 Removed callingLocation from BBB.getCurrentSlide 2016-01-18 11:48:36 -08:00
Chad Pilkey
c7f88fd180 made the chat audio cue usable by all users 2016-01-18 11:15:16 -08:00
Fred Dixon
62cd8e2353 Merge pull request #2959 from ffdixon/more-checks-in-bbb-conf 
Added more checks in bbb-conf --check
 2016-01-17 16:59:25 -05:00
Fred Dixon
28e34b041e Added more checks in bbb-conf --check 2016-01-17 16:58:29 -05:00
Fred Dixon
37d2a18845 Merge pull request #2954 from ffdixon/fix-enablewebrtc 
Fix syntax error in bbb-conf
 2016-01-15 14:39:17 -05:00
Fred Dixon
58c2dbdaf9 Fix syntax error in bbb-conf 2016-01-15 14:38:02 -05:00
Fred Dixon
d64f0f7650 Merge pull request #2953 from ffdixon/fix-enablewebrtc 
Made bbb-conf --enablewebrtc aware of SSL configuration
 2016-01-15 14:19:52 -05:00
Fred Dixon
7fae413641 Made bbb-conf --enablewebrtc aware of SSL configuration 2016-01-15 14:18:23 -05:00
Chad Pilkey
f08f38f6d3 Merge pull request #2949 from capilkey/webrtc-reconnect 
Reduce WebRTC reconnect attempts
 2016-01-15 12:10:33 -05:00
Anton Georgiev
129db8daf4 Merge pull request #2950 from gthacoder/meteor-client-es6 
HTML5 client: move to ES6.
 2016-01-15 11:44:30 -05:00
Maxim Khlobystov
ec8c1f83ab Fixed a small typo. 2016-01-15 11:41:16 -05:00
Maxim Khlobystov
cc6ffe15df Got all the single-line comments back. 2016-01-15 00:46:41 -05:00
Fred Dixon
2fd4248501 Merge pull request #2952 from ffdixon/update-config-ssl-port 
Added check for displaying 443 ssl port when doing bbb-conf --check
 2016-01-14 18:52:33 -05:00
Fred Dixon
f7294d30d3 Added check for displaying 443 ssl port when doing bbb-conf --check 2016-01-14 18:51:38 -05:00
jfederico
52b171584f bbb-web: Added WebXmlConfig.groovy in order to remove warning on plugins:webxml:1.4.1 
https://grails.org/plugin/webxml
 2016-01-14 16:33:16 -05:00
jfederico
e47c1895a8 bbb-web: Removed non used plugin (jquery) and updated the other plugins for eliminating WARNING messages 2016-01-14 16:05:25 -05:00
Richard Alam
73d00517cf Merge branch 'pedrobmarin-reconnect-fixes' 2016-01-14 20:13:08 +00:00
Richard Alam
e58b527c0f - remove println 2016-01-14 20:08:36 +00:00
Richard Alam
d79d763857 Merge branch 'reconnect-fixes' of https://github.com/pedrobmarin/bigbluebutton into pedrobmarin-reconnect-fixes 2016-01-14 19:43:08 +00:00
LucasMFreire
9c099aeb67 Fixed unclosed video windows bug 2016-01-14 14:59:13 -02:00
Maxim Khlobystov
a844cb9356 Started using ES2015 inheritance for the whiteboard models instead of the auxiliary function created by the transpiler. 2016-01-13 18:30:58 -05:00
Chad Pilkey
1bc100f4c7 reduced webrtc retry attempts from 5 to 3 2016-01-13 13:05:22 -08:00
Chad Pilkey
008d59c85d Merge pull request #2947 from mconf/webrtc-reconnect 
WebRTC reconnect
 2016-01-13 15:25:33 -05:00
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
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