Oswaldo Acauan
8c99b7e4bb
Fix cb pattern
2017-07-14 16:25:04 -03:00
Klaus
a99f8c37c4
Fix annotation incorrect size
2017-07-14 14:45:50 -03:00
Klaus
7fb9bae75e
Merge branch 'bbb-2x-mconf' into html5-2x-polls-messages
2017-07-14 14:44:00 -03:00
Klaus
baf36d9d5f
Fix the html5 2.0 user logout
2017-07-14 13:59:02 -03:00
Matthew Marangoni
d9a115aab6
added error code handling for fail cases
2017-07-14 08:57:06 -07:00
Anton Georgiev
a00410847c
Merge pull request #4083 from Klauswk/html5-breakout-messages
...
[HTML5 2.0] Move breakout messages to 2.0
2017-07-14 10:39:38 -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
fe9ca6b0c8
Fix welcome message for guest users
2017-07-14 11:23:12 -03:00
Klaus
5f7c008e95
Screenshare messages been handle
2017-07-14 11:18:46 -03: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
712b6914cc
Add base files
2017-07-14 09:32:15 -03:00
Klauswk
38087a1669
Merge branch 'bbb-2x-mconf' into html5-breakout-messages
2017-07-13 17:38:54 -03:00
Klaus
82f383f4ae
Fix typo in createBreakout
2017-07-13 17:35:40 -03:00
Klaus
6c602ba56f
Add missing import and add FIX ME
2017-07-13 17:28:35 -03:00
Klaus
858076924c
Fix import problems
2017-07-13 17:21:27 -03:00
Klaus
963248163d
Merge branch 'bbb-2x-mconf' into html5-breakout-messages
2017-07-13 17:14:02 -03:00
Klaus
c97ad780b5
Fix properties incorrect name
2017-07-13 13:55:05 -03:00
Klaus
05e1951ac1
Use flat object instead of long properties
2017-07-13 10:56:28 -03:00
Klaus
54234cecac
Handling emoji messages
2017-07-13 10:15:42 -03:00
Klaus
111ad9171b
Remove strings and add constants
2017-07-12 17:15:50 -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
73f49bb46a
Sending public message
2017-07-12 09:42:16 -03:00
Klaus
188aff42df
Sending message, need to fix the property names
2017-07-11 17:44:07 -03:00
JaeeunCho
ccab71a898
changed MeetingId : meetingId to meetingId
2017-07-11 13:16:10 -07:00
JaeeunCho
fbdea71f8d
changed to divide meeting check
2017-07-11 12:26:07 -07:00
JaeeunCho
9938ee6575
added space under User check
2017-07-11 12:20:47 -07:00
JaeeunCho
b5852c8f45
changed code that Meeting is not existed
2017-07-11 12:19:02 -07:00
JaeeunCho
7fe20bb1f6
moved check logic into userLeaving
2017-07-11 10:43:33 -07:00
Klaus
55a9c0673e
Handling chat messages
2017-07-11 13:57:54 -03:00
JaeeunCho
a3c8c61d80
HTML5 - added check that current meeting is existed or not
2017-07-07 13:58:55 -07:00
JaeeunCho
28b81b32eb
changed function to pass two parameters
2017-07-07 08:18:19 -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
28b69208f9
Fix lint problems
2017-07-07 08:23:31 -03:00
Klaus
90ca216507
Merge branch 'bbb-2x-mconf' into html5-2x-polls-messages
2017-07-07 08:19:39 -03:00
Klaus
8ef23a559e
Fix lint problems
2017-07-07 08:17:49 -03:00
Klaus
4c1c7ad65a
Merge branch 'bbb-2x-mconf' into html5-2x-captions-messages
2017-07-06 17:36:56 -03:00
Klaus
9b32a4db2d
Remove 'nodeJSapp' stuff, is deprecated
2017-07-06 15:01:05 -03:00
Klaus
94da6f636f
Merge branch 'html5-2x-getAll-messages' of https://github.com/Klauswk/bigbluebutton into html5-2x-getAll-messages
2017-07-06 09:32:14 -03:00
Klaus
cc38576f79
Add missing events
2017-07-06 08:58:38 -03:00
JaeeunCho
fd2b5926bc
changed error to warn and add clearUsers
2017-07-05 13:16:21 -07:00
Klauswk
ebb3984828
Merge branch 'bbb-2x-mconf' into html5-2x-getAll-messages
2017-07-05 15:28:35 -03:00
Klaus
3f445bc92e
Change log
2017-07-05 14:26:22 -03:00
Anton Georgiev
23f4521954
Merge pull request #4038 from oswaldoacauan/flat-add-meeting
...
[HTML5 2.0] Add flat package and implement on addMeeting modifier
2017-07-05 11:13:23 -04:00
JaeeunCho
1a1fb6dc57
HTML5 - fixed errors when the meeting is ended by apimate
2017-07-05 07:59:18 -07:00
Klaus
86d3e27d47
Merged info with anton's branch
2017-07-03 12:05:35 -03: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
5e868f37ac
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-polls-messages
2017-06-30 08:47:58 -03:00
Klaus
9b63e0c215
Add caption messages
2017-06-29 17:22:09 -03:00
Anton Georgiev
c9b877c465
Merge branch 'handle-messages' into presentation-and-slides
2017-06-29 10:39:00 -04:00
Klaus
27a92698cc
Moved the meetingId to be last param
2017-06-29 10:09:11 -03:00
Klaus
6f93a5f9f6
Change to have default meeting param
2017-06-29 09:23:04 -03:00
Klaus
93927a3b53
Merge remote-tracking branch 'anton/handle-messages' into html5-2x-polls-messages
2017-06-29 09:22:34 -03:00
Oswaldo Acauan
ace3afeb70
Remove console.log
2017-06-29 09:01:10 -03:00
Oswaldo Acauan
63522c6a95
Use flat package on mongo upsert
2017-06-29 08:54:19 -03:00
Klaus
2098c2dff7
Handle polls messages
2017-06-28 17:37:45 -03:00
Anton Georgiev
3ab794cbdb
obtain meetingId outside handler
2017-06-28 16:04:41 -04:00
Anton Georgiev
7e798b96dd
clearing some linting issues
2017-06-28 15:24:19 -04:00
Anton Georgiev
56da45f071
handle adding presentation, slide 2.0
2017-06-28 15:05:50 -04:00
Klaus
4a24769f20
Change var name
2017-06-28 15:34:22 -03:00
Klaus
0e1d81ceb5
Change var name
2017-06-28 15:33:06 -03:00
Klaus
aab51bdaed
Change import and remove console.err
2017-06-28 15:14:29 -03:00
Klaus
d3a50416cc
Merge remote-tracking branch 'anton/handle-messages' into html5-whiteboard-messages
2017-06-28 13:56:33 -03:00
Klaus
894fd70e68
Fix presenter assigned message handle
2017-06-28 13:44:11 -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
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
Matthew Marangoni
482591a2f5
spacing fixes
2017-06-27 10:38:31 -07:00
Klaus
83cbb47195
Fix pencil update, thanks to @capilkey
2017-06-27 14:36:37 -03:00
Klaus
6f3aeb7a8d
Fix imports
2017-06-27 09:45:08 -03:00
Klaus
c90d94d5ac
Handle presenterAssigned and emojiStatus
2017-06-27 09:40:28 -03:00
Klaus
5304a87b7b
Add last message
2017-06-27 09:27:57 -03:00
Klaus
43ffe77cd0
Remove unused import
2017-06-26 15:04:26 -03:00
Klaus
c491d28b78
Handle most of the breakout messages
2017-06-26 15:00:28 -03:00
Klaus
e9d13e3b1e
A few fixes
2017-06-26 13:15:28 -03: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
Klaus
0e0af787f3
Add missing files
2017-06-22 10:22:52 -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
Klaus
3998139e72
Split redis and api for version migration
2017-06-20 14:17:37 -03: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
Matthew Marangoni
12d42aaecb
set state for AudioManager when joining or leaving audio
2017-06-16 13:22:17 -07:00
Matthew Marangoni
6dd71a3ee0
fixed merge conflicts
2017-06-14 11:26:11 -07:00
Matthew Marangoni
4beff48938
reconnecting wip
2017-06-14 11:07:18 -07:00
Klaus Klein
f135dbd129
Add check to undefined role
2017-06-07 10:02:31 -03:00
Anton Georgiev
18d9fb947e
Merge pull request #3986 from OZhurbenko/fix-chat-links
...
HTML5 - Chat links fix
2017-06-06 09:49:32 -04:00
Klaus Klein
59bb9fd31a
Lint to eslint
2017-06-05 16:12:06 -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
Klaus Klein
a96393e23c
Change Acl lookup
2017-06-05 11:16:19 -03:00
Oswaldo Acauan
1c5c74db67
Fix merge conflicts
2017-06-05 13:52:46 +00: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
47c1ac6083
Fixed links in the chat
2017-06-03 12:11:49 -07:00
Klaus Klein
6031b21067
Change ACL to be more extensible
2017-06-02 17:37:22 -03:00
Oswaldo Acauan
e6412275a6
Linter auto fix
2017-06-02 19:25:02 +00:00
Klaus Klein
fc73992a63
Fix a few review comments
2017-06-01 17:40:55 -03:00
Klaus Klein
1db64e2bb7
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into Acl
...
* 'master' of https://github.com/bigbluebutton/bigbluebutton :
HTML5 - removed 'lockedLayout' variable
Update README.md
Improved the detection if IP addresses in bbb-conf
Removing event listeners in handleHide
Fixed click listeners' initialization
Bump version number to 1.1.0
Update BigBlueButton.html
remove new lines being rendered in log/development.log
remove new operator
add suggested changes
HTML5 - put the order at media class
HTML5 - removed unused media query
HTML5 - removed unused media query
HTML5 - fixed order and slide control position
change file permission to 644
fix new lint issues
set files permission to 644
Fix client lint issues except those which are comment related
HTML5 - fixed fixed closed-caption display
HTML5 - fixed closed-caption display
2017-06-01 16:38:58 -03:00
Klaus Klein
8a31d29e17
Acl refactor working
2017-06-01 14:32:04 -03:00
Klaus Klein
de3a5e9cb6
Mostly working, still problems with user subs
2017-06-01 10:12:11 -03:00
Klaus Klein
a4c8ff493a
Code refactored
2017-05-31 14:54:43 -03:00
Matthew Marangoni
7f0a509223
Merge remote-tracking branch 'upstream/master' into call-manager
2017-05-26 12:14:13 -07:00
Anton Georgiev
250c6cdb8b
Merge pull request #3948 from KDSBrowne/x0-lint-Client
...
[HTML5] - Fix client lint issues
2017-05-25 13:57:04 -04:00
Matthew Marangoni
325f94679c
connected getMyUserInfo to BBB api
2017-05-19 13:35:10 -07:00
Matthew Marangoni
4a9463b152
Merge remote-tracking branch 'upstream/master' into call-manager
2017-05-19 11:31:49 -07:00
KDSBrowne
ff1a152f0b
remove new lines being rendered in log/development.log
2017-05-19 09:05:09 -07:00
Anton Georgiev
409a471ab5
bring catch clause on the same line as closing curly brace
2017-05-18 10:52:59 -04:00
Anton Georgiev
71d4e8b0e0
catch Meteor error on userLeaving
2017-05-17 15:17:27 -04:00
KDSBrowne
675a886fd0
fix merge conflicts
2017-05-16 09:28:28 -07:00
KDSBrowne
df76d33cba
set files permission to 644
2017-05-16 09:22:59 -07:00
KDSBrowne
6537a0e28c
Fix client lint issues except those which are comment related
2017-05-16 08:37:17 -07:00
Oleksandr Zhurbenko
371419c41c
Text shape preserves white space now and handles new lines
2017-05-12 12:46:10 -07:00
Anton Georgiev
b9f75f88ae
Merge pull request #3928 from JaeeunCho/locked_status
...
HTML5 - added locked status for users
2017-05-12 12:56:53 -04:00
Anton Georgiev
b5601ecabc
fix issue with userLeave on breakout end
2017-05-12 09:14:26 -04:00
JaeeunCho
ca808195f2
HTML5 - added locked status for users
2017-05-10 14:02:50 -07:00
JaeeunCho
bd923e0f39
HTML5 - added locked status for users
2017-05-10 14:00:03 -07:00
Matthew Marangoni
7feba2b01f
moved callback to audio manager
2017-05-09 14:32:56 -07:00
Matthew Marangoni
e4dd786bd6
Merge remote-tracking branch 'upstream/master' into call-manager
2017-05-08 09:13:49 -07:00
Matthew Marangoni
2d8c5f26f1
inital call manager code
2017-05-05 14:39:16 -07:00
Anton Georgiev
93baf362e6
remove old import
2017-05-04 15:14:14 -04:00
Anton Georgiev
91ce6e20d5
unify user and audiouser in verto bridge
2017-05-04 14:44:20 -04:00
Fred Dixon
837654dc85
Merge pull request #3895 from perroned/update-verto-libs
...
Update verto libs and WebRTC Extension
2017-05-03 16:50:34 -04:00
Anton Georgiev
3904771fc3
if microphone lock is enforced, pick listenOnly join over using mic
2017-05-03 16:12:47 -04:00
Anton Georgiev
038405f907
some changes to logClient api
2017-05-03 13:19:21 -04:00
Klauswk
b0b455e591
Merge branch 'master' into ClientLog
2017-05-03 13:40:57 -03:00
perroned
66061fa33d
Handle lib update/fix errors
2017-05-03 14:13:53 +00:00
Klaus Klein
bede8ab447
Fix missing line and tab problem
2017-05-03 09:27:33 -03:00
Klaus Klein
131f23f42d
Fix lint problems
2017-05-02 08:30:32 -03:00
Klauswk
30b7c3c1e4
Merge branch 'master' into AddServerCallback
2017-04-28 17:28:45 -03:00
Klaus Klein
31ae8854c9
Lint problems fixed
2017-04-28 17:01:02 -03:00
Klaus Klein
5a4f05a41a
Fix requests on PR #3865
2017-04-28 14:12:08 -03:00
Klaus Klein
71d3c06d5e
Fix few lint issues
2017-04-28 11:03:35 -03:00
Klaus Klein
1c8e78d1c1
Merge with master
2017-04-28 10:53:30 -03:00
Klaus Klein
245ba3c4e3
Add client log, HTML5
2017-04-28 10:47:07 -03:00
Anton Georgiev
ef0d2f5729
Merge pull request #3861 from antobinary/disallow-moderator-2
...
HTML5: demote html5 moderator user to viewer based on flag
2017-04-27 16:17:49 -04:00
Anton Georgiev
684f87e77a
demote html5 moderator user to viewer based on flag
2017-04-27 16:07:27 -04:00
Klaus Klein
d4917e975c
Review change
2017-04-26 17:07:22 -03:00
Klaus Klein
e56546137b
Change callServer function name
2017-04-26 10:47:44 -03:00
Klauswk
73fb753edb
Merge branch 'master' into FixAuthentication
2017-04-25 14:09:47 -03:00
Klaus Klein
6f564ba7b6
Fix auth and user kick, HTML5 closes #3844 #3828
2017-04-25 14:04:17 -03:00
Anton Georgiev
c2b6f48b87
Merge pull request #3848 from antobinary/audio-restructuring
...
HTML5: Fix issue with listenOnly not hanging up
2017-04-25 12:04:32 -04:00
Anton Georgiev
c80827ee20
fix issue with listenOnly not hanging up
2017-04-24 17:17:53 -04:00
