Ghazi Triki
|
d1c765e614
|
Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into webcams-only-for-moderator-on-off
|
2018-01-08 19:33:23 +01:00 |
|
Richard Alam
|
02736382f6
|
Merge pull request #4868 from riadvice/2.0-ui-fixes
Fix toolbar components alignment and localisation update
|
2018-01-08 10:19:55 -08:00 |
|
Richard Alam
|
9b64e3d2a3
|
Merge pull request #4916 from riadvice/alphabetise-private-chat-users
Sort private chat users alphabetically.
|
2018-01-08 10:19:24 -08:00 |
|
Richard Alam
|
b93a95ca8e
|
Merge pull request #4896 from prlanzarin/flash-webcam-fix
Ghost flash webcams fix
|
2018-01-08 10:18:52 -08:00 |
|
Anton Georgiev
|
0d79e006b7
|
Merge pull request #4914 from OZhurbenko/switch-to-meteor-settings
Moved settings away from a broken 4commerce:env-settings package
|
2018-01-08 16:08:26 -02:00 |
|
Ghazi Triki
|
a7354c5be7
|
Sort private chat users alphabetically.
|
2018-01-08 16:58:17 +01:00 |
|
Oleksandr Zhurbenko
|
ce1f40ac9a
|
Updated Meteor to 1.6.0.1
|
2018-01-07 22:17:18 -08:00 |
|
Oleksandr Zhurbenko
|
962e659378
|
Switched the components from deprecated method to
|
2018-01-07 20:44:42 -08:00 |
|
Oleksandr Zhurbenko
|
2de02c4f8d
|
Linting
|
2018-01-07 16:25:56 -08:00 |
|
Oleksandr Zhurbenko
|
4af6d30f6a
|
Switched from the broken 4commerce:env-settings package to native Meteor.settings
|
2018-01-07 16:24:05 -08:00 |
|
Ghazi Triki
|
36f02e8528
|
Request webcamsOnlyForModerator value at user enter success.
|
2018-01-07 22:24:54 +01:00 |
|
Ghazi Triki
|
8129f67879
|
Add missing class SetWebcamsOnlyForModeratorEvent.
|
2018-01-07 16:46:16 +01:00 |
|
Ghazi Triki
|
38ab186b53
|
Change webcamsOnlyForModerator property and handle saving it in server and client.
|
2018-01-07 16:45:24 +01:00 |
|
Augusto Bennemann
|
e2ef3281ec
|
Localize video and screnshare error messages
|
2018-01-05 19:43:53 +00:00 |
|
Augusto Bennemann
|
67cb4b073b
|
Error notifications for video and screenshare
|
2018-01-05 17:16:46 +00:00 |
|
prlanzarin
|
b3566755ef
|
Removed *sw* entry from .gitignore
|
2018-01-04 20:26:10 +00:00 |
|
prlanzarin
|
7f06664711
|
Refactored the flash webcam pattern checking
|
2018-01-04 20:25:22 +00:00 |
|
prlanzarin
|
dfb5170e5d
|
Finished filtering out HTML5 and Flash webcams using stream name patterns
|
2018-01-04 16:24:50 +00:00 |
|
Anton Georgiev
|
d22a6d5a96
|
Merge pull request #4883 from OZhurbenko/fix-issue-4863
Updated the message displayed to the kicked user
|
2018-01-04 14:20:00 -02:00 |
|
Anton Georgiev
|
850ac870e9
|
Merge pull request #4884 from OZhurbenko/fix-issue-4715
Updated the html5 client's font to use the latest icons
|
2018-01-04 13:30:36 -02:00 |
|
Anton Georgiev
|
a00487cc75
|
Merge pull request #4740 from Tainan404/fix-dropdown-bug
Fix user list dropdown bug when making user presenter.
|
2018-01-03 19:40:49 -02:00 |
|
Anton Georgiev
|
34a503b218
|
Merge pull request #4624 from Tainan404/toast-breakout-ends
[HTML5] show audio modal and toast notification when breakout room ends
|
2018-01-03 19:11:27 -02:00 |
|
Oleksandr Zhurbenko
|
b3ceb4d5f6
|
Updated the html5 client's font to use the latest icons
Fixes #4715
|
2018-01-03 12:35:01 -08:00 |
|
Oleksandr Zhurbenko
|
d8533a86b3
|
Changed the message displayed to the kicked user
Fixes #4863
|
2018-01-03 12:25:13 -08:00 |
|
KDSBrowne
|
3fd964d3ca
|
remove import not being used
|
2018-01-03 09:04:28 -08:00 |
|
KDSBrowne
|
ed3d58f0f2
|
Merge remote-tracking branch 'upstream/v2.0.x-release' into x.0.3-fix-console-warnings
|
2018-01-03 08:56:22 -08:00 |
|
Anton Georgiev
|
830627ea0c
|
Merge pull request #4831 from OZhurbenko/presenter-functionality-2x
Improved Whiteboard toolbar's user experience
|
2018-01-03 14:47:02 -02:00 |
|
Anton Georgiev
|
5debc39362
|
Merge pull request #4818 from antobinary/fix-ios-audio
Add permissionLayout location for Safari
|
2018-01-03 14:46:19 -02:00 |
|
Anton Georgiev
|
f0e15af607
|
Merge pull request #4814 from oswaldoacauan/issue-4812
Simplify authentication code/flow and Add subscriptions error handling
|
2018-01-03 14:45:38 -02:00 |
|
Fred Dixon
|
3997caaccd
|
Merge pull request #4871 from riadvice/breakout-room-fix-v2.0
Disable private chat for breakout rooms
|
2017-12-30 10:43:32 -04:00 |
|
Ghazi Triki
|
cc2f2708e3
|
Add a new configuration option privateChateEnabled for breakout rooms.
|
2017-12-29 15:51:35 +01:00 |
|
Ghazi Triki
|
2147f8e454
|
Disable private chat in breakout rooms.
|
2017-12-29 09:44:30 +01:00 |
|
Ghazi Triki
|
4bf5a26ecf
|
Fix setters in Meeting.java
|
2017-12-29 09:44:16 +01:00 |
|
Ghazi Triki
|
c922841020
|
Fix toolbar components alignment and localisation update.
|
2017-12-25 15:31:26 +01:00 |
|
Oleksandr Zhurbenko
|
6c9af5c2ed
|
Merge pull request #4867 from lfzawacki/bbb-webrtc-sfu
Fix problem when building HTML5 screenshare + video PR
|
2017-12-22 16:42:07 -05:00 |
|
Lucas Zawacki
|
2e323c809a
|
Put rid dependency in production part of package.json
|
2017-12-22 18:46:00 -02:00 |
|
Richard Alam
|
f108ecb1d8
|
Merge pull request #4866 from antobinary/test-4661
Adjust Meeting structure to contain new property muteOnStart
|
2017-12-22 12:27:03 -08:00 |
|
Anton Georgiev
|
c9379eaa0f
|
add muteOnStart param in Meeting structure
|
2017-12-22 15:22:24 -05:00 |
|
prlanzarin
|
02a46387e0
|
Filter out html5 cameras from flash client
|
2017-12-22 19:25:25 +00:00 |
|
prlanzarin
|
3f8e7c308c
|
Revert "Added checking for HTML5 webcams"
This reverts commit 51b62ed30d.
|
2017-12-22 18:30:40 +00:00 |
|
Lucas
|
abd2c41d64
|
Merge pull request #93 from lfzawacki/html5-development
Put rid dependency in production part of package.json
|
2017-12-22 16:21:04 -02:00 |
|
Lucas Zawacki
|
3641a5713f
|
Put rid dependency in production part of package.json
|
2017-12-22 16:17:21 -02:00 |
|
Anton Georgiev
|
61c12298e2
|
Merge pull request #4661 from prlanzarin/bbb-webrtc-sfu
Add support for WebRTC screensharing into Flash/HTML5 and WebRTC video into HTML5
|
2017-12-22 14:43:38 -02:00 |
|
Anton Georgiev
|
0515166405
|
Merge branch 'bbb-webrtc-sfu' of github.com:prlanzarin/bigbluebutton-1 into test-4661
|
2017-12-22 10:54:46 -05:00 |
|
Paulo Lanzarin
|
761cdfaedd
|
Merge pull request #92 from prlanzarin/video-reconnection
Ghost webcams and merging with upstream
|
2017-12-22 10:55:24 -02:00 |
|
prlanzarin
|
31fb95bf72
|
Removed wrong video peer stop procedure and reset the kurento.yaml config file
|
2017-12-22 12:30:24 +00:00 |
|
Richard Alam
|
3264f8a7d5
|
Merge branch 'capilkey-breakout-room-closing-warning' into v2.0.x-release
|
2017-12-21 13:13:28 -08:00 |
|
Richard Alam
|
763c2c51c0
|
- remove trace log
|
2017-12-21 13:12:58 -08:00 |
|
Richard Alam
|
becf60b389
|
Merge branch 'breakout-room-closing-warning' of https://github.com/capilkey/bigbluebutton into capilkey-breakout-room-closing-warning
|
2017-12-21 12:52:50 -08:00 |
|
Chad Pilkey
|
5b367f6101
|
add a minute warning when breakout rooms are going to close
|
2017-12-21 15:13:52 -05:00 |
|