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

13576 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gabriel Carvalho de Campes
eb3705321f polish breakout room code html5 2016-11-14 14:12:54 -02:00
Gabriel Carvalho de Campes
3f53620416 Merge remote-tracking branch 'upstream/master' into breakout-rooms-html5 
* upstream/master: (22 commits)
  - create only one netConnection to bbb-apps. Not re-create one when reconnecting.
  - log client out when user is ejected from meeting.
  - reset connectAttemptTimeout as we don't want to fail connection on reconnects.
  - fix rtmpt
  - add more logging to track issues
  Update Gemfile.lock for 1.1-dev
  - log locale version
  - remove user join log
  improve logs for webrtc events
  - improve client side logging.
  add EN string to ClientStatusEvent
  Updated restart of libreoffice for systemd
  - add log to indicate successful connection to bbb-apss
  bbb-web: Escaped strings used in freemarker template for thumbnails
  record-and-playback: Removed preview extension (thumbnails) from recordings when only has default presentation
  Fix import in stunturn reply handler
  Fix handleStunTurnReply function name
  Clean up before PR
  Rever wrong changes on chat handler parameters
  Revert wrong changes on chat handler name
  ...
 2016-11-14 10:00:42 -02:00
Gabriel Carvalho de Campes
39dffd68b4 Update breakout rooms in html5 2016-11-14 09:57:10 -02:00
Richard Alam
27eac5faec Merge pull request #3462 from ritzalam/improve-client-logging 
- create only one netConnection to bbb-apps. Not re-create one when …
 2016-11-11 17:40:35 -05:00
Richard Alam
d88ec9c0e6 - create only one netConnection to bbb-apps. Not re-create one when reconnecting. 2016-11-11 22:37:14 +00:00
Richard Alam
1ef6ce8170 Merge pull request #3461 from ritzalam/improve-client-logging 
- log client out when user is ejected from meeting.
 2016-11-11 17:21:21 -05:00
Richard Alam
3ff537cff6 - log client out when user is ejected from meeting. 2016-11-11 22:19:52 +00:00
Richard Alam
fa4fcae71c Merge pull request #3458 from ritzalam/improve-client-logging 
- reset connectAttemptTimeout as we don't want to fail connection on…
 2016-11-11 13:47:54 -05:00
Richard Alam
3f399302ab - reset connectAttemptTimeout as we don't want to fail connection on reconnects. 2016-11-11 18:32:46 +00:00
Fred Dixon
0b9fc8b143 Merge pull request #3434 from kepstin/recording-cleanup 
RnP: Improve error handling in video_info, audio_info functions
 2016-11-11 12:14:55 -05:00
Richard Alam
57e9bcf292 Merge pull request #3457 from ritzalam/improve-client-logging 
- fix rtmpt
 2016-11-11 11:53:02 -05:00
Richard Alam
eaa778afe5 - fix rtmpt 2016-11-11 16:51:37 +00:00
Richard Alam
01a698090c Merge pull request #3455 from ritzalam/improve-client-logging 
- add more logging to track issues
 2016-11-10 17:36:46 -05:00
Richard Alam
fa16d266b9 - add more logging to track issues 2016-11-10 22:35:06 +00:00
Fred Dixon
2305d44c04 Merge pull request #3454 from ffdixon/update-Gemfile-lock 
Update Gemfile.lock for 1.1-dev
 2016-11-10 11:07:15 -05:00
Fred Dixon
8b0a3dff50 Update Gemfile.lock for 1.1-dev 2016-11-10 10:03:17 -06:00
Richard Alam
0ffb7f251a Merge pull request #3452 from ritzalam/improve-client-logging 
- log locale version
 2016-11-09 17:28:07 -05:00
Richard Alam
453882f91f - log locale version 2016-11-09 22:23:11 +00:00
Richard Alam
437e0b86e9 Merge pull request #3451 from ritzalam/improve-client-logging 
- remove user join log
 2016-11-09 16:56:21 -05:00
Richard Alam
95e5f78e1b - remove user join log 2016-11-09 21:54:03 +00:00
Richard Alam
99a2d239d7 Merge pull request #3450 from antobinary/nginx-logging3 
Add an i18n agnostic field for client logging
 2016-11-09 16:03:48 -05:00
Anton Georgiev
126312ca66 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into nginx-logging3 2016-11-09 20:55:34 +00:00
Anton Georgiev
e5b791073d improve logs for webrtc events 2016-11-09 20:42:56 +00:00
Richard Alam
9600c8434a Merge pull request #3449 from ritzalam/improve-client-logging 
- improve client side logging.
 2016-11-09 15:38:59 -05:00
