Commit Graph

19203 Commits

Author SHA1 Message Date
Maxim Khlobystov
fac7111cfd Updated the screenshots. 2018-01-10 11:37:18 -05:00
Maxim Khlobystov
b09996b896 Started using lodash to merge the wdio config files in favour of deepmerge. 2018-01-09 17:13:48 -05:00
Maxim Khlobystov
927a2bf005 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into selenium-visual-regression 2018-01-09 15:38:29 -05:00
Maxim Khlobystov
2acc4a19d4 Committing the screenshots. 2018-01-09 12:10:29 -05:00
Maxim Khlobystov
248db82e59 Cleanup + added temporary desktop-only testing command. 2018-01-09 11:36:21 -05:00
Richard Alam
68a4dce92e
Merge pull request #4922 from ritzalam/mute-on-start
- fix issue where muteOnStart doesn't work when set in bigbluebutton…
2018-01-09 07:47:49 -08:00
Richard Alam
e9df643af4 - fix issue where muteOnStart doesn't work when set in bigbluebutton.properties 2018-01-09 07:46:16 -08:00
Anton Georgiev
0c8be1cc0b
Merge pull request #4833 from KDSBrowne/x.0.4-ios-hide-fullscreen
Hide fullscreen option for iOS devices
2018-01-09 13:29:53 -02:00
Anton Georgiev
980a6490ec
Merge pull request #4832 from KDSBrowne/x.0.3-fix-console-warnings
Fix Invalid prop 'children[2]' supplied to `DropdownList`
2018-01-09 13:28:17 -02:00
Maxim Khlobystov
9ebc82d29f Committing additional test specs. 2018-01-08 21:43:34 -05:00
Anton Georgiev
0392634f57
Merge pull request #4841 from MaximKhlobystov/reopen-private-chat-bug
[HTML5 Client] Fix for reopening private chat after using X button
2018-01-08 18:42:36 -02:00
Anton Georgiev
415a8ec5df
Merge pull request #4915 from OZhurbenko/update-meteor-16
Updated Meteor to 1.6.0.1
2018-01-08 18:39:16 -02: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
Maxim Khlobystov
57f2c64ecd Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into selenium-visual-regression 2018-01-08 10:57:19 -05: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
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
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
prlanzarin
31fb95bf72 Removed wrong video peer stop procedure and reset the kurento.yaml config file 2017-12-22 12:30:24 +00:00