Commit Graph

1729 Commits

Author SHA1 Message Date
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
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
gcampes
ea637a1e49 first changes to audio components and services. WIP 2017-09-19 16:31:04 -03: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
537175dad2 Moved part of the presentation display calculations to the server side 2017-09-18 15:20:44 -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
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
72acea229b remove single quotes from variable 2017-09-12 10:01:07 -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
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
eeb878649a remove single quotes from variable 2017-09-11 06:42:56 -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
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
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
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
KDSBrowne
2f9d4bcc0e move isMeetingLocked condition check to userlist service 2017-08-31 11:12:53 -07:00
Klaus
5bba87525e Fix navigation error mention by kert 2017-08-31 14:03:40 -03:00
Oswaldo Acauan
6070a4ea25 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into presentation-uploader-2x 2017-08-31 09:49:59 -03:00
Oleksandr Zhurbenko
28f7f8ad11 Minor fixes and adjustments 2017-08-30 16:12:03 -07:00
Oleksandr Zhurbenko
e4c4f4584d Prevented publishing messages on random clicks for common shapes, and enabled that for pencil 2017-08-30 13:45:47 -07:00
KDSBrowne
a01451f9fd handle LockSettingsInMeetingChangedEvtMsg and fix userlistitem lock notification 2017-08-30 11:00:56 -07:00
Oleksandr Zhurbenko
f78283a17d Fixes
Hide wb toolbar when there is no slide; fixed cursor's text clipping; fixed exceptions thrown on 'Clear All' by reactive-annotation container; fixed shapes' thickness scaling on zoom; fixed dimensions' data types sent to akka (it doesn't accept Doubles)
2017-08-29 18:43:55 -07:00
KDSBrowne
b2fcfef145 move if condition 2017-08-29 16:26:43 -07:00
Oleksandr Zhurbenko
e1cf0ad9d5 Rewrite of the cursor component 2017-08-29 13:58:48 -07:00
KDSBrowne
126f4589e1 move if conditions 2017-08-29 12:31:09 -07:00
KDSBrowne
20316be90f add suggested changes 2017-08-29 12:25:01 -07:00
KDSBrowne
7271be05f8 remove getElementById usage in message-list-item component 2017-08-28 08:30:50 -07:00
KDSBrowne
24bdb2d000 remove getElementById usage in message component 2017-08-28 08:30:50 -07:00
Oleksandr Zhurbenko
5d2b215591 Added timers for the pencil and shape draw listeners and fixed a bug with clearing the Annotations collection 2017-08-27 01:12:27 -07:00
Oleksandr Zhurbenko
1a92a7f6a1 Changed annotations' rendering, refactored draw listeners, adjusted permissions for the publishAnnotation 2017-08-25 15:45:06 -07:00
Oleksandr Zhurbenko
f533b25d69 Improved whiteboard-toolbar and fixed linter warnings 2017-08-24 16:47:20 -07:00
Klaus
4cd5bd26bb Fix WAI-ARIA and lint 2017-08-24 10:15:11 -03:00
Oleksandr Zhurbenko
f3481a7e4b Turned on multi-user drawings 2017-08-23 21:27:41 -07:00
Oleksandr Zhurbenko
321b47abd1 Fixed pencil and text draw listeners for presenters 2017-08-23 20:35:34 -07:00
Klaus
d2b39be2d3 Move the userlist stuff to the right folder 2017-08-23 15:03:50 -03:00
Klaus
bbe4afe3f2 Change jeeung's code to match the rest of code 2017-08-23 14:19:01 -03:00
Klaus
ec458d1b55 Refactor user list 2017-08-23 13:29:21 -03:00
Oleksandr Zhurbenko
af558ff61d Fixed cursor's rendering including smoothing; adjusted cursor's label 2017-08-22 13:20:12 -07:00
Klaus
43d1b0c8d5 Merge remote-tracking branch 'jeeung/implement_set_promote_demote' into html5-refactor-userlist 2017-08-22 15:39:34 -03:00
Klaus
585a079794 Refactor chat list 2017-08-22 10:32:58 -03:00
JaeeunCho
c51764c7f6 changed name to val 2017-08-21 13:04:38 -07:00
JaeeunCho
baa5d519f1 added text-ellipsis and max-width 2017-08-21 10:29:01 -07:00
Oleksandr Zhurbenko
6a04851469 Fixed all the eslint errors under components/presentation 2017-08-20 17:16:39 -07:00
Oleksandr Zhurbenko
aa68421462 Fixed most of lint errors under components/whiteboard
Except annotation group, which will be changed soon
2017-08-19 23:32:01 -07:00
Oleksandr Zhurbenko
d5f07a574c Fixed publishShape message for 4 common shapes
Line, Rectangle, Triangle, Ellipse
2017-08-18 19:47:31 -07:00
JaeeunCho
73b6054b42 [HTML5] implemented promote/demote user 2017-08-18 11:23:05 -07:00
Klaus
4fa10ec656 Add proptypes and a few more refactors 2017-08-17 11:18:02 -03:00
Oleksandr Zhurbenko
643d55938c Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x 2017-08-16 19:24:59 -07:00
Klaus
c87f3054b9 Remove user-actions 2017-08-16 17:25:53 -03:00
Klaus
c32a64c02d a few refactor made 2017-08-16 11:56:31 -03:00
Anton Georgiev
5f1fb7542e Merge pull request #4204 from Klauswk/fix-missing-state
[HTML5 2.0] Fix Audio Modal on Meeting Join
2017-08-15 15:11:47 -04:00
Anton Georgiev
f6e8e743e0 Merge pull request #4244 from KDSBrowne/fix-meeting-title
[HTML5] - Meeting title fix
2017-08-15 15:11:27 -04:00
KDSBrowne
66d1a3b06a fix meeting title 2017-08-15 10:24:58 -07:00
Oleksandr Zhurbenko
9035386e76 Added multi-cursors 2017-08-14 17:15:11 -07:00
JaeeunCho
ab81ebfcfd added new line at the end of service.js 2017-08-14 13:05:59 -07:00
JaeeunCho
11d181327c created service.js moved makeCall to service.js 2017-08-14 13:03:37 -07:00
Klaus
dc62d15ad0 Change variable name 2017-08-14 16:19:35 -03:00
JaeeunCho
237d1b6ac3 divided code into new container.jsx 2017-08-11 13:32:33 -07:00
Klaus
de6b40a666 Fix counter in breakout notification 2017-08-11 17:17:35 -03:00
Klaus
babc981867 Messages been correct handle 2017-08-11 14:14:50 -03:00
JaeeunCho
b20ea78e2a fixed conflict 2017-08-10 14:34:21 -07:00
JaeeunCho
8607eff5d6 changed fullScreen to fullscreen 2017-08-10 12:09:16 -07:00
JaeeunCho
3f773684bc [HTML5] changed string id to camelCase 2017-08-10 10:34:34 -07:00
JaeeunCho
405ead47c2 added new line at styles.scss 2017-08-08 15:29:22 -07:00
JaeeunCho
33f0104b5a changed logout confirmation 2017-08-08 15:27:34 -07:00
Oleksandr Zhurbenko
f90a1d446f Made whiteboard-toolbar display when multi-user mode is on 2017-08-08 13:55:38 -07:00
JaeeunCho
8590d2f414 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into destroy_meeting_users 2017-08-08 12:31:56 -07:00
Klauswk
0ce41afabb Merge branch 'bbb-2x-mconf' into html5-toggle-mute 2017-08-08 13:59:00 -03:00
Oswaldo Acauan
716ee5902f Merge remote-tracking branch 'upstream/bbb-2x-mconf' into userlist-2x-design 2017-08-08 11:52:26 -03:00
Klaus
024fd2a796 Fix removed logic from the AudioContainer 2017-08-04 17:33:25 -03:00
Klaus
0807960da4 Fix missing method for mute user 2017-08-04 17:05:18 -03:00
Oswaldo Acauan
e07c8b41af Add autofocus when switching/entering chat 2017-08-04 15:32:21 -03:00
Oswaldo Acauan
78e88c8189 Fix unread counter 2017-08-04 15:20:54 -03:00
Oswaldo Acauan
720dddec24 Fix chat styles 2017-08-04 15:17:15 -03:00
Oswaldo Acauan
0022c121d3 Fix chat bug and styles 2017-08-04 14:58:55 -03:00
Klaus
0c6ac6364c Fix missing state of audio modal 2017-08-04 09:24:57 -03:00
Klaus
e4e7f1da2c Move domain functions to service.js 2017-08-03 11:10:05 -03:00
Oswaldo Acauan
b53636ec19 Fix avatar colors and text capitalization 2017-08-03 09:36:26 -03:00
Oswaldo Acauan
14f586faad Merge remote-tracking branch 'upstream/bbb-2x-mconf' into userlist-2x-design 2017-08-03 09:23:12 -03:00
Klaus
e02e5d75ce Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-chat-options 2017-08-03 09:17:50 -03:00
Oswaldo Acauan
00db9ee5bb Comment out compact user-list toggle 2017-08-03 09:06:59 -03:00
Oswaldo Acauan
92da0ace60 Fix error when a user have no subName and hide compact toggle 2017-08-03 09:05:17 -03:00
Oleksandr Zhurbenko
fa1458c3eb Handling and publishing multi-user mode switch 2017-08-02 18:24:38 -07:00
Klaus
4495c2e897 Move from annotation/ to annotations/ 2017-08-02 16:52:13 -03:00
Klaus
e7b9eab5b6 Move makeCall to service file 2017-08-02 14:05:20 -03:00
Klaus
63fee3b615 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-chat-options 2017-08-02 11:36:16 -03:00
Klaus
d45ae64558 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into slides-refactor-2x 2017-08-02 11:29:33 -03:00
Oleksandr Zhurbenko
b207a1275e Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x 2017-08-01 13:49:46 -07:00
Anton Georgiev
64b597c420 Merge pull request #4179 from Klauswk/html5-2x-voice-user
[HTML5 2.0] Move AudioUsers to his own Collection
2017-08-01 14:38:26 -04:00
Oswaldo Acauan
35fd834397 Fix error when a user have no subName 2017-08-01 14:50:33 -03:00
Oswaldo Acauan
df35a22676 Merge branch 'bbb-2x-mconf' into userlist-2x-design 2017-08-01 14:29:12 -03:00
JaeeunCho
e663458d01 added div for description 2017-08-01 09:17:03 -07:00
JaeeunCho
08818948ac changed logout-confirmation and en.json 2017-08-01 09:09:06 -07:00
JaeeunCho
e4f94f1d91 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into destroy_meeting_users 2017-08-01 08:55:02 -07:00
JaeeunCho
04636ca25b [HTML5] added endMeeting by moderator 2017-08-01 08:53:05 -07:00
Klaus
11cf4b8d78 A few fixes on client 2017-08-01 10:41:24 -03:00
Klaus
9d42ca9bd7 Move from users to voice-users 2017-08-01 10:10:12 -03:00
Matthew Marangoni
2494f48f52 removed unused constructor 2017-07-31 13:54:18 -07:00
Anton Georgiev
7b40122c89 Merge pull request #4121 from mmarangoni/call-manager
[HTML5] Implemented AudioManager
2017-07-31 14:29:42 -04:00
Oleksandr Zhurbenko
9e58c33b10 Added 'resize' event to the notifications bar
To scale the whiteboard
2017-07-28 18:52:06 -07:00
Oleksandr Zhurbenko
c61dcbce36 Fixed a cursor display/publish for both presenters and viewers
Plus linting warnings, no multi-user yet
2017-07-28 17:29:40 -07:00
Oswaldo Acauan
e93f3c0fd5 Remove logs 2017-07-28 10:49:48 -03:00
Oswaldo Acauan
83c117ddde Match user-list with the new styles 2017-07-28 10:43:39 -03:00
Klaus
e43a44e828 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-chat-options 2017-07-28 08:47:56 -03:00
Klaus
e2c0971e57 Add new icons 2017-07-27 17:45:40 -03:00
Klaus
eac898e81d Merge branch 'bbb-2x-mconf' into html5-2x-chat-options 2017-07-27 17:36:01 -03:00
Klauswk
e751bcdadf Merge branch 'bbb-2x-mconf' into slides-refactor-2x 2017-07-27 17:27:35 -03:00
Anton Georgiev
13b406313e drop handling of fsesl->akka-apps events 2017-07-27 11:27:06 -04:00
Klaus
c13155aa6a Move shapes to annotations 2017-07-27 09:35:55 -03:00
Matthew Marangoni
7c0d802f27 fixed undefined extension 2017-07-26 10:58:39 -07:00
Klaus
9ab4430f68 Fix merge stuff 2017-07-26 11:31:35 -03:00
Klaus
745b9070f6 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into slides-refactor-2x 2017-07-26 11:11:40 -03:00
Klaus
eea2c0ee8b Refactor user 2017-07-26 11:09:07 -03:00
Anton Georgiev
dbcf6dbd2c screenshare displays except at refresh 2017-07-26 09:18:15 -04:00
Oleksandr Zhurbenko
6ea4d39da9 Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x 2017-07-25 15:08:29 -07:00
Anton Georgiev
4e34a7f551 screenshare displays except at refresh 2017-07-25 16:56:40 -04:00
Klaus
d44299d221 Fix the missing string name 2017-07-25 15:57:20 -03:00
Klaus
b1bb4a6866 Flat poll 2017-07-25 09:26:45 -03:00
Oleksandr Zhurbenko
5aed767436 Moved SwitchSlide method to 2.0 2017-07-24 14:04:49 -07:00
Klaus
916713b1df Add safe true, preventing mess with the arrays, and refactored the shapes 2017-07-24 17:32:35 -03:00
Anton Georgiev
75c39f9340 Merge branch 'html5-2x-screenshare' of github.com:antobinary/bigbluebutton into html5-2x-fix-audio 2017-07-24 16:06:52 -04:00
Anton Georgiev
b7d6427e63 rename deskshare to screenshare and adjust condition for viewing 2017-07-24 15:29:34 -04:00
Klaus
97b38fb0e6 Presentation reflects akkaApps 2017-07-24 15:46:53 -03:00
Klaus
78a6fee038 Slides reflecting akkaApps 2017-07-24 14:50:44 -03:00
Klaus
d72df301c6 Move to 2.0 2017-07-24 11:15:46 -03:00
Klaus
5c2369b992 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into call-manager 2017-07-24 11:00:30 -03:00
Klaus
fade555d55 Add check for user permission 2017-07-21 15:17:25 -03:00
Klaus
39288e6e70 Add clear history, copy and save as chat options 2017-07-21 13:27:28 -03:00
Klaus
a63d8d5cf4 Add function to export public chat to clipboard and file 2017-07-21 11:39:51 -03:00
Matthew Marangoni
f521ef0402 Merge remote-tracking branch 'upstream/master' into call-manager 2017-07-19 11:55:45 -07:00
Klaus
a4db665a47 Update container.jsx 2017-07-19 09:59:03 -03:00
Klaus
b70702dabe Dynamic fetching the stun/turn servers 2017-07-19 09:44:47 -03:00
Matthew Marangoni
1feb7629d6 detailed errors and error codes are displayed in the audio notifications when an audio failed case is received 2017-07-18 17:04:12 -07:00
Klaus
a7ca723fe6 Audio only working on html5 2017-07-18 11:59:05 -03:00
Oswaldo Acauan
507bb61fb2 Change user-list width 2017-07-18 10:55:19 -03:00
Oswaldo Acauan
dbb6b5cd12 New user-list colors 2017-07-18 10:12:26 -03:00
Oleksandr Zhurbenko
a03ff03a84 Fixed shape's thickness 2017-07-17 16:41:07 -07:00
Oleksandr Zhurbenko
23263c997b Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x 2017-07-17 16:01:05 -07:00
Klauswk
7173c0e20c Merge branch 'bbb-2x-mconf' into html5-2x-polls-messages 2017-07-17 16:54:37 -03:00
Anton Georgiev
ed5460cba6 Merge pull request #4040 from Klauswk/html5-2x-captions-messages
[HTML5 2.0] Move captions messages to 2.0
2017-07-17 15:52:15 -04:00
Anton Georgiev
bc9083c0cf Merge pull request #4109 from Klauswk/fix-sass-path
[HTML5 - 2.0] Change relative path of the sass imports to absolute
2017-07-17 14:58:02 -04:00
Klaus
6b0edb353e Change all from single quotes to double quotes 2017-07-17 15:56:05 -03:00
Klaus
5767583a86 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-captions-messages 2017-07-17 15:37:06 -03:00
Klaus
87943cb3f8 Change relative path of the sass to absolute 2017-07-17 15:21:45 -03:00
Klaus
2343ef3f1f Add missing merge file 2017-07-17 13:38:18 -03:00
Klaus
3af281d648 Merge remote-tracking branch 'upstream/master' into merge-master-mconf 2017-07-17 13:33:45 -03:00
Oleksandr Zhurbenko
1508ed566c Resolved some of the issues related to the 2.0 switch 2017-07-14 16:20:16 -07:00
Oleksandr Zhurbenko
d7a4cd7a67 Merge branch 'presenter-functionality' of https://github.com/OZhurbenko/bigbluebutton into presenter-functionality-2x 2017-07-14 16:15:26 -07:00
Oleksandr Zhurbenko
d7ec74dcde Added initial PanZoomDrawListener 2017-07-14 16:14:38 -07:00
Oleksandr Zhurbenko
82a1ad2c8a Merge branch 'presenter-functionality' of https://github.com/OZhurbenko/bigbluebutton into presenter-functionality-2x 2017-07-14 15:43:41 -07:00
Anton Georgiev
07ca5f5794 Merge pull request #4086 from oswaldoacauan/guest-policy
[HTML5] Guest Policy
2017-07-14 15:32:18 -04:00
Anton Georgiev
d2d6e1d029 Merge pull request #4056 from KDSBrowne/x03-client-audit-semantics
[HTML5] - Accessibility Contrast & Semantic Fixes
2017-07-14 15:17:49 -04:00
Klaus
7fb9bae75e Merge branch 'bbb-2x-mconf' into html5-2x-polls-messages 2017-07-14 14:44:00 -03:00
KDSBrowne
fc8cb5688b change #fff to -white and fix lint issue 2017-07-14 10:39:33 -07:00
Anton Georgiev
a251305cab Merge pull request #4036 from KDSBrowne/x0-userlist-jaws-fix
[HTML5] - ARIA fixes to work with JAWS
2017-07-14 13:26:07 -04:00
Klaus
baf36d9d5f Fix the html5 2.0 user logout 2017-07-14 13:59:02 -03:00
Anton Georgiev
586c51fcac Merge pull request #4080 from Klauswk/bbb-2x-emoji-messages
[HTML5 2.0]  Move emoji messages to 2.0
2017-07-14 10:39:16 -04:00
Oswaldo Acauan
2e6ee550d2 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into guest-policy 2017-07-14 11:18:40 -03:00
Oswaldo Acauan
5353a3a80d Add guest policy to html5 2017-07-14 11:18:07 -03:00
Klaus
54234cecac Handling emoji messages 2017-07-13 10:15:42 -03:00
Klaus
f0e26c1bbb Change missing strings to const 2017-07-12 17:22:26 -03:00
Klaus
111ad9171b Remove strings and add constants 2017-07-12 17:15:50 -03:00
Klaus
8cd4b752ef Remove strings and add constants 2017-07-12 17:02:55 -03:00
Klaus
2aa603d195 Merge branch 'bbb-2x-mconf' into html5-2x-chat-messages 2017-07-12 16:29:07 -03:00
Klaus
1dfb054323 A few hotfixes to make the html5 client join again 2017-07-12 15:51:29 -03:00
Klaus
eb5712e96c Fix chat list 2017-07-12 13:47:58 -03:00
Klaus
e1004b64d3 Filtering correct the messages 2017-07-12 10:54:54 -03:00
Klaus
898f7c97e3 Sending private message 2017-07-12 10:18:26 -03:00
Klaus
e19ea05a75 Remove 'this.window', break the client 2017-07-12 09:59:51 -03:00
Klaus
73f49bb46a Sending public message 2017-07-12 09:42:16 -03:00
KDSBrowne
c8b783e526 improve contrast for hover states in join audio modal 2017-07-11 08:15:19 -07:00
KDSBrowne
efd933bf28 change $color-white to #fff 2017-07-11 07:08:49 -07:00
KDSBrowne
50eb4d81ef wrap form elements with label 2017-07-07 23:50:33 -07:00
KDSBrowne
44e918b9e6 remove if condition 2017-07-07 23:29:31 -07:00
KDSBrowne
e615869472 adjust contrast in user avatar 2017-07-07 12:12:35 -07:00
KDSBrowne
e4e15008dc add new line to end of file 2017-07-07 09:42:14 -07:00
KDSBrowne
0a81d59542 remove comments and more palette changes 2017-07-07 09:38:17 -07:00
KDSBrowne
44afafc448 fix color contrast issues 2017-07-07 09:11:22 -07:00
JaeeunCho
28b81b32eb changed function to pass two parameters 2017-07-07 08:18:19 -07:00
KDSBrowne
70cb30310b remove invalid ARIA attribute values 2017-07-07 06:53:44 -07:00
Klaus
743e128b0f Fix Poll display on html5 2017-07-07 09:18:54 -03:00
Klaus
4138f54f17 Fix Poll display on html5 2017-07-07 09:18:37 -03:00
Klaus
90ca216507 Merge branch 'bbb-2x-mconf' into html5-2x-polls-messages 2017-07-07 08:19:39 -03:00
Klaus
4c1c7ad65a Merge branch 'bbb-2x-mconf' into html5-2x-captions-messages 2017-07-06 17:36:56 -03:00
KDSBrowne
889209b26d give ARIA attribute valid values 2017-07-06 09:17:14 -07:00
KDSBrowne
54c16c796a fix listitem element semantics 2017-07-06 09:01:59 -07:00
KDSBrowne
8aee85ed72 ensure form elements have labels 2017-07-06 08:54:18 -07:00
KDSBrowne
a14ecdabef rename ARIA attribute to be valid 2017-07-06 08:32:11 -07:00
KDSBrowne
0dfa9ca446 Ensures aria-hidden='true' is not present on the document body 2017-07-06 08:30:50 -07:00
JaeeunCho
440c675e23 made function for duplicated code 2017-07-05 15:56:13 -07:00
JaeeunCho
1a1fb6dc57 HTML5 - fixed errors when the meeting is ended by apimate 2017-07-05 07:59:18 -07:00
KDSBrowne
05d16db6e8 set unique id attribute 2017-07-04 08:09:23 -07:00
KDSBrowne
61672b4ac7 remove tabIndex attributes 2017-07-04 07:38:55 -07:00
KDSBrowne
33da4d391e add missing lang attribute 2017-07-04 07:32:22 -07:00
Anton Georgiev
83e14e8206 handle slides messages 2017-06-30 15:16:00 -04:00
Klaus
be2caf92a3 Working poll vote 2017-06-30 11:26:19 -03:00
Klaus
9b63e0c215 Add caption messages 2017-06-29 17:22:09 -03:00
Klaus
4fe5a074df Userlist working correct 2017-06-28 14:16:04 -03:00
KDSBrowne
1cc5c5df92 change variable name and condition 2017-06-27 20:35:15 -07:00
Matthew Marangoni
545a9ea978 fixed issue with changing locales 2017-06-27 15:41:56 -07:00
Anton Georgiev
724e21a0d6 we do not have 1.0 user messages coming from bbb so use 2.0 only 2017-06-27 18:14:53 -04:00
Oleksandr Zhurbenko
cb25c7641b Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality 2017-06-27 12:41:12 -07:00
Matthew Marangoni
0197aff5ab Merge remote-tracking branch 'upstream/master' into call-manager 2017-06-27 10:38:53 -07:00
Matthew Marangoni
482591a2f5 spacing fixes 2017-06-27 10:38:31 -07:00
Anton Georgiev
91cfc02d13 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into handle-messages 2017-06-26 17:21:42 -04:00
Anton Georgiev
ff01a66228 Merge branch 'html5-whiteboard-messages' of github.com:Klauswk/bigbluebutton into handle-messages 2017-06-26 17:11:57 -04:00
Matthew Marangoni
6f2f541787 change state when joining and leaving audio 2017-06-22 14:31:27 -07:00
Klaus
8b6cb71854 Shapes add correct in the collection 2017-06-22 14:24:00 -03:00
Anton Georgiev
13193e1d12 Merge pull request #4009 from KDSBrowne/x0-userlistitem-missing-chevron-fix
[HTML5] - Missing dropdown menu chevron fix
2017-06-20 15:40:54 -04:00
Anton Georgiev
42393e21b7 Merge pull request #4015 from JaeeunCho/setPreseter_err_html5
HTML5 - fixed setPresenter error through HTML5
2017-06-20 15:39:42 -04:00
Klaus
b3865ef90d Merge remote-tracking branch 'origin/Refactor2x' into SplitRedis 2017-06-20 14:11:19 -03:00
KDSBrowne
be009fd9ba fix chat log aria label to work with jaws 2017-06-20 09:01:42 -07:00
KDSBrowne
8df4c0a174 suggested change 2017-06-19 09:29:32 -07:00
Klaus Klein
ca09b69555 Merge branch 'Acl' into Refactor2x
* Acl:
  Add check to undefined role
  Lint to eslint
  Missing merge file
  Fix lint problems
  Change Acl lookup
  Change ACL to be more extensible
  Fix a few review comments
  Acl refactor working
  Mostly working, still problems with user subs
  Code refactored
