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

13815 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
KDSBrowne
3359ec499a clean up 2016-11-15 08:22:05 -08:00
Anton Georgiev
9b3b28129f fix slide switching (typo) 2016-11-15 16:19:33 +00:00
Anton Georgiev
1cff965131 Merge branch 'Action-Options-Availability' of github.com:KDSBrowne/bigbluebutton into merge-pr-kert-1 2016-11-15 16:09:47 +00:00
KDSBrowne
cba6e75735 cleaning up 2016-11-14 18:48:56 -08:00
Anton Georgiev
61db3f30b3 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton 2016-11-14 22:26:33 +00:00
Anton Georgiev
0598591fc7 remove reference to undef 2016-11-14 22:24:24 +00:00
JaeeunCho
909862e44c HTML5-clent messages on chat - changed icon for logged out users 2016-11-14 14:18:25 -08:00
Anton Georgiev
3a141dcadd resolve browser warning 2016-11-14 21:41:25 +00:00
Anton Georgiev
8a377e0a18 adjust name of resource + function 2016-11-14 21:40:50 +00:00
Anton Georgiev
74cf17e812 Merge branch 'refactor-poll-api' of github.com:Gcampes/bigbluebutton into merge-osw-pr-1 2016-11-14 21:31:21 +00:00
Anton Georgiev
a4f3836c7b Merge pull request #3459 from oswaldoacauan/refactor-api-presentation-slides 
[HTML5] Refactor of Presentations & Slides API's
 2016-11-14 15:58:30 -05:00
JaeeunCho
3e04e716f5 Merge remote-tracking branch 'upstream/master' into messages_v1 2016-11-14 12:37:16 -08:00
Anton Georgiev
b3596f7346 Merge branch 'refactor-api-presentation-slides' of github.com:oswaldoacauan/bigbluebutton into merge-osw-pr-1 2016-11-14 20:05:45 +00:00
Gabriel Carvalho de Campes
caabead5e0 Removes unused code 2016-11-14 16:25:23 -02:00
Gabriel Carvalho de Campes
694e300d55 Polish breakout code 2016-11-14 16:23:04 -02:00
Gabriel Carvalho de Campes
27a8223efc fix .meteor changes 2016-11-14 14:57:39 -02:00
Gabriel Carvalho de Campes
214357adc6 Fix conflicts 2016-11-14 14:54:04 -02:00
Gabriel Carvalho de Campes
4b489df410 update html en locale for breakout rooms 2016-11-14 14:42:09 -02:00
Gabriel Carvalho de Campes
cf7ec18033 revert changes to meteor modules 2016-11-14 14:13:56 -02:00
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
Matthew Marangoni
807f434d72 fixed an error with exit audio 2016-11-11 14:11:00 -08:00
Matthew Marangoni
482fc97388 Added mute/unmute/join listen only/leave audio features to join audio modal 2016-11-11 13:09:34 -08:00
Oswaldo Acauan
1df46bb201 Refactor of Presentations API 2016-11-11 19:02:46 +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
Oswaldo Acauan
2cf4bd3f5a Merge conflicts 2016-11-10 15:13:02 +00: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