Commit Graph

1160 Commits

Author SHA1 Message Date
Klaus
54234cecac Handling emoji messages 2017-07-13 10:15:42 -03:00
Klaus
1dfb054323 A few hotfixes to make the html5 client join again 2017-07-12 15:51:29 -03:00
Anton Georgiev
83e14e8206 handle slides messages 2017-06-30 15:16:00 -04:00
Klaus
4fe5a074df Userlist working correct 2017-06-28 14:16:04 -03: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
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
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
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
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
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
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
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
KDSBrowne
cf9d2d16e1 remove null values being announced by NVDA 2017-06-06 17:56:50 -07:00
Oleksandr Zhurbenko
4dbf02a344 Fixed a bug with the switches ref 2017-06-06 14:55:46 -07:00
JaeeunCho
5b658dcd97 HTML5 - fixed long string at cc box 2017-06-06 10:32:56 -07:00
KDSBrowne
3cae15da59 fix conflicting keypress events 2017-06-06 10:19:25 -07:00
Oleksandr Zhurbenko
1ba4018629 Cleanup 2017-06-05 20:15:37 -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
Oleksandr Zhurbenko
9f497d8991 Fixed scrollArea usage 2017-06-05 19:10:06 -07:00
KDSBrowne
1cfc37eac9 remove unneeded localized strings 2017-06-05 12:33:45 -07:00
KDSBrowne
26b40e9fb0 change counter variable name 2017-06-05 12:08:34 -07:00
JaeeunCho
cb2c849692 Merge remote-tracking branch 'upstream/master' into long_string_cc 2017-06-05 11:32:50 -07:00
KDSBrowne
3ffc7f34f8 change confusing counter variable names 2017-06-05 10:57:57 -07:00
KDSBrowne
2e28f25118 change syntax focusing nested parent 2017-06-05 10:41:28 -07:00
Klaus Klein
cb02f2979d Missing merge file 2017-06-05 13:55:29 -03:00
Klaus Klein
b574859ab2 Merge remote-tracking branch 'upstream/master' into Acl
* upstream/master:
  Improve lint script
  Update package-lock with the new packages
  Add missing packages and fix formating
  Switched from 2 deprecated packages
  Corrected findDOMNode import for the poll shape
  Switched from the deprecated react-addons-css-transition-group package to a recommended one
  Updated react-meteor-data to remove a new React 15 warning
  Updated main packages
  Switched to prop-types package to remove new React 15 warnings
  Improve ESLint rules
  Linter auto fix
  Change lint import configs to our pattern
  Remove autofix script
  Replace JSCS in favor of ESLint
2017-06-05 13:52:37 -03:00
Klaus Klein
d701966434 Fix lint problems 2017-06-05 13:40:36 -03: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