Oswaldo Acauan
63522c6a95
Use flat package on mongo upsert
2017-06-29 08:54:19 -03:00
Anton Georgiev
d899a573a6
Merge branch 'html5-whiteboard-messages' of github.com:Klauswk/bigbluebutton into handle-messages
2017-06-28 11:37:54 -04:00
Anton Georgiev
e0a5fa48f4
add default webcam_stream and adjust emoji
2017-06-28 11:33:03 -04: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
Klaus
83cbb47195
Fix pencil update, thanks to @capilkey
2017-06-27 14:36:37 -03:00
Klaus
c90d94d5ac
Handle presenterAssigned and emojiStatus
2017-06-27 09:40:28 -03: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
Anton Georgiev
16168ddd5b
Merge pull request #3997 from Klauswk/DetectSystemLang
...
[HTML5] Add support to default system/browser language
2017-06-26 16:18:22 -04:00
Klaus
e9d13e3b1e
A few fixes
2017-06-26 13:15:28 -03:00
Klaus
8b6cb71854
Shapes add correct in the collection
2017-06-22 14:24:00 -03:00
Klaus
0e0af787f3
Add missing files
2017-06-22 10:22:52 -03:00
Klaus
a209f620e0
Add cursor support
2017-06-22 10:22:34 -03:00
Klaus
8aee5dc069
Fix wrong publish name
2017-06-22 10:11:12 -03:00
Klaus
a1c41f220c
Correct handling the whiteboard messages
2017-06-22 10:03:27 -03:00
Klaus
43cdd9754c
Fix imports
2017-06-22 08:48:10 -03:00
Klaus
692de9f417
Handle a few new messages
2017-06-21 13:54:04 -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
3998139e72
Split redis and api for version migration
2017-06-20 14:17:37 -03:00
Klaus
0c596c304d
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into SplitRedis
2017-06-20 14:16:16 -03:00
Klaus
b3865ef90d
Merge remote-tracking branch 'origin/Refactor2x' into SplitRedis
2017-06-20 14:11:19 -03:00
Anton Georgiev
367b905ec5
use enter api to get meetingId, authToken, etc
2017-06-19 14:03:12 -04:00
Anton Georgiev
8e16114c3f
html5client login now redirect=true to url+sessionToken
2017-06-19 14:01:24 -04: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
d88d4fb0bc
Add stuff from 2.x
2017-06-19 10:13:35 -03:00
Klaus Klein
c627deca36
Move api to api/1.1
2017-06-19 08:57:32 -03:00
JaeeunCho
613da8b818
HTML5 - removed setPresenter at viewer
2017-06-16 08:15:49 -07:00
JaeeunCho
cf660527a8
HTML5 - fixed setPresenter error through HTML5
2017-06-16 08:14:02 -07:00
JaeeunCho
3bcae276e1
HTML5 - fixed setPresenter error through HTML5
2017-06-14 13:31:49 -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
Klaus Klein
68f52aa107
Remove error from http response
2017-06-08 14:29:35 -03: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
Anton Georgiev
7f909058aa
Merge pull request #3987 from OZhurbenko/refs-to-callbacks
...
[HTML5] String refs to callback refs
2017-06-07 15:11:09 -04: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
