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 |
|
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 |
|
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
|
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 |
|
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 |
|
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 |
|
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 |
|
KDSBrowne
|
2296a122f5
|
Actions button only available to Presentor
|
2016-11-07 10:19:00 -08: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 |
|
Anton Georgiev
|
d1dfdf4738
|
Merge branch 'refactor-meetings-api' of github.com:oswaldoacauan/bigbluebutton into test-meetings-api
|
2016-11-07 16:52:51 +00:00 |
|
Fred Dixon
|
a6deb821a4
|
Update config.xml.template
|
2016-11-04 15:41:01 -04:00 |
|