Commit Graph

1121 Commits

Author SHA1 Message Date
Anton Georgiev
07ca5f5794 Merge pull request #4086 from oswaldoacauan/guest-policy
[HTML5] Guest Policy
2017-07-14 15:32:18 -04: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
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