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

12204 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
c3de0a9cde Merge pull request #2976 from bigbluebutton/ffdixon-fix-api-link 
Update demo_footer.jsp with correct link to API docs
 2016-01-25 07:45:42 -05:00
Fred Dixon
941caa06d5 Update demo_footer.jsp 2016-01-25 07:45:18 -05:00
Chad Pilkey
416cbbf7bc Merge pull request #2973 from capilkey/1.0-minor-fixes 
Minor UI changes for the Flash client
 2016-01-22 19:25:19 -05:00
Chad Pilkey
d90643fc77 update the client copyright to 2016 2016-01-22 16:12:54 -08:00
Chad Pilkey
f7f6d81a37 shorten the copyright string in the client footer 2016-01-22 15:53:16 -08:00
Chad Pilkey
4062aa02db significantly reduce the volume of the chat audio cue 2016-01-22 15:02:12 -08:00
Chad Pilkey
a2203ad5e6 unbold the lock settings categories in the popup 2016-01-22 14:52:45 -08:00
Chad Pilkey
d34616d3d2 add separation between chat time and border 2016-01-22 14:50:10 -08:00
Chad Pilkey
75cb6b66cc Merge pull request #2969 from tdj-br/master 
Fixes #2768
 2016-01-22 16:41:14 -05:00
Richard Alam
3273912bd1 Merge pull request #2968 from ritzalam/expire-redis-keys-after-14-days 
Expire redis keys after 14 days
 2016-01-22 14:29:25 -05:00
Richard Alam
5c882386cd Merge pull request #2972 from pedrobmarin/issue-2851 
Avoid scala warning messages
 2016-01-22 14:14:37 -05:00
Pedro Beschorner Marin
8890f46910 - avoid scala warning messages 2016-01-22 19:00:50 +00:00
Richard Alam
78cfccab18 Merge pull request #2971 from pedrobmarin/issue-2851 
Simple modification to avoid multiple start audio recording events
 2016-01-22 13:38:12 -05:00
Pedro Beschorner Marin
086e339653 Simple modification to avoid multiple start audio recording events 2016-01-22 16:43:17 +00:00
Tiago Daniel Jacobs
fc728bf1be Fixes #2768 2016-01-21 22:56:48 -02:00
Richard Alam
5c812984ad Merge pull request #2967 from ritzalam/improve-pdf2swf-conversion 
Improve pdf2swf conversion
 2016-01-21 15:59:10 -05:00
Richard Alam
f501fb5803 - expire redis recording keys after 14 days 2016-01-21 20:43:28 +00:00
Richard Alam
6956ddf723 - do not record events if the meeting is not recorded 2016-01-21 20:42:47 +00:00
Richard Alam
e7a46aa3cf - cleanup formatting 2016-01-21 17:31:25 +00:00
Richard Alam
0b898d0d29 - change how we process upload presentation. Before, an uploaded presentation consumes all of the 
presentation conversion threads. If the presentation takes a lot of time and cpu to convert,
   other uploaded presentations gets queued up and cannot be processed in parallel.
 2016-01-21 17:24:13 +00:00
Chad Pilkey
58292b198d Merge pull request #2964 from ritzalam/do-not-reconnect-when-user-kicked 
Do not reconnect when user kicked
 2016-01-20 11:55:49 -05:00
Richard Alam
726e9e1fb0 - change wording on logout window when a user gets kicked out of the meeting. 2016-01-20 15:21:55 +00:00
Felipe Cecagno
a0aff7b3fc Merge pull request #2951 from LucasMFreire/fix-video-windows 
Fixed unclosed video windows bug
 2016-01-19 16:38:56 -02:00
Felipe Cecagno
93620df0b8 implement the same protection we did for publish on view 2016-01-19 16:32:05 -02:00
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
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
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
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