Commit Graph

11913 Commits

Author SHA1 Message Date
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
jfederico
3265709455 bigbluebutton-web: Extended getRecordings for making direct searches based on recordID(s) 2016-01-21 15:24:22 -05:00
Oleksandr Zhurbenko
f287f5f4cb Simply updating data in the Slides collection instead of removing and adding whole objects 2016-01-21 10:29:18 -08: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
jfederico
65a2b6d16c bigbluebutton-web: Implemented the new state [deleted] for recordings 2016-01-21 11:12:33 -05:00
Oleksandr Zhurbenko
8d18271579 Enabling whiteboard helpers 2016-01-20 16:41:05 -08: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
Oleksandr Zhurbenko
5c9b42fb0f Removed the duplicated call of the displayThisSlide() 2016-01-19 15:04:00 -08:00
jfederico
ca88c05dde bigbluebutton-web: corrected identation to RecordingService.java 2016-01-19 15:50:12 -05:00
jfederico
2abb0acbc1 bigbluebutton-web: Updated state when recording is published/unpublished 2016-01-19 15:39:10 -05:00
jfederico
91b0e54600 bigbluebutton-web: RecordingService process a new directory 'deleted' that represents a new state for processed recordings 2016-01-19 15:19:36 -05:00
jfederico
334d4e4beb bigbluebutton-web: Added state to xml responded by getRecordings 2016-01-19 15:16:45 -05:00
jfederico
67a70ccbc3 bigbluebutton-web: Reformatted code in apiController 2016-01-19 15:15:18 -05:00
jfederico
374982254e bigbluebutton-web: Modified Config.groovy to allow log messages from controllers and services to be shown 2016-01-19 15:02:39 -05:00
jfederico
371557ecb4 recording-and-playback: Added directory to be cleaned up for deleted status 2016-01-19 14:57:30 -05:00
jfederico
8e3c0ea983 recording-and-playback: Changed initial state on recording metadata.xml to published 2016-01-19 14:53:33 -05:00
jfederico
8bc75ab2f6 recording-and-playback: Converted tabs to spaces on presentation/scripts/* and core/scripts/*
Signed-off-by: jfederico <jesus@123it.ca>
2016-01-19 14:52:28 -05: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
LucasMFreire
2af1fb4727 added lockOnJoin and lockOnJoinConfigurable 2016-01-19 15:49:07 -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
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
LucasMFreire
02203ff56d changed user status to bbb 1.0 implementation 2016-01-18 16:54:51 -02: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