2017-06-19 11:28:17 -03:00
Klaus Klein
c627deca36 Move api to api/1.1 2017-06-19 08:57:32 -03:00
Oleksandr Zhurbenko
f7d1ff0df2 Text shape and bug fixes
Restructured code, fixed a bug with thickness icon not displayed when switching from Text tool, added textshape container
2017-06-16 19:32:41 -07:00
Oleksandr Zhurbenko
a9a8a48413 Fixed a bug with focus not working onBlur in FF 2017-06-16 13:33:10 -07:00
Matthew Marangoni
12d42aaecb set state for AudioManager when joining or leaving audio 2017-06-16 13:22:17 -07:00
KDSBrowne
30b5fb3259 fix jaws ability to voice users in the userlist 2017-06-16 11:42:28 -07:00
JaeeunCho
cf660527a8 HTML5 - fixed setPresenter error through HTML5 2017-06-16 08:14:02 -07:00
KDSBrowne
5963b1a49f fix lint issue 2017-06-11 20:47:17 -07:00
Oleksandr Zhurbenko
461a702759 Passing the data from the presenter's text shape to the whiteboard overlay 2017-06-10 19:21:37 -07:00
Oleksandr Zhurbenko
443c2f1032 Fixed a bug with ref breaking after changind a slide 2017-06-10 14:57:16 -07:00
KDSBrowne
9eaa19e8c7 fix lint issue 2017-06-10 12:29:36 -07:00
KDSBrowne
b80fb29fb2 switch to callback ref 2017-06-10 12:21:13 -07:00
KDSBrowne
cb96a26717 remove string concatenation 2017-06-10 11:56:14 -07:00
KDSBrowne
01a250e5b7 fix console error with FindDOMNode() on unmounted component 2017-06-10 11:22:54 -07:00
Oleksandr Zhurbenko
16d03ca32b Fixed a bug with the text shape's static clipPath id
ClipPath worked fine only for the first text shape
2017-06-09 14:55:38 -07:00
KDSBrowne
ae883f1065 remove console log 2017-06-09 12:08:52 -07:00
KDSBrowne
0fc81cf63d clean up key events 2017-06-09 12:04:21 -07:00
KDSBrowne
65bf70b293 add overflow: visible to show userlist item dropdown menu chevron 2017-06-09 09:27:18 -07:00
KDSBrowne
13ab2134a9 remove console log 2017-06-08 11:06:04 -07:00
KDSBrowne
000575f38a fix menu not closing on click 2017-06-08 11:05:11 -07:00
KDSBrowne
c189faceff fix merge conflicts 2017-06-08 11:00:06 -07:00
KDSBrowne
dd4e1ba488 fix keycode events 2017-06-08 10:40:14 -07:00
KDSBrowne
3906448d71 fix keydown event bugs 2017-06-08 08:33:25 -07:00
JaeeunCho
d902724309 HTML5 - removed useless line 2017-06-07 14:57:27 -07:00
JaeeunCho
c7e654511c Merge remote-tracking branch 'upstream/master' into long_string_cc 2017-06-07 14:53:39 -07:00
Oleksandr Zhurbenko
1a8aaefb0e Fixed svg animation for svg whiteboard-toolbar icons 2017-06-07 14:40:15 -07:00
Oleksandr Zhurbenko
9e08cb8567 Refs, PropTypes, fixes 2017-06-07 14:25:47 -07:00
Oleksandr Zhurbenko
1309bb1808 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality 2017-06-07 14:12:04 -07:00
Oleksandr Zhurbenko
6a228c0b77 Corrected the calls to the server-side 2017-06-07 13:45:49 -07:00
Oleksandr Zhurbenko
017ff470c3 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality 2017-06-07 13:29:35 -07:00
KDSBrowne
0c05597f3d Merge remote-tracking branch 'origin/x0-userlist-accessibility-bug-fixes' into x0-userlist-accessibility-suggestions 2017-06-07 11:37:07 -07:00
KDSBrowne
c2579c7838 fix console error related to messageForm 2017-06-07 11:36:25 -07:00
KDSBrowne
f17dfd04cf fix focus bug 2017-06-07 06:44:18 -07:00
Oswaldo Acauan
5664bf2655 Add missing package and fix bug 2017-06-07 12:52:45 +00:00