Richard Alam
8f6213b77d
- upgrade to latest red5
2016-11-22 20:45:58 +00:00
Richard Alam
faa2e35307
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into upgrade-red5-nov-22-2016-snapshot
2016-11-22 15:59:55 +00:00
Richard Alam
3ead2b449b
- minor formatting from IDE
2016-11-22 15:59:05 +00:00
Richard Alam
550d8c5337
Merge pull request #3477 from kepstin/video-info-typo
...
Fix typo in recording sanity script.
2016-11-21 15:31:59 -05:00
Richard Alam
09b5d7dc3c
Merge pull request #3478 from ritzalam/remove-executor-in-transcoder
...
- do not use another thread to do the transcoding. The thread doesn'…
2016-11-21 15:19:34 -05:00
Richard Alam
9f383c9799
- do not use another thread to do the transcoding. The thread doesn't get cleaned up when the call ends
...
and the thread is waiting for packet in the queue. I am noticing a lot of threads hanging around
in Yourkit from the mem dump. Not sure if this is contributing to OOM.
2016-11-21 20:14:47 +00:00
Calvin Walton
bd8baed660
Fix typo in recording sanity script.
...
This caused it to think all video files were corrupt.
2016-11-21 15:01:54 -05:00
Anton Georgiev
924eaa17c3
Merge pull request #3445 from KDSBrowne/Lock-Settings-Availability
...
Lock settings available to Presenter/Moderator
2016-11-21 14:07:11 -05:00
Anton Georgiev
ba7e69333c
Merge pull request #3475 from oswaldoacauan/refactor-api-shapes
...
[HTML5] Refactor API Shapes (whiteboard)
2016-11-21 13:38:03 -05:00
Oswaldo Acauan
bf99bb50d4
Clear shapes after clearing an presentation
2016-11-21 16:04:42 +00:00
KDSBrowne
2e3407e128
clean up - more readable
2016-11-21 06:32:12 -08:00
KDSBrowne
4dd268e25a
added new suggestions
2016-11-18 21:28:01 -08:00
Anton Georgiev
c98813e7b3
Merge pull request #3460 from mmarangoni/html5-stun-audio
...
Mute, Unmute, Leave Audio
2016-11-18 17:03:13 -05:00
Matthew Marangoni
c9221c94f3
removed unecessary import statements
2016-11-18 13:35:02 -08:00
Matthew Marangoni
aa65afffa4
adjusted to meet component/container structure conventions and simplify code
2016-11-18 13:24:59 -08:00
Oswaldo Acauan
4fe83bf79d
Refactor Shapes API
2016-11-18 17:59:11 +00:00
Oswaldo Acauan
b0e784ec60
Merge remote-tracking branch 'upstream/master' into refactor-api-shapes
...
* upstream/master:
Remove wrong commited files
Refactor API Cursor's
2016-11-18 17:35:53 +00:00
Oswaldo Acauan
529ff51a72
Refactor Shapes API
2016-11-18 17:35:28 +00:00
Anton Georgiev
9974763bc9
Merge pull request #3473 from oswaldoacauan/refactor-api-cursor
...
[HTML5] Refactor API Cursor's
2016-11-18 11:10:45 -05:00
Oswaldo Acauan
e932bb88fd
Remove wrong commited files
2016-11-18 12:28:55 +00:00
Oswaldo Acauan
b4f9d88fac
Refactor API Cursor's
2016-11-18 12:26:14 +00:00
Anton Georgiev
e644576063
Merge pull request #3435 from JaeeunCho/messages_v1
...
HTML5-client : fixed messages from the logged out users on public-chat
2016-11-17 16:03:51 -05:00
Anton Georgiev
414ac02ca7
Merge pull request #3471 from oswaldoacauan/fix-presentation-api
...
[HTML5] Fix bug related to presentation handlers
2016-11-17 16:03:36 -05:00
KDSBrowne
bdcc8b9bd6
added new suggestions, need to fix console warning
2016-11-17 12:10:05 -08:00
Oswaldo Acauan
15f59f9781
Fix bug related to presentation handlers
2016-11-17 15:54:24 +00:00
KDSBrowne
6f1680318c
update
2016-11-16 07:15:17 -08:00
Anton Georgiev
b219d21dd0
Merge pull request #3468 from capilkey/1.1-fix-webrtc-error-logging
...
Fix exception in webrtc error logging
2016-11-15 18:32:57 -05:00
Chad Pilkey
cb77ada8f2
fix exception in webrtc error logging
2016-11-15 18:26:36 -05:00
Richard Alam
ee8d7ea504
Merge pull request #3467 from antobinary/heap-monitor
...
Add JVM Heap monitor in bbb-apps
2016-11-15 17:54:47 -05:00
Anton Georgiev
b6cff88bfe
change frequency of heap monitor to 60sec
2016-11-15 22:51:39 +00:00
Anton Georgiev
8726ec2914
add JVM Heap monitor updated every 5 sec
2016-11-15 22:42:10 +00:00
Matthew Marangoni
0abcc06bfc
linting fixes & updated based on feedback
2016-11-15 13:00:28 -08:00
Anton Georgiev
f0a18f6210
improve dropdown slide switch to pass a number, not string so server checks pass
2016-11-15 16:30:13 +00:00
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
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