Richard Alam
5d6a33bdff - improve client side logging. 2016-11-09 20:35:58 +00:00
Anton Georgiev
f05f594f2d add EN string to ClientStatusEvent 2016-11-09 19:27:00 +00:00
Fred Dixon
5b63f07fb5 Merge pull request #3448 from ffdixon/restart-libreoffice-daily 
Updated restart of libreoffice for systemd
 2016-11-08 18:56:30 -05:00
Fred Dixon
9f96f6883f Updated restart of libreoffice for systemd 2016-11-08 17:55:44 -06:00
Richard Alam
c0124957ec Merge pull request #3447 from ritzalam/add-connect-success-log 
- add log to indicate successful connection to bbb-apps
 2016-11-08 17:02:56 -05:00
Richard Alam
934de7e563 - add log to indicate successful connection to bbb-apss 2016-11-08 21:42:36 +00:00
Richard Alam
ef2d2fc4aa Merge pull request #3444 from jfederico/extension_preview_escaped_thumbnail_xml_response 
bbb-web: Escaped strings used in freemarker template for thumbnails
 2016-11-08 11:43:28 -05:00
Fred Dixon
4001f73144 Merge pull request #3443 from jfederico/extension_preview_no_thumbnails_for_default 
record-and-playback: No thumbnails for default presentation
 2016-11-07 19:08:54 -05:00
jfederico
dd1fb9e6ac bbb-web: Escaped strings used in freemarker template for thumbnails 2016-11-07 18:55:27 +00:00
jfederico
737697968c record-and-playback: Removed preview extension (thumbnails) from recordings when only has default presentation 2016-11-07 18:50:28 +00:00
Anton Georgiev
4efad507cd Merge pull request #3425 from oswaldoacauan/refactor-meetings-api 
[HTML5] Refactor of Meetings API
 2016-11-07 11:59:07 -05:00
Gabriel Carvalho de Campes
0021a9619c Merge remote-tracking branch 'upstream/master' into breakout-rooms-html5 
* upstream/master:
  Update config.xml.template
  Remove /tmp/tmp.XXXXXXXX file created by bbb-record
  remove some unnecessary logging
  Fixed stream to streams
  - updating latest locales except for zh_TW as it's failing to compile.
  Move client breakout rooms configuration to a new node and added a new option to enable/disbale recordings for breakout rooms.
  record-and-playback: Encoded text coming from the slide for being used in thumbnails
  Format line in bbb-conf using spaces.
  bbb-conf stops and starts redis server & checks video and freeswitch recordings directories
 2016-11-07 13:53:04 -02:00
Gabriel Carvalho de Campes
a262430871 Add code to handle breakout rooms in html5 2016-11-07 13:52:39 -02:00
Fred Dixon
a6deb821a4 Update config.xml.template 2016-11-04 15:41:01 -04:00
Fred Dixon
258bcc1241 Merge pull request #3432 from riadvice/breakout-room-recording-option 
Added flag to config.xml to enable/disable the visibility of the Record option
 2016-11-04 15:37:46 -04:00
Fred Dixon
346161a8dc Merge pull request #3440 from ffdixon/rm-temp-file 
Remove /tmp/tmp.XXXXXXXX file created by bbb-record
 2016-11-04 13:06:13 -04:00
Fred Dixon
ad8a12923f Remove /tmp/tmp.XXXXXXXX file created by bbb-record 2016-11-04 12:05:41 -05:00
Fred Dixon
cf1e0de3d2 Merge pull request #3439 from antobinary/new-master 
Remove some unnecessary logging
 2016-11-04 12:56:50 -04:00
Anton Georgiev
d4e0494be0 remove some unnecessary logging 2016-11-04 16:11:16 +00:00
Fred Dixon
38c724afac Merge pull request #3438 from ffdixon/fix-directory-streams-bbb-config 
Fixed stream to streams (syntax error in bbb-config)
 2016-11-04 12:10:20 -04:00
Fred Dixon
48b5cf89fe Fixed stream to streams 2016-11-04 11:09:34 -05:00
Richard Alam
316b7d69b5 Merge pull request #3437 from ritzalam/update-latest-locales-from-transifex 
- updating latest locales except for zh_TW as it's failing to compile.
 2016-11-04 11:50:55 -04:00
Richard Alam
c6684ca2f6 - updating latest locales except for zh_TW as it's failing to compile. 2016-11-04 15:47:31 +00:00
Oswaldo Acauan
41f06644c2 Fix import in stunturn reply handler 2016-11-03 17:23:00 +00:00
Oswaldo Acauan
6a8f997b00 Fix handleStunTurnReply function name 2016-11-03 13:35:05 +00:00
Oswaldo Acauan
71fb7abd70 Refactor stuns/turns handler 2016-11-03 13:33:14 +00:00