Commit Graph

92 Commits

Author SHA1 Message Date
Klaus
4d51e0c045 Fix unsplited styles and code duplicated 2017-09-22 11:24:24 -03:00
Klaus
29922c896a Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-refactor-userlist 2017-09-21 15:40:18 -03: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
Oleksandr Zhurbenko
251bd22738 PR review fixes 2017-09-06 12:36:52 -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
KDSBrowne
2f9d4bcc0e move isMeetingLocked condition check to userlist service 2017-08-31 11:12:53 -07:00
Klaus
d2b39be2d3 Move the userlist stuff to the right folder 2017-08-23 15:03:50 -03:00
Klaus
ec458d1b55 Refactor user list 2017-08-23 13:29:21 -03:00
Klaus
43d1b0c8d5 Merge remote-tracking branch 'jeeung/implement_set_promote_demote' into html5-refactor-userlist 2017-08-22 15:39:34 -03:00
JaeeunCho
c51764c7f6 changed name to val 2017-08-21 13:04:38 -07:00
JaeeunCho
73b6054b42 [HTML5] implemented promote/demote user 2017-08-18 11:23:05 -07: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
c32a64c02d a few refactor made 2017-08-16 11:56:31 -03:00
JaeeunCho
3f773684bc [HTML5] changed string id to camelCase 2017-08-10 10:34:34 -07:00
Klauswk
0ce41afabb Merge branch 'bbb-2x-mconf' into html5-toggle-mute 2017-08-08 13:59:00 -03:00
Klaus
0807960da4 Fix missing method for mute user 2017-08-04 17:05:18 -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
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
b207a1275e Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x 2017-08-01 13:49:46 -07:00
Klaus
11cf4b8d78 A few fixes on client 2017-08-01 10:41:24 -03:00
Oswaldo Acauan
83c117ddde Match user-list with the new styles 2017-07-28 10:43:39 -03:00
Oleksandr Zhurbenko
cb25c7641b Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality 2017-06-27 12:41:12 -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
c189faceff fix merge conflicts 2017-06-08 11:00:06 -07:00
KDSBrowne
3906448d71 fix keydown event bugs 2017-06-08 08:33:25 -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
017ff470c3 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality 2017-06-07 13:29:35 -07:00
Oleksandr Zhurbenko
4dbf02a344 Fixed a bug with the switches ref 2017-06-06 14:55:46 -07:00
Oleksandr Zhurbenko
52fae1b8c8 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into refs-to-callbacks 2017-06-05 19:51:20 -07:00
KDSBrowne
26b40e9fb0 change counter variable name 2017-06-05 12:08:34 -07:00
KDSBrowne
3ffc7f34f8 change confusing counter variable names 2017-06-05 10:57:57 -07:00
KDSBrowne
0220a98d36 move reused code to function 2017-06-05 09:35:11 -07:00
KDSBrowne
257ca0d911 change condition syntax for event keycodes 2017-06-05 08:51:09 -07:00
KDSBrowne
53712d125b remove removeEventListener() 2017-06-05 08:38:21 -07:00
Oswaldo Acauan
1c5c74db67 Fix merge conflicts 2017-06-05 13:52:46 +00:00
Oleksandr Zhurbenko
0e55b04a7a Switched from the deprecated react-addons-css-transition-group package to a recommended one 2017-06-04 16:20:38 -07:00
Oleksandr Zhurbenko
06493fda7f Switched to prop-types package to remove new React 15 warnings 2017-06-03 19:40:14 -07:00
Oleksandr Zhurbenko
a0224dcffc Replaced String refs with callback refs
String refs will be deprecated in the next React releases, since they have some performance issues
2017-06-03 16:58:27 -07:00
Oswaldo Acauan
e6412275a6 Linter auto fix 2017-06-02 19:25:02 +00:00
KDSBrowne
95a81315d3 fix focus managment 2017-06-02 10:22:22 -07:00
KDSBrowne
bf6b85414a remove nested select function 2017-06-01 16:38:56 -07:00
KDSBrowne
eabf5cb4e1 use += and -= operator 2017-05-23 06:45:28 -07:00
KDSBrowne
f4dd6628ee remove switch statment 2017-05-23 06:35:55 -07:00
KDSBrowne
477ca85615 fix hoisting issue and switch to keydown event 2017-05-23 06:23:26 -07:00
KDSBrowne
de6e7093f3 remove custom aria prop name 2017-05-18 11:38:07 -07:00
KDSBrowne
f6a701b103 remove PascalCase notation 2017-05-18 10:29:25 -07:00
KDSBrowne
225f8aef68 switch to arrow functions 2017-05-18 10:23:23 -07:00