gcampes
9f478416c5
Fix html changing the breakout room url for flash
2016-11-18 15:14:00 -02: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
jfederico
96c8109732
bbb-web: Fix bug that was breaking getRecordings in test-install
2016-11-17 16:39:03 -05: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
jfederico
161cab8234
record-and-playback: Fixed issue with text gathered from slids used on preview
2016-11-17 15:59:07 -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
Gabriel Carvalho de Campes
7cdf04dd66
update clear for meetings, adds breakouts
2016-11-17 13:20:40 -02:00
Ghazi Triki
40e16b0002
Use local context instead of the global context for scheduleOnce.
2016-11-17 14:12:41 +01:00
Ghazi Triki
727a671b55
Update schedule period of MonitorNumberOfWebUsers.
2016-11-17 12:12:17 +01:00
Ghazi Triki
ab9f85b852
Delay sending DisconnectAllUsers at EndMeeting handler in akka-bbb-apps to avoid a synchronisation issue noticed when users are streaming using RTMPT.
2016-11-17 11:16:14 +01:00
Gabriel Carvalho de Campes
f9cc5d5873
remove debug code
2016-11-16 15:46:30 -02:00
Gabriel Carvalho de Campes
85013eac1f
Fix issues from merge
2016-11-16 15:44:05 -02:00
Gabriel Carvalho de Campes
dad3c1a4c7
Merge conflicts
2016-11-16 13:35:39 -02: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
Chad Pilkey
b2e621036c
Flex 4: mostly fix chat input and send button ui
2016-11-15 17:49:26 -05: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
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
