Commit Graph

19278 Commits

Author SHA1 Message Date
Anton Georgiev
9b16ae8d51
Merge pull request #4938 from KDSBrowne/z.0.1-mobile-btn-alignmet
Fix alignment of ActionsBar buttons for small screens
2018-01-18 16:34:27 -02:00
Anton Georgiev
9c101b73f2
Merge pull request #4976 from gutobenn/4955-changes
Adjusts on screenshare button and requested changes
2018-01-18 16:33:49 -02:00
KDSBrowne
745f79ba51 make breakpoint range start from 0em 2018-01-18 09:41:52 -08:00
Anton Georgiev
7ee95e3132
Merge pull request #4967 from OZhurbenko/fix-issue-4900
An attempt to fix race condition on resource loading
2018-01-18 13:20:41 -02:00
Fred Dixon
e37e635a70
Merge pull request #4984 from riadvice/chat-messages-style
Display moderator icon next to his name in chat messages
2018-01-17 23:37:20 -05:00
Anton Georgiev
f76b08f281
Merge pull request #4985 from antobinary/change-copyright
Change copyright year in HTML5 client to 2018
2018-01-17 20:40:38 -02:00
Augusto Bennemann
975525fe9b Fix keys usage on actions-dropdown 2018-01-17 19:51:33 -02:00
Anton Georgiev
2ba9433c1d change copyright year to 2018 2018-01-17 16:31:50 -05:00
Ghazi Triki
171db3e0ee Display moderator icon next to his name in chat messages. 2018-01-17 22:02:26 +01:00
Anton Georgiev
9e45091e30
Merge pull request #4980 from KDSBrowne/z.0.4-btn-background-disappear-fix
Edit css to prevent disappearing close btn background
2018-01-17 18:29:03 -02:00
Anton Georgiev
7e4a9eda5d
Merge pull request #4979 from KDSBrowne/z.0.5-style-removedUser-view
Fix broken view styles displayed on error, on meetingEnd and for removed users
2018-01-17 17:45:31 -02:00
Fred Dixon
464e247a4a
Merge pull request #4982 from ffdixon/update-feedback-txt
Tweeked feedback dialog
2018-01-17 13:43:51 -05:00
Fred Dixon
6c36f8dc00 Tweeked feedback dialog 2018-01-17 12:42:17 -06:00
Augusto Bennemann
10cdd603bc Fix null child element 2018-01-17 11:34:35 -02:00
Augusto Bennemann
5bf96b3c84 Screenshare button conditional rendering 2018-01-17 01:17:07 -02:00
Fred Dixon
346d127cf0
Merge pull request #4973 from riadvice/logout-feedback
Implemented "user rating feedback on logout" feature
2018-01-16 15:56:49 -05:00
Ghazi Triki
cf92e1aeef Implemented "user rating feedback on logout" feature. 2018-01-16 20:37:05 +01:00
Augusto Bennemann
90adda6a93 Display either 'start' or 'stop' screenshare button, if screenshare enabled on config 2018-01-16 17:12:41 -02:00
KDSBrowne
644cb4f9b2 fix broken styles on error, on meetingEnd and for removed users 2018-01-16 10:26:57 -08:00
KDSBrowne
cc32e1d2d9 edit css to prevent disappearing background 2018-01-16 09:03:14 -08:00
Anton Georgiev
748ee1279a
Merge pull request #4941 from MaximKhlobystov/mute-button-icon-update-fix
[HTML5 Client] Fix for Mute/Unmute button's icon update.
2018-01-16 14:06:30 -02:00
Augusto Bennemann
7dacdfb04b Changes requested on #4955 2018-01-16 14:04:34 -02:00
Maxim Khlobystov
893067139b Declared the muteHandle variable. 2018-01-16 10:56:31 -05:00
Anton Georgiev
3366bc32b0
Merge pull request #4851 from Tainan404/fix-language-selector
Language selector of the application, each option appears in its native language.
2018-01-16 13:40:03 -02:00
Anton Georgiev
a4d57ac4b6
Merge pull request #4963 from MaximKhlobystov/hangup-audio-userlist-fix
[HTML5 Client] Fix for the issue with users disappearing from userlist when hanging up audio.
2018-01-16 13:39:38 -02:00
Anton Georgiev
5bac8f782a
Merge pull request #4968 from OZhurbenko/fix-issue-4897
Corrected a few labels missed in #4929
2018-01-15 19:18:22 -02:00
Maxim Khlobystov
d9955ae286 Small cleanup. 2018-01-15 16:13:18 -05:00
Maxim Khlobystov
1394984be7 Made the mute/unmute observer work. 2018-01-15 16:01:57 -05:00
Oleksandr Zhurbenko
bb72cb7b65 Adjusted the pull request to the recent changes 2018-01-15 12:59:09 -08:00
Anton Georgiev
455d6f8638
Merge pull request #4929 from OZhurbenko/fix-issue-4897
Changed all the references of "kick" to "remove"
2018-01-15 18:40:48 -02:00
Oleksandr Zhurbenko
f6ed7c3575 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into fix-issue-4897 2018-01-15 12:33:29 -08:00
Oleksandr Zhurbenko
4eb5d278c3 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into fix-issue-4900 2018-01-15 12:22:56 -08:00
Oleksandr Zhurbenko
cf74ca961c Making sure we load all the external libraries before starting the client
Fixes #4900
2018-01-15 12:15:58 -08:00
Fred Dixon
709accb882
Merge pull request #4965 from ffdixon/update-bbb-conf
Update settings-production.json when assigning hostname
2018-01-15 12:33:47 -05:00
Fred Dixon
e6156d90f7 Update settings-production.json when assigning hostname 2018-01-15 11:31:36 -06:00
Maxim Khlobystov
4ee059f381 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into hangup-audio-userlist-fix 2018-01-15 11:47:35 -05:00
Maxim Khlobystov
71c2d16918 Made sure user is removed from userlist only in case of dial-in (not web) users. 2018-01-15 11:47:19 -05:00
Anton Georgiev
1e25a6d4e1
Merge pull request #4955 from prlanzarin/video-upstream-errors
WebRTC media updates
2018-01-15 14:40:53 -02:00
Anton Georgiev
ddfc5e5248
Merge pull request #4846 from Tainan404/fix-settings-mobile
Change modal settings styles.
2018-01-15 13:22:56 -02:00
Fred Dixon
6a1264ec7e
Merge pull request #4957 from riadvice/webcams-only-for-moderator-on-off
Disable webcam button in media column for all users when webcamsOnlyForModerator is on
2018-01-15 07:47:08 -05:00
Ghazi Triki
e89aadb3a6 Disable webcam button in media column for all users when webcamsOnlyForModerator is on. 2018-01-15 12:33:24 +01:00
prlanzarin
acc9650370 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into video-upstream-errors 2018-01-12 21:39:24 +00:00
prlanzarin
f54214c4e1 Merge remote-tracking branch 'mconftec/disable-share-webcam-button' into video-upstream-errors 2018-01-12 21:31:01 +00:00
prlanzarin
8594ce169d Merge remote-tracking branch 'mconftec/fixes-lucas' into video-upstream-errors 2018-01-12 20:02:45 +00:00
Lucas Fialho Zawacki
0d3466a1db Use service joinedVideo in the correct stage of video sharing flow 2018-01-12 19:44:56 +00:00
Lucas Fialho Zawacki
68abf367d0 Prevent errors on html5 video when socket disconnects 2018-01-12 19:37:05 +00:00
Lucas Fialho Zawacki
b6abec579a Better clean up on the bbb-wbertc serverside to fix html5 video problems 2018-01-12 19:36:57 +00:00
Lucas Fialho Zawacki
cdb961f724 Wait one tick before resizing HTML5 videos 2018-01-12 19:36:23 +00:00
Lucas Fialho Zawacki
ce7d720a13 Fix problems on video tags if camera is busy 2018-01-12 19:36:15 +00:00
Lucas Zawacki
552b2ab665 Detect online/offline browser and open/close WS accordingly 2018-01-12 19:36:07 +00:00