Commit Graph

3069 Commits

Author SHA1 Message Date
Oswaldo Acauan
e699c342b6 Add missing suported mimes 2017-09-29 09:31:38 -03:00
Oswaldo Acauan
3e24a5e2a4 Update chat styles 2017-09-29 09:13:49 -03:00
Oswaldo Acauan
bcc6e20af2 Update system messages styles 2017-09-28 16:42:10 -03:00
Oswaldo Acauan
909af38fc3 Update chat notification style 2017-09-28 16:18:04 -03:00
Oswaldo Acauan
0300b854d5 Update emoji icon status when selected 2017-09-28 15:58:25 -03:00
KDSBrowne
9cd6b31743 fix focus ring for round buttons 2017-09-28 11:51:17 -07:00
Oswaldo Acauan
5f78235133 Update button styles 2017-09-28 15:32:51 -03:00
Klaus
b947e27086 Fix makeCall from component, and user.isLocked from mapUser 2017-09-28 15:19:57 -03:00
KDSBrowne
a60b7e26a6 add kickUser method 2017-09-28 10:41:02 -07:00
KDSBrowne
10c75afe99 switch handler, modifier and collection prop to ejected 2017-09-27 14:20:22 -07:00
KDSBrowne
3633b460d4 clean up code with suggestion 2017-09-27 08:03:31 -07:00
KDSBrowne
3e7aab2bdd add http:// to logoutURL if its not there 2017-09-27 06:56:40 -07:00
Oleksandr Zhurbenko
6e2beab03a Fixed a bug with the multi-user cursors not being displayed if there is no presenter cursor 2017-09-26 14:52:08 -07:00
Oleksandr Zhurbenko
b3723c34d4 Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x 2017-09-26 14:08:41 -07:00
KDSBrowne
b26b1973f7 add new line to end of file 2017-09-26 13:53:59 -07:00
KDSBrowne
ad1b2b930c remove variable duplication 2017-09-26 13:45:38 -07:00
Anton Georgiev
0b6a7082ff Merge pull request #4431 from OZhurbenko/slide-change-fix
HTML5 - fix for the bug with the current Slide being unset
2017-09-26 16:39:05 -04:00
Oleksandr Zhurbenko
b02cbb3208 Removed redundand brackets 2017-09-26 13:36:47 -07:00
Anton Georgiev
fe7130473d Merge pull request #4418 from KDSBrowne/xx-02-mute-show-bug
[HTML5] - Mute button fix
2017-09-26 16:30:38 -04:00
Oswaldo Acauan
a3f74842b4 Bug fixes 2017-09-26 16:45:33 -03:00
KDSBrowne
32187d446a rename service import and remove constants 2017-09-25 18:18:08 -07:00
Oleksandr Zhurbenko
76808b3e7d Fixed a bug with the current slide being unset 2017-09-25 17:00:08 -07:00
Oleksandr Zhurbenko
ce04cfb83b Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x 2017-09-25 16:48:03 -07:00
Oleksandr Zhurbenko
f80d0bc083 Linting and moved whiteboard resize events into HoC
Thus we won't clutter the code with unrelated events and can easily switch to a ResizeObserver when it is implemented by the browsers
2017-09-25 16:45:44 -07:00
Oswaldo Acauan
3a4745d590 Fix error while changing the current presentation 2017-09-25 17:49:54 -03:00
Anton Georgiev
91f912ce4b Merge pull request #4416 from OZhurbenko/mongo-indexing
Added indexes for the html5 Mongo collections
2017-09-25 15:57:07 -04:00
KDSBrowne
cad085a495 add kicked prop 2017-09-25 11:38:36 -07:00
KDSBrowne
9a145c64a8 fix set properties and client kicked condition 2017-09-25 11:32:09 -07:00
KDSBrowne
31223e86ec remove nested user and voiceUser keys 2017-09-25 08:57:39 -07:00
KDSBrowne
00ac3b1a54 move functions to service and rename callback 2017-09-25 08:39:56 -07:00
KDSBrowne
baa1f0955e change function signature line length 2017-09-25 07:13:14 -07:00
Oleksandr Zhurbenko
8b48dc692e Bug fix for the slide pushing toolbar case in multi-user in firefox 2017-09-23 18:40:42 -07:00
Oleksandr Zhurbenko
e0a7bfc9fa Refactored whiteboard-toolbar 2017-09-22 23:27:55 -07:00
Oswaldo Acauan
cca1e58167 Move default presentation name to config file 2017-09-22 17:49:11 -03:00
Oswaldo Acauan
43c2102adf Fix conversion status messages 2017-09-22 17:45:31 -03:00
Oswaldo Acauan
dd83d213fa Fix missing conversion handlers 2017-09-22 17:43:07 -03:00
Oswaldo Acauan
36699bedb1 Merge remote-tracking branch 'upstream/master' into presentation-manager-merge 2017-09-22 15:11:48 -03:00
Klauswk
22da4648b9 Update en.json 2017-09-22 14:55:05 -03:00
Klaus
97d2f6d3e5 Rollback to the right locales 2017-09-22 14:51:47 -03:00
Klaus
ccf4b1ba21 Fix locales problems 2017-09-22 14:23:25 -03:00
Klaus
b3dd84505e Change statuses and remove .scss suffix 2017-09-22 14:03:14 -03:00
gcampes
b17f2ebe41 fix proptypes for intl 2017-09-22 11:33:12 -03:00
Klaus
f6e0785e6f Missing relative path style 2017-09-22 11:31:05 -03:00
Klaus
4d51e0c045 Fix unsplited styles and code duplicated 2017-09-22 11:24:24 -03:00
Oleksandr Zhurbenko
4073501a28 Made actions import more clear to read 2017-09-21 17:18:15 -07:00
Oleksandr Zhurbenko
4a4a3d5574 Moved hex_to_int and int_to_hex functions to imports/utils 2017-09-21 16:52:43 -07:00
Oleksandr Zhurbenko
e054358947 Created a whiteboard config and moved static values there 2017-09-21 16:44:32 -07:00
Oleksandr Zhurbenko
d19814dc55 Prevented html5 from throwing exceptions if the slide file doesn't exist 2017-09-21 14:02:50 -07:00
gcampes
56e9fedb45 removes console.log 2017-09-21 15:51:58 -03:00
gcampes
06400c7034 fix breakout logout 2017-09-21 15:50:21 -03:00
Klaus
29922c896a Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-refactor-userlist 2017-09-21 15:40:18 -03:00
KDSBrowne
b35b16f642 rename functions to past tense 2017-09-21 10:55:07 -07:00
KDSBrowne
30da581d6d rename user prop to match 2.x 2017-09-21 10:50:06 -07:00
KDSBrowne
b988dadf89 switch relative with absolute import path 2017-09-21 10:40:19 -07:00
KDSBrowne
93d7c9f4ce change variable declaration 2017-09-21 10:21:25 -07:00
KDSBrowne
8418317e03 handle UserEjectedFromMeetingEvtMsg 2017-09-21 09:21:42 -07:00
KDSBrowne
83adf4200f remove unneeded if condition 2017-09-21 08:03:42 -07:00
KDSBrowne
c6647dfc95 mute button wont render for listenOnly users 2017-09-20 17:42:35 -07:00
Oleksandr Zhurbenko
a46469557f Minor corrections and improvements based on the #4345 reviews 2017-09-20 14:34:22 -07:00
KDSBrowne
119fa04be1 remove transitions and clean up css 2017-09-20 14:29:43 -07:00
Oleksandr Zhurbenko
2b10d5c1a7 Fixed based on the review of #4345 2017-09-20 14:05:17 -07:00
KDSBrowne
a756b90e72 fix audio modal back Btn icon color 2017-09-20 12:52:23 -07:00
KDSBrowne
d25ae89dfb does not show userlist border when children selected with mouse 2017-09-20 12:40:16 -07:00
Anton Georgiev
90db7326b8 Merge pull request #4415 from KDSBrowne/x2.0.9-clear-chat-bug
[HTML5] - Fix clear chat feature
2017-09-20 14:13:05 -04:00
Anton Georgiev
7372d708ad include bowser.js in html5 client for browser detection in webrtc 2017-09-20 09:59:11 -04:00
Anton Georgiev
e22da926bb Merge pull request #4414 from KDSBrowne/x2.0.8-stun-turn-delete
[HTML5] - Remove requestStunTurn
2017-09-19 15:53:08 -04:00
KDSBrowne
2e1fb712a1 use userId instead of username 2017-09-19 12:01:02 -07:00
KDSBrowne
bd8c57eb45 remove log messages 2017-09-19 11:57:08 -07:00
KDSBrowne
6b6d431a5b switch variable positions in object 2017-09-19 11:55:32 -07:00
KDSBrowne
9b3bb04a90 fix clear chat feature 2017-09-19 10:39:13 -07:00
KDSBrowne
4388fc4b0f remove requestStunTurn 2017-09-19 08:42:10 -07:00
KDSBrowne
f385103935 add new line to end of file 2017-09-19 07:55:46 -07:00
KDSBrowne
beff9626bc remove duplicate variable 2017-09-19 07:54:03 -07:00
KDSBrowne
44e2a948eb clean up css 2017-09-19 07:51:18 -07:00
KDSBrowne
d7335ade60 move focus styles to central location 2017-09-19 07:44:42 -07:00
Oleksandr Zhurbenko
f3a17e74a8 Removed unused properteties from the slide object 2017-09-18 17:18:20 -07:00
Oleksandr Zhurbenko
838382b6f9 Moved presentation overlays' rendering to a separate function 2017-09-18 16:54:52 -07:00
Oleksandr Zhurbenko
ff4e7bffd0 Fixed a bug with the helper's import 2017-09-18 16:52:20 -07:00
Oleksandr Zhurbenko
537175dad2 Moved part of the presentation display calculations to the server side 2017-09-18 15:20:44 -07:00
Oleksandr Zhurbenko
d57f60fe09 Adjusted publish calls to #4385 2017-09-18 12:18:37 -07:00
Oleksandr Zhurbenko
c9552247b2 Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x 2017-09-18 12:08:14 -07:00
KDSBrowne
f20f432e74 add focus to chat links 2017-09-18 09:55:10 -07:00
KDSBrowne
e78e59e659 add focus style to device selectors 2017-09-18 09:43:21 -07:00
KDSBrowne
a470bfb58f add border size variable and clean up css 2017-09-18 09:23:15 -07:00
Anton Georgiev
17b4beb545 Merge pull request #4385 from KDSBrowne/x2.0.7-messages
[HTML5] - header functions update
2017-09-18 12:00:31 -04:00
Oleksandr Zhurbenko
9e1c8a4fb7 Permissions fix
Can't afford WebStorm :-(
2017-09-17 19:01:48 -07:00
Oleksandr Zhurbenko
c7d737e9b8 Improvements based on the PR review 2017-09-17 18:58:37 -07:00
KDSBrowne
ae443a8430 add custom focus to select elements 2017-09-15 12:25:45 -07:00
KDSBrowne
b88179a9e7 remove outline from fullscreen modal 2017-09-15 11:29:56 -07:00
KDSBrowne
bc48e7352d remove transition, switch color code to variable 2017-09-15 11:05:24 -07:00
KDSBrowne
69c2b195f5 remove css important rule 2017-09-15 09:00:11 -07:00
KDSBrowne
2815cf9ce1 add custom focus styles 2017-09-15 08:12:58 -07:00
KDSBrowne
cd5da84984 make handlePublishError static 2017-09-13 15:57:52 -07:00
KDSBrowne
c7328a5bb7 fix: Expected 'this' to be used by class method 'handlerPublishError' 2017-09-13 13:50:04 -07:00
KDSBrowne
e3ed9aa84d remove need for wrapper function 2017-09-13 12:47:52 -07:00
KDSBrowne
27dbe42189 pass this.pub as a parameter to _publish 2017-09-13 10:01:47 -07:00
KDSBrowne
91718abfba add underscore to indicate private function 2017-09-13 09:10:28 -07:00
KDSBrowne
41b629b232 make publish function private to RedisPubSub2x class 2017-09-13 08:29:23 -07:00
KDSBrowne
4b7d790a57 change variable name 2017-09-12 11:13:27 -07:00
KDSBrowne
571c3763dd add publishVoiceMessage 2017-09-12 10:58:06 -07:00
KDSBrowne
090b3e91c2 add comment to publish 2017-09-12 10:25:41 -07:00
KDSBrowne
72acea229b remove single quotes from variable 2017-09-12 10:01:07 -07:00
KDSBrowne
c987ef6635 add publishSystemMessage 2017-09-12 09:11:08 -07:00
KDSBrowne
39bd590329 rework header creation 2017-09-12 08:52:02 -07:00
Oleksandr Zhurbenko
39ba2d12de Fixed permissions 2017-09-11 12:13:42 -07:00
Oleksandr Zhurbenko
eca8090bac Adjusted the PR 'methods' to #4322 2017-09-11 12:12:39 -07:00
Oleksandr Zhurbenko
43b3b89c6a Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x 2017-09-11 12:11:03 -07:00
Anton Georgiev
9599ed9374 Merge pull request #4320 from MaximKhlobystov/selenium-browser-versions
[HTML5 Client] Test Update: Support for browser versioning + Code optimization
2017-09-11 14:08:02 -04:00
Anton Georgiev
802b3bb4fb Merge pull request #4322 from KDSBrowne/x2.0-header-functions
[HTML5] - Add header functions
2017-09-11 14:00:15 -04:00
KDSBrowne
89de2f771b change parameter name to header 2017-09-11 10:19:06 -07:00
Anton Georgiev
bf35fa7a4c Merge pull request #4354 from KDSBrowne/x2.0.1-fix-lock-issue-userlist
[HTML5] - Fix Userlist Lock Notification
2017-09-11 12:07:17 -04:00
KDSBrowne
467ffaba49 change log message 2017-09-11 06:46:19 -07:00
KDSBrowne
eeb878649a remove single quotes from variable 2017-09-11 06:42:56 -07:00
Oleksandr Zhurbenko
7e6ad07b76 Added indexes for the html5 Mongo collections 2017-09-07 16:41:03 -07:00
KDSBrowne
ef6d3059a7 fix lint issue 2017-09-07 12:06:48 -07:00
Oswaldo Acauan
c0307e36a6 Presentation Uploader to 2.0 2017-09-07 15:18:14 -03:00
KDSBrowne
b0f3ca7a1a remove unused import 2017-09-07 10:41:26 -07:00
KDSBrowne
876097a0f4 fix line endings 2017-09-07 10:38:00 -07:00
KDSBrowne
b2b36254ab remove check from handler add exhaustive check to modifier 2017-09-07 10:33:23 -07:00
KDSBrowne
bc8718e263 fix line endidngs 2017-09-07 09:47:20 -07:00
KDSBrowne
21c5ffee8f remove need for separate headerBuilder function 2017-09-07 09:37:13 -07:00
KDSBrowne
13e6357b19 fix line endings 2017-09-07 07:31:19 -07:00
KDSBrowne
5a6183dc34 fix undefined check 2017-09-06 12:57:24 -07:00
KDSBrowne
9193ae8849 handle UserLockedInMeetingEvtMsg 2017-09-06 12:53:07 -07:00
Oleksandr Zhurbenko
251bd22738 PR review fixes 2017-09-06 12:36:52 -07:00
KDSBrowne
31cf7aea42 check for specific meeting id 2017-09-06 11:32:29 -07:00
KDSBrowne
fd9a4cd98e fix bug in undefined check 2017-09-06 11:13:24 -07:00
KDSBrowne
d34f138b56 check if lock settings are undefined 2017-09-06 10:50:48 -07:00
KDSBrowne
572bb0b8d3 remove ternary operation 2017-09-06 09:08:26 -07:00
KDSBrowne
67ab2d5379 alternate solution test 2017-09-06 07:17:46 -07:00
Oleksandr Zhurbenko
9ee75331bf Removed an unnecessary rule 2017-09-05 19:02:23 -07:00
Oleksandr Zhurbenko
65da71c12a Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x 2017-09-05 18:53:51 -07:00
Oleksandr Zhurbenko
3014b26439 PR review fixes 2017-09-05 18:36:15 -07:00
Oleksandr Zhurbenko
b12e0b84a9 Using previously saved draw settings for the initial wb toolbar values 2017-09-05 15:55:18 -07:00
Oleksandr Zhurbenko
3c750575cf Fixed font-size normalization for the text-shape 2017-09-05 15:47:13 -07:00
Maxim Khlobystov
1379b533fd Removed the test command from the git precommit hook. 2017-09-05 13:51:41 -04:00
KDSBrowne
c14e779bb4 add check to payload 2017-09-05 08:53:02 -07:00
Anton Georgiev
718828353e Merge pull request #4321 from Klauswk/fix-acl-inconsistency
[HTML5] Fix inconsistency inside the ACL, #4310
2017-09-05 09:54:40 -04:00
Anton Georgiev
a68222dfff Merge pull request #4181 from JaeeunCho/destroy_meeting_users
[HTML5 2.0] End meeting by moderator
2017-09-05 09:54:19 -04:00
Anton Georgiev
50c7974a30 Merge pull request #4323 from KDSBrowne/x2.0-replace-getElementById-instances
[HTML5] - Replace Instances of getElementById
2017-09-05 09:51:57 -04:00
JaeeunCho
7a01c61639 fixed isModerator() 2017-09-01 13:00:55 -07:00
JaeeunCho
99ea26c584 added isModerator at service.js 2017-09-01 12:37:14 -07:00
JaeeunCho
ede90b8a40 removed unused line at css 2017-09-01 11:39:17 -07:00
JaeeunCho
43f6fd9c03 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into destroy_meeting_users 2017-09-01 11:22:45 -07:00
Anton Georgiev
d60e06e28f Merge pull request #4221 from JaeeunCho/change_localeId_to_camelCase
[HTML5] changed string id to camelCase
2017-09-01 10:05:50 -04:00
Oleksandr Zhurbenko
2a91c6aa0b Fixed a bug initial cursor/shape coordinates on page zooming 2017-08-31 18:42:00 -07:00
KDSBrowne
b20859d1c9 fix chat being locked for moderators 2017-08-31 14:49:13 -07:00
KDSBrowne
7a9cb7d04f fix the disabling of chat when locked 2017-08-31 14:29:18 -07:00
KDSBrowne
94e44d6a23 remove unused prop 2017-08-31 13:50:20 -07:00
KDSBrowne
a404cc14d1 remove space typo 2017-08-31 13:47:06 -07:00