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
Oleksandr Zhurbenko
017ff470c3
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality
2017-06-07 13:29:35 -07:00
Klaus Klein
f135dbd129
Add check to undefined role
2017-06-07 10:02:31 -03:00
Oswaldo Acauan
2b3859d906
Fix linter errors and add missing package
2017-06-07 12:28:41 +00:00
Oswaldo Acauan
ccb6fd2a53
Fix merge conflicts
2017-06-07 12:01:18 +00: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
Oswaldo Acauan
9217ef7183
Fix bug when changing the current presentation
2017-05-23 14:05:42 +00: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
Oleksandr Zhurbenko
84aab7706a
Text shape preserves white space now and handles new lines
2017-05-12 12:43:06 -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
Oleksandr Zhurbenko
8de7b895b5
Optimized and validated undo/clear/send annotation methods
2017-05-10 11:59:17 -07:00
Matthew Marangoni
7feba2b01f
moved callback to audio manager
2017-05-09 14:32:56 -07:00
Oleksandr Zhurbenko
f04dae31c8
Added a version for the shape model and implemented shouldComponentUpdate
...
Which prevents the shapes from being re-calculated if nothing has changed
2017-05-09 13:34:46 -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
Oswaldo Acauan
b6bb795fa3
Add presenter upload capabilities
2017-05-05 17:17:38 -03: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
Oswaldo Acauan
1dc3bccb0d
Add presenter upload capabilities
2017-05-03 17:51:17 -03: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
Oswaldo Acauan
ff5d3d1211
Merge remote-tracking branch 'upstream/master' into presentation-uploader
...
* upstream/master: (83 commits)
resolve issues with modal on breakouts
Update generate_css_dpi.sh comments.
Added multi-resolution generated css files for the mobile client.
Added a shell script to generate multi-dpi css files for the mobile client.
Fix origin on pencil cursor
Fix a missing bracket in mobile demo
Delete services directory.
New cursors for flash client
update mobile demo to support https
Set icon-44.png to its true size and set value for allowBrowserInvocation in Main-app.xml
Delete services/bbb-web-api project.
Delete bbb-web-api project.
Renamed clours for mobile application styles.
Handle audio on refactored modal (#2 )
Put all toolbar logic in TopToolbarMediatorAIR to avoid double mediator registration.
fix lint issues
Fix the audio-modal
fix tabIndex for the settings closed caption submenu
remove extra list separator
fix console errors for missing key and invalid prop
...
2017-05-03 13:36:54 -03:00
Oswaldo Acauan
71fc15a803
Add presenter upload capabilities
2017-05-03 13:36:16 -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
Oleksandr Zhurbenko
286f077ed3
Added initial drawing functionality for Line/Rectangle/Triangle/Ellipse
2017-05-01 14:34:24 -07: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
Oleksandr Zhurbenko
0039eba840
Whiteboard scaling/ositioning, svg coordinate system, ui fixes
...
Fixed whiteboard and wbtoolbar positioning in FF, set a proper SVG coordinate system, fixed scaling (let SVG scale everything)
2017-04-27 15:18:53 -07: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
Oleksandr Zhurbenko
edabe3c623
Clear All Annotations functionality
2017-04-21 11:01:52 -07:00
Anton Georgiev
5f6dd8e5f6
Merge pull request #3839 from antobinary/audio-restructuring
...
[HTML5] Fix undefined voiceBridge
2017-04-20 16:55:15 -04:00
Anton Georgiev
d3bf2ab0b7
fix undefined voiceBridge
2017-04-20 16:53:55 -04:00
Anton Georgiev
a9f2a18475
Merge pull request #3834 from antobinary/audio-restructuring
...
[HTML5] Audio restructuring part 1
2017-04-20 16:00:59 -04:00
Anton Georgiev
5b0454a11c
Merge pull request #3836 from Klauswk/FixAvatarIssue
...
Fix avatar issue in chat, HTML5 #3830
2017-04-19 17:25:58 -04:00
Anton Georgiev
40d0417b9d
resolve lint warnings on modified files
2017-04-19 16:52:50 -04:00
Oleksandr Zhurbenko
1e4f16048f
Added an Undo Annotation functionality
2017-04-19 11:27:00 -07:00
Klaus Klein
23d472bcde
Fix avatar issue in chat, HTML5 #3830
2017-04-19 14:11:13 -03:00
Anton Georgiev
4c49f68771
pass params via bridge constructor
2017-04-19 11:01:28 -04:00
Anton Georgiev
9152bfbaf9
move deskshare verto outside of audio/
2017-04-19 10:59:57 -04:00
gcampes
0fd59394e7
remove unwanted debug, adds back log for error
2017-04-17 14:20:09 -03:00
gcampes
16c8497e36
Merge remote-tracking branch 'upstream/master' into unauthorized-page-fix
...
* upstream/master: (26 commits)
Fix lint issues
Fix lint issues
Fix a few lint problems
fix missing import causing breakouts to not work
Delete the initially converted swf to be sure that if fallback convertion does not work we get the blank swf loaded.
Fix poll options remain visible on html5, closes #3806 HTML5
- user internal userId instead of external userId in register user message
remove unnecessarily added svgs
updated icons to v11, adjusted few icons
Fix merge algoritm problem
set chat input color to gray (text-color)
Fixed user leave problem on private chat, close #3799 HTML5
align emojis horizontally
Check userId when validating token
Cleanup - remove extra > on meeting name on getRecording API response
Check for WebRTC availability instead of checking for the browser name to display the AudioSelectionWindow browser hint.
Display "Recommend using either Firefox or Chrome for better audio" when any of other browser is used.
improved logic for updating message-list
Change to fetch from chat system id, issue #3792 HTML5
Fix multiple welcome messages, issue #3792 HTML5
...
2017-04-17 14:15:40 -03:00
gcampes
832d916fd8
Fix unauthorized on slow connection
2017-04-17 14:14:31 -03:00
Anton Georgiev
450d2f3435
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into audio-restructuring
2017-04-17 11:37:49 -04:00
Anton Georgiev
a7bda6b049
Merge pull request #3815 from Klauswk/FixPollOptionsHTML5
...
Fix poll options remain visible on html5, closes #3806 HTML5
2017-04-12 16:38:49 -04:00
Klaus Klein
e244459514
Fix lint issues
2017-04-12 17:37:37 -03:00
Klaus Klein
63b58a7f79
Fix lint issues
2017-04-12 17:33:14 -03:00
Klaus Klein
3ad7f9b5a0
Fix a few lint problems
2017-04-12 17:19:39 -03:00
Klaus Klein
3cd497fbbe
Fix poll options remain visible on html5, closes #3806 HTML5
2017-04-12 14:00:16 -03:00
Klauswk
9649f7523d
Merge branch 'master' into FixPrivateOfflineChatProblem
2017-04-12 08:33:07 -03:00
Anton Georgiev
a192eb5740
Merge pull request #3796 from Klauswk/FixWelcomeMessage
...
Fix multiple welcome messages, issue #3792 HTML5
2017-04-11 15:59:48 -04:00
Klaus Klein
419902cc8b
Fixed user leave problem on private chat, close #3799 HTML5
2017-04-11 16:46:51 -03:00
Anton Georgiev
11871d7d0b
fix event name causing issues with listenOnly status
2017-04-10 16:18:05 -04:00
Klaus Klein
b432ffd68b
Change to fetch from chat system id, issue #3792 HTML5
2017-04-10 11:04:27 -03:00
Klaus Klein
6727f14ab7
Fix multiple welcome messages, issue #3792 HTML5
2017-04-10 09:55:22 -03:00
Gabriel Carvalho de Campes
82a3018171
[HTML5] - Fix user not being removed on tab close
2017-04-06 14:06:03 -03:00
Anton Georgiev
ad34d73ccc
Fix listenOnly status not set
2017-03-31 15:22:44 -04:00
Anton Georgiev
d26225b05d
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into audio-restructuring
2017-03-31 15:21:14 -04:00
Anton Georgiev
8893b3ce19
instantiate audioManager with bridge
2017-03-31 11:46:33 -04:00
Anton Georgiev
afcb365ac6
turned the audio services into classes
2017-03-30 13:57:05 -04:00
Anton Georgiev
6de1c470a1
split phone and verto into audio/main sip-bridge and verto-bridge
2017-03-29 14:46:33 -04:00
Anton Georgiev
f4aeb3f7ee
move phone api to audio/service.js
2017-03-28 10:02:23 -04:00
Ubuntu
5e0a5f019c
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into perroned-merge-webrtc-screenshare-2
2017-03-24 19:14:21 +00:00
Ubuntu
a096e25a72
Merge branch 'merge-webrtc-screenshare-2' of https://github.com/perroned/bigbluebutton into perroned-merge-webrtc-screenshare-2
2017-03-22 20:37:41 +00:00
perroned
c64c97b582
Html5 clean up
2017-03-21 21:46:41 +00:00
Anton Georgiev
2223172612
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into br-kick
2017-03-20 14:44:51 -04:00
Anton Georgiev
6d325297ee
remove unused packages
2017-03-20 14:37:55 -04:00
Ubuntu
4da7d6d03f
Merge branch 'merge-webrtc-screenshare-2' of https://github.com/perroned/bigbluebutton into perroned-merge-webrtc-screenshare-2
2017-03-17 15:55:23 +00:00
Oswaldo Acauan
f020964c50
Fix merge conflicts
2017-03-16 20:25:14 +00:00
Oleksandr Zhurbenko
07502ca172
Linting
2017-03-13 15:35:04 -07:00
Oleksandr Zhurbenko
d8542490c7
Corrected the fix
2017-03-13 15:33:06 -07:00
Oleksandr Zhurbenko
d7b5ae3c36
Fixed permissions and some exceptions
2017-03-13 12:15:58 -07:00
Oleksandr Zhurbenko
925842ae96
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality
2017-03-13 10:57:00 -07:00
Oswaldo Acauan
9c84105319
Add missing packages
2017-03-10 19:18:23 +00:00
Oswaldo Acauan
d6780c3013
Refactor Authentication flow
2017-03-10 18:33:46 +00:00
Oswaldo Acauan
be7f36e00c
Refactor the i18n server code
2017-03-09 19:50:21 +00:00
Oswaldo Acauan
dc2cc13c70
Fix wrong error message
2017-03-07 17:37:25 +00:00
Oswaldo Acauan
3f946fb6a6
Fix wrong collection imports
2017-03-07 17:32:24 +00:00
Oswaldo Acauan
3c6ccf6cec
Skip updating user validated flag if its already valid
2017-03-07 17:18:02 +00:00
perroned
dab5adb5be
Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2
...
Conflicts:
bigbluebutton-html5/imports/ui/components/media/container.jsx
bigbluebutton-html5/server/main.js
2017-03-06 19:21:40 +00:00
Anton Georgiev
e67b2a733e
Merge pull request #3686 from oswaldoacauan/fix-reply-messages-remove
...
[HTML5] Fix presentations/shapes reply messages
2017-03-02 11:44:26 -05:00
Oswaldo Acauan
5ef65300b6
Fix user not being able to revalidate
2017-03-02 16:23:53 +00:00
Oswaldo Acauan
5b407d40f4
Remove debug line
2017-03-02 16:08:49 +00:00
Oswaldo Acauan
715b11fe46
Fix emojiStatus undefined logger variable
2017-03-02 16:07:45 +00:00
perroned
59435c6020
Cleaning
2017-02-27 19:59:54 +00:00
perroned
f93b16434d
Handle issue with undefined variable
2017-02-27 18:16:16 +00:00
Oswaldo Acauan
19f119fcf6
Fix presentations not being removed while non existent in the reply message
2017-02-24 13:57:10 +00:00
Oswaldo Acauan
cc0999013f
Fix shapes not being removed while non existent in the reply message
2017-02-24 13:10:55 +00:00
Oleksandr Zhurbenko
56989c54ac
Added Cursor functionality
2017-02-23 15:27:48 -08:00
Oleksandr Zhurbenko
03791aa7f1
Added publishCursorUpdate method to the cursor api
2017-02-23 15:26:59 -08:00
Oswaldo Acauan
f3f4f8ddfe
Fix bugs on the voiceUpdate handlers
2017-02-23 20:35:36 +00:00
Oswaldo Acauan
5e9a7d8e39
Fix bug when removing users
2017-02-23 20:26:34 +00:00
Oswaldo Acauan
b6e80815bd
Fix a bunch of bugs introduced after the refactor
2017-02-23 20:16:10 +00:00
perroned
92c3cdb746
Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2
2017-02-23 19:20:37 +00:00
Oswaldo Acauan
d07bca00c9
Refactor handlers inside /phone to the /user folder
2017-02-23 18:52:50 +00:00
Oswaldo Acauan
99cfdb2062
Refactor handlers inside /phone to the /user folder
2017-02-23 18:52:44 +00:00
Oswaldo Acauan
24aa98b623
Refactor of validate_auth_token and clearUsers
2017-02-23 18:15:13 +00:00
Oswaldo Acauan
fbe34b2ed3
Refactor of validate_auth_token and clearUsers
2017-02-23 18:15:08 +00:00
Oswaldo Acauan
0f0ebdcf4a
Refactor user_joined handler
2017-02-23 18:05:18 +00:00
Oswaldo Acauan
74f123cdc9
Refactor of get_users_reply handler
2017-02-23 17:59:56 +00:00
Oswaldo Acauan
8bd65c1a43
Merge remote-tracking branch 'upstream/master' into refactor-api-users
...
* upstream/master: (47 commits)
Updated with correct version
Check for initial values in application.conf
remove defaultMessage
Remove wrong selector when upserting captions
Localize other labels through the application
localize labels for AudioSettings component
localize label for AudioTest component
hide option to reset status if there is no status (emojis)
drop voice in main room when joining breakout room
add defaultMessage for Public Chat
localize Join/Leave Audio labels
Remove console logs
Fix ´get_all_meetings_request´ being published multiple times
Clean captions when handling the history reply
Fix presentation slide coordinates
- when we get invalid coordinate for presentation slide, change coordinate so it falls within bounds
use localized Public Chat label
finish locals for the audio modal
Returning number of users that participated in each meeting in getRecordings call
add comment for condition
...
2017-02-23 17:46:30 +00:00
Oswaldo Acauan
6b020d7e3a
WIP. Refactor of get_users_reply handler
2017-02-23 17:46:03 +00:00
Oswaldo Acauan
a609c1feab
WIP. Refactor of get
2017-02-23 17:45:51 +00:00
perroned
2d04f057cc
Cleans up html5 screenshare
2017-02-22 20:31:09 +00:00
Oswaldo Acauan
5cfb18ea32
Refactor handler for emojiStatus
2017-02-22 20:22:12 +00:00
Oswaldo Acauan
8abdd10393
Refactor handler for emojiStatus
2017-02-22 18:59:47 +00:00
Oswaldo Acauan
b6bb8cc08d
Refactor user api handlers
2017-02-22 17:55:39 +00:00
Oswaldo Acauan
37538b2817
Refactor user api handlers
2017-02-22 17:49:44 +00:00
perroned
8106742d45
Restructuring deskshare api
2017-02-22 16:22:51 +00:00
Oswaldo Acauan
1f9f47ce16
Fix assignPresenter method
2017-02-22 13:42:42 +00:00
Oswaldo Acauan
f16926c94d
Refactor emojiStatus method
2017-02-22 13:11:47 +00:00
Oswaldo Acauan
09481987ce
Refactor assignPresenter method
2017-02-22 12:56:32 +00:00
Oswaldo Acauan
c8038b2068
Merge mute/unmute methods to a single toggle method
2017-02-22 12:20:30 +00:00
Oswaldo Acauan
8511e72f06
Refactor muteUser method
2017-02-22 12:10:27 +00:00
Anton Georgiev
1577fbd35a
Merge pull request #3591 from oswaldoacauan/refactor-api-captions
...
[HTML5] Refactor API Closed Captions
2017-02-17 13:21:20 -05:00
Oswaldo Acauan
552dcd0300
Remove wrong selector when upserting captions
2017-02-17 16:05:35 +00:00
Oswaldo Acauan
59eb04418d
Clean captions when handling the history reply
2017-02-14 16:05:49 +00:00
Oswaldo Acauan
edae8ea1be
Fix clear captions calls
2017-02-10 12:25:31 +00:00
Oswaldo Acauan
30d67897ef
WIP - Refactor users api
2017-02-10 12:24:14 +00:00
Oswaldo Acauan
11c5085521
Prevent empty chunk when handling captions history
2017-02-09 11:27:13 +00:00
Oswaldo Acauan
6a0978e4ad
Fix bug in CC handlers
2017-02-08 16:46:14 +00:00
Oswaldo Acauan
0c1f191db5
Rename handler for caption history
2017-02-08 16:02:39 +00:00
Oswaldo Acauan
f4b6763e34
Push a empty chunck when the length is zero
2017-02-08 16:00:55 +00:00
Oswaldo Acauan
bfd2a27f6b
Prevent unnecessary update in captions
2017-02-08 15:58:54 +00:00
Anton Georgiev
2863377ba7
Merge pull request #3637 from KDSBrowne/Audio-Err-Notification-Update1
...
HTML5 - Audio Notification Update1
2017-02-07 16:20:25 -05:00
Oswaldo Acauan
c1d0797d92
Merge remote-tracking branch 'upstream/master' into refactor-api-users
...
* upstream/master: (47 commits)
Added ExitApplicationEvent.as
HTML 5 - changed css for divider
No more display the LoggedOutWindow.mxml if the user has explicitly clicked on yes to confirm the logout action.
Link "enableEmojiStatus" enabled/disabled to the emoji button.
initialize html5StunTurn properly - complication from PR 3628
fix bug preventing stun/turn call
fix lint issues
rework userPermissions to allow mixture of role/status based actions
Handle exception when sending message to client
HTML5 - changed divider of record button
Change the emoji menu icon to the happy face.
don't show promote option for presenter user'
remove glow prop and use className to change style
reorganize user actions
clean up
improve userPermissions by rearranging logic
allow for mute/unmute by moderator
rename css class
Display breakout rooms user names in row tooltip.
fix setPresenter and kick user
...
2017-02-07 15:29:42 +00:00
Oswaldo Acauan
28ba2fb4b0
WIP - Refactor users api
2017-02-07 15:29:27 +00:00
KDSBrowne
47636857f4
discard notification if connection is successful
2017-02-07 07:16:04 -08:00
Oswaldo Acauan
fda22b0653
Refactor methods/events for user leaving iteractions
2017-02-07 13:08:06 +00:00
Oswaldo Acauan
32ba6ad724
Refactor method listenOnlyRequestToggle
2017-02-06 16:27:09 +00:00
Oswaldo Acauan
9c2b42e99a
Refactor publishers and method kickUser to the new pattern
2017-02-06 15:56:09 +00:00
Anton Georgiev
7ad046d8be
Merge pull request #3607 from KDSBrowne/Audio-Err-Notification
...
Audio Error notification
2017-02-02 15:37:05 -05:00
perroned
1116cc0d1e
Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2
...
Conflicts:
bigbluebutton-client/resources/config.xml.template
2017-02-02 15:27:08 +00:00
Anton Georgiev
43922300e8
fix setPresenter and kick user
2017-02-01 11:47:39 -05:00
Oswaldo Acauan
2844e79096
Add config for the size of CC chunks
2017-02-01 15:37:31 +00:00
Oswaldo Acauan
fbc7adf670
Fix issue related to CC when handling ofr the first time
2017-02-01 15:28:12 +00:00
KDSBrowne
868c615d6a
add getUserMedia failure message
2017-01-31 08:06:12 -08:00
KDSBrowne
dbddb304cf
change render condition and move event to switch
2017-01-26 08:25:28 -08:00
KDSBrowne
61de5fe393
add user notification for audio failure
2017-01-25 11:52:17 -08:00
Oswaldo Acauan
b4679bc601
Refactor Captions API
2017-01-18 12:53:33 +00:00
Anton Georgiev
f517939809
fix handling of recording message
2017-01-09 18:58:33 +00:00
Lajellu
b99d0a2407
HTML5 - Emoji - fix merge conflicts
2016-12-21 09:14:46 -08:00
Lajellu
b3f1d9f804
HTML5 - Add the three emojis: applause, thumbs up, thumbs down and fixes some master lint issues
2016-12-20 10:06:01 -08:00
KDSBrowne
73db970152
add suggestions and store settings until logout
2016-12-19 13:45:09 -08:00
KDSBrowne
90e63b0b54
moved this.setState
2016-12-18 17:00:42 -08:00
KDSBrowne
83091a969d
changed behaviour of fontSizeName bug
2016-12-14 08:42:25 -08:00
KDSBrowne
4bdfb54b4e
fixed lint issues
2016-12-14 07:57:54 -08:00
KDSBrowne
adcb46cb41
cleaned up code
2016-12-14 07:50:35 -08:00
KDSBrowne
6512b7be8a
fixed bug, removed console logs
2016-12-14 07:40:13 -08:00
KDSBrowne
eb7f58e2bb
fixed issues, ready to set up save
2016-12-13 20:04:26 -08:00
KDSBrowne
38b9227f04
improved application settings - incomplete
2016-12-13 19:40:32 -08:00
Anton Georgiev
b7c47d900a
reduce logging of cursor
2016-12-07 20:50:51 +00:00
Anton Georgiev
98bfae960b
fix import for Logger
2016-12-07 16:12:46 +00:00
perroned
0a12d2f6ce
Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2
...
Conflicts:
bigbluebutton-html5/imports/startup/server/EventQueue.js
2016-12-01 19:19:58 +00:00
Anton Georgiev
cfcd41c5bb
Merge pull request #3487 from KDSBrowne/New-Logger-Levels
...
New logger levels
2016-12-01 14:03:04 -05:00
KDSBrowne
9187a020d6
Added Antons changes
2016-11-30 08:30:52 -08:00
gcampes
eba3e21e92
Changes handlers for breakouts
2016-11-29 14:52:15 -02:00
gcampes
5089c18ef3
imports underscore, removes prefix not needed in variables
2016-11-29 13:49:08 -02:00
gcampes
903ba22713
Merge remote-tracking branch 'upstream/master' into breakout-rooms-html5
...
* upstream/master:
Removed carriage returns from bigbluebutton.properties
make function export default
fix Meteor.Error
removed duplication
fixed lint issue
added suggestions
removed console logs
fixed lint issues
added moderator condition
Shows main setting options based on role
2016-11-29 08:25:59 -02:00
gcampes
470b6e08c1
Change breakout code
2016-11-28 17:48:02 -02:00
Anton Georgiev
e1f63c0aec
make function export default
2016-11-28 19:36:58 +00:00
Anton Georgiev
7f9228ac02
fix Meteor.Error
2016-11-28 19:36:06 +00:00
gcampes
f75c73b4e6
Polish breakout rooms code
2016-11-24 17:22:04 -02:00
gcampes
7001ec59fc
Adds correct handling for breakouts update
2016-11-23 14:18:36 -02:00
gcampes
1ba90598f6
Fix timer for breakouts
2016-11-23 14:13:41 -02:00
gcampes
655f8dd6d6
Fix merge conflicts
2016-11-23 13:33:51 -02:00
gcampes
0aa6022c89
Changes breakout code to handle the new message format
2016-11-23 13:32:04 -02:00
Anton Georgiev
5635f94789
refactor updateVoiceUser.js
2016-11-22 16:15:42 +00:00
gcampes
e14c9159df
Fix breakout closing issues
2016-11-22 13:46:08 -02:00
Anton Georgiev
462d72afa0
handle talking event in html5
2016-11-22 15:06:54 +00:00
Anton Georgiev
ba7e69333c
Merge pull request #3475 from oswaldoacauan/refactor-api-shapes
...
[HTML5] Refactor API Shapes (whiteboard)
2016-11-21 13:38:03 -05:00
Oswaldo Acauan
bf99bb50d4
Clear shapes after clearing an presentation
2016-11-21 16:04:42 +00:00
gcampes
bdb6780f7a
Merge remote-tracking branch 'upstream/master' into breakout-rooms-html5
...
* upstream/master:
removed unecessary import statements
adjusted to meet component/container structure conventions and simplify code
Remove wrong commited files
Refactor API Cursor's
Fix bug related to presentation handlers
linting fixes & updated based on feedback
HTML5-clent messages on chat - changed icon for logged out users
fixed an error with exit audio
Added mute/unmute/join listen only/leave audio features to join audio modal
HTML5-client messages for logged out user on chat
HTML5-clent messages on chat
2016-11-21 10:53:55 -02:00
Anton Georgiev
c98813e7b3
Merge pull request #3460 from mmarangoni/html5-stun-audio
...
Mute, Unmute, Leave Audio
2016-11-18 17:03:13 -05:00
Oswaldo Acauan
4fe83bf79d
Refactor Shapes API
2016-11-18 17:59:11 +00:00
Oswaldo Acauan
b0e784ec60
Merge remote-tracking branch 'upstream/master' into refactor-api-shapes
...
* upstream/master:
Remove wrong commited files
Refactor API Cursor's
2016-11-18 17:35:53 +00:00
Oswaldo Acauan
529ff51a72
Refactor Shapes API
2016-11-18 17:35:28 +00:00
gcampes
9f478416c5
Fix html changing the breakout room url for flash
2016-11-18 15:14:00 -02:00
Oswaldo Acauan
e932bb88fd
Remove wrong commited files
2016-11-18 12:28:55 +00:00
Oswaldo Acauan
b4f9d88fac
Refactor API Cursor's
2016-11-18 12:26:14 +00:00
Oswaldo Acauan
15f59f9781
Fix bug related to presentation handlers
2016-11-17 15:54:24 +00:00
Gabriel Carvalho de Campes
7cdf04dd66
update clear for meetings, adds breakouts
2016-11-17 13:20:40 -02:00
Gabriel Carvalho de Campes
85013eac1f
Fix issues from merge
2016-11-16 15:44:05 -02:00
Gabriel Carvalho de Campes
dad3c1a4c7
Merge conflicts
2016-11-16 13:35:39 -02:00
Matthew Marangoni
0abcc06bfc
linting fixes & updated based on feedback
2016-11-15 13:00:28 -08:00
Anton Georgiev
9b3b28129f
fix slide switching (typo)
2016-11-15 16:19:33 +00:00
Anton Georgiev
0598591fc7
remove reference to undef
2016-11-14 22:24:24 +00:00
Anton Georgiev
8a377e0a18
adjust name of resource + function
2016-11-14 21:40:50 +00:00
Anton Georgiev
74cf17e812
Merge branch 'refactor-poll-api' of github.com:Gcampes/bigbluebutton into merge-osw-pr-1
2016-11-14 21:31:21 +00:00
Gabriel Carvalho de Campes
caabead5e0
Removes unused code
2016-11-14 16:25:23 -02:00
Gabriel Carvalho de Campes
694e300d55
Polish breakout code
2016-11-14 16:23:04 -02:00
Gabriel Carvalho de Campes
214357adc6
Fix conflicts
2016-11-14 14:54:04 -02:00
Gabriel Carvalho de Campes
eb3705321f
polish breakout room code html5
2016-11-14 14:12:54 -02:00
Gabriel Carvalho de Campes
3f53620416
Merge remote-tracking branch 'upstream/master' into breakout-rooms-html5
...
* upstream/master: (22 commits)
- create only one netConnection to bbb-apps. Not re-create one when reconnecting.
- log client out when user is ejected from meeting.
- reset connectAttemptTimeout as we don't want to fail connection on reconnects.
- fix rtmpt
- add more logging to track issues
Update Gemfile.lock for 1.1-dev
- log locale version
- remove user join log
improve logs for webrtc events
- improve client side logging.
add EN string to ClientStatusEvent
Updated restart of libreoffice for systemd
- add log to indicate successful connection to bbb-apss
bbb-web: Escaped strings used in freemarker template for thumbnails
record-and-playback: Removed preview extension (thumbnails) from recordings when only has default presentation
Fix import in stunturn reply handler
Fix handleStunTurnReply function name
Clean up before PR
Rever wrong changes on chat handler parameters
Revert wrong changes on chat handler name
...
2016-11-14 10:00:42 -02:00
Gabriel Carvalho de Campes
39dffd68b4
Update breakout rooms in html5
2016-11-14 09:57:10 -02:00
Matthew Marangoni
807f434d72
fixed an error with exit audio
2016-11-11 14:11:00 -08:00
Matthew Marangoni
482fc97388
Added mute/unmute/join listen only/leave audio features to join audio modal
2016-11-11 13:09:34 -08:00
Oswaldo Acauan
1df46bb201
Refactor of Presentations API
2016-11-11 19:02:46 +00:00
Oswaldo Acauan
2cf4bd3f5a
Merge conflicts
2016-11-10 15:13:02 +00:00
Gabriel Carvalho de Campes
a262430871
Add code to handle breakout rooms in html5
2016-11-07 13:52:39 -02:00
Oswaldo Acauan
41f06644c2
Fix import in stunturn reply handler
2016-11-03 17:23:00 +00:00
Oswaldo Acauan
6a8f997b00
Fix handleStunTurnReply function name
2016-11-03 13:35:05 +00:00
Oswaldo Acauan
71fb7abd70
Refactor stuns/turns handler
2016-11-03 13:33:14 +00:00
Gabriel Carvalho de Campes
e8974fe929
Add initial file structure for breakouts api
2016-10-27 15:47:40 -02:00
Matthew Marangoni
7fb492894e
Added exiting audio
2016-10-25 14:16:40 -07:00
Matthew Marangoni
d21545c847
added html5 stun request and reply
2016-10-25 07:59:14 -07:00
Matthew Marangoni
0d3f231ac1
Merge remote-tracking branch 'upstream/master' into html5-stun-audio
2016-10-24 09:08:13 -07:00
Matthew Marangoni
374698c338
beginning work on html5 audio
2016-10-24 09:01:50 -07:00
Gabriel Carvalho de Campes
5aaafa8202
Merge remote-tracking branch 'upstream/master' into refactor-poll-api
...
* upstream/master: (26 commits)
- fix check for breakout room - insert breakout metadata into events.xml - delete breakout metadata from redis
Rename meteor method on the client
Remove left over debug
Fix chat being always inserted when the server start
Add debug message when handler is completed with errors
Fix bug on the clearChats and addChat modifiers
HTML5 - fixed linebreak with lint
HTML5 - fixes fullscreen toggle to un-fullscreen
Monitoring for number of user is not triggered for breakout rooms.
Updated bbb-record rules to detect recording directories.
Added new property redirectOnJoin to CreateBreakoutRoomsRequest.
Added redirect property to RequestBreakoutJoinURL.
Fix handler for 'get_whiteboard_shapes_reply' not calling the cb
Store breakout meeting info in redis under "meeting:breakout" key instead of "meeting:info"
Using blank-presentation.pdf as default breakout room presentation when no current presentation is set to the parent room.
Re-enable recording option for breakout rooms.
Store breakout room externalMeetingID to be used for generating join URL.
Store breakout room sequence in akka-apps and bbb-web.
Revert replacing the deprecated shaHex DigestUtils by sha1Hex and updated API controller.
Deleted unused imports from bigbluebutton-apps and bigbluebutton-web
...
2016-10-24 13:39:37 -02:00
Oswaldo Acauan
0d2225b79c
Clean up before PR
2016-10-24 11:20:30 +00:00
Oswaldo Acauan
e1421566be
Merge branch 'master' into refactor-meetings-api
...
* master: (22 commits)
- fix check for breakout room - insert breakout metadata into events.xml - delete breakout metadata from redis
Rename meteor method on the client
HTML5 - fixed linebreak with lint
HTML5 - fixes fullscreen toggle to un-fullscreen
Monitoring for number of user is not triggered for breakout rooms.
Updated bbb-record rules to detect recording directories.
Added new property redirectOnJoin to CreateBreakoutRoomsRequest.
Added redirect property to RequestBreakoutJoinURL.
Fix handler for 'get_whiteboard_shapes_reply' not calling the cb
Store breakout meeting info in redis under "meeting:breakout" key instead of "meeting:info"
Using blank-presentation.pdf as default breakout room presentation when no current presentation is set to the parent room.
Re-enable recording option for breakout rooms.
Store breakout room externalMeetingID to be used for generating join URL.
Store breakout room sequence in akka-apps and bbb-web.
Revert replacing the deprecated shaHex DigestUtils by sha1Hex and updated API controller.
Deleted unused imports from bigbluebutton-apps and bigbluebutton-web
Replace the deprecated shaHex DigestUtils by sha1Hex.
Send sequence number when creating breakout rooms and correctly generate a unique externalMeetingId for breakout rooms.
Breakout rooms are now sorted by their sequence number.
Added sequence property breakout room.
...
2016-10-24 11:14:14 +00:00
Anton Georgiev
e26e9fd060
Merge pull request #3419 from oswaldoacauan/rewrite-queue-handler
...
[HTML5] Refactor of RedisHandler and Chat API
2016-10-21 15:47:48 -04:00
Gabriel Carvalho de Campes
242b2f756f
change publishVote method and polish poll api code
2016-10-21 16:56:42 -02:00
Oswaldo Acauan
8874c15e9f
Rename meteor method on the client
2016-10-21 18:47:33 +00:00
Gabriel Carvalho de Campes
8036678aae
Changes code based on feedback
2016-10-21 15:42:43 -02:00
Gabriel Carvalho de Campes
0a873c302c
Changes poll api to the correct conventions
2016-10-21 15:11:28 -02:00
Oswaldo Acauan
8e27e35e07
Rever wrong changes on chat handler parameters
2016-10-21 17:10:27 +00:00
Oswaldo Acauan
d1786d61a6
Revert wrong changes on chat handler name
2016-10-21 17:08:43 +00:00
Oswaldo Acauan
c590f3ffd9
Merge branch 'rewrite-queue-handler' into refactor-meetings-api
...
* rewrite-queue-handler:
Remove left over debug
Fix chat being always inserted when the server start
Add debug message when handler is completed with errors
2016-10-21 16:57:01 +00:00
Oswaldo Acauan
85a1a44cc9
Remove left over debug
2016-10-21 16:55:54 +00:00
Oswaldo Acauan
e67c127e8f
Fix chat being always inserted when the server start
2016-10-21 16:54:17 +00:00
Oswaldo Acauan
c7b62a209c
Refactor Meeting API
2016-10-21 16:27:47 +00:00
Gabriel Carvalho de Campes
a7335633d4
Refactor Poll API
2016-10-21 11:21:09 -02:00
Oswaldo Acauan
6676feb933
Fix bug on the clearChats and addChat modifiers
2016-10-21 11:56:03 +00:00
Oswaldo Acauan
a76ab6e7e6
Refactor API Slides
2016-10-21 11:41:17 +00:00
Oswaldo Acauan
b04e071389
Revert Meteor version to stable release
2016-10-19 17:54:09 +00:00
Oswaldo Acauan
077cf8471c
Change filenames based on slack feedback
2016-10-19 17:49:38 +00:00
Oswaldo Acauan
1d30281cf2
Refactor server Chat API
2016-10-19 12:18:47 +00:00
Oswaldo Acauan
79cdf636eb
Rewrite Redis related classes
2016-10-18 12:03:51 +00:00
Oswaldo Acauan
f055771abd
Fix handler for 'get_whiteboard_shapes_reply' not calling the cb
2016-10-14 16:18:54 +00:00
perroned
7ca23e44cc
Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2
...
Conflicts:
bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/ScreenshareManager.as
bigbluebutton-html5/imports/startup/server/EventQueue.js
bigbluebutton-html5/imports/ui/components/modals/settings/submenus/AudioMenu.jsx
2016-09-14 19:30:07 +00:00
Anton Georgiev
349b216928
omit hiredis package; cleanup
2016-08-29 21:34:03 +00:00
Anton Georgiev
a4dc2301a0
fix bug related to change presentation
2016-08-25 15:57:31 +00:00
Laily Ajellu
f0cdbfaf2e
Fixed merge conflicts
2016-08-23 16:45:28 -07:00
perroned
820ee786f0
Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2
2016-08-22 09:21:54 -07:00
Oleksandr Zhurbenko
7054b36721
Minor corrections
2016-08-22 08:34:46 -07:00
Oleksandr Zhurbenko
ab975cd9b7
Changed update to upsert for the cursor updates
2016-08-20 20:30:38 -07:00
Oleksandr Zhurbenko
da70d2cd89
Changed CC's split limit to 1,000 characters
2016-08-20 19:57:28 -07:00
Oleksandr Zhurbenko
d9ddbfbda6
Cleanup, linting, fixed css modules' imports
2016-08-20 18:14:12 -07:00
Oleksandr Zhurbenko
f64ed1fd4a
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into closed-captioning
2016-08-20 16:37:11 -07:00
Oleksandr Zhurbenko
993b7d2ca2
Added handling for edit_caption_history_message
2016-08-19 21:25:43 -07:00
Lajellu
19ff007adb
Changes logger to NPM package. Makes RedisPubSub and logger run after Meteor.startup
2016-08-19 14:08:46 -07:00
Lajellu
dedaa4e7aa
Merge remote-tracking branch 'upstream/master' into config-organization
2016-08-19 13:50:14 -07:00
perroned
63953b1384
Hooking up viewing from html5
2016-08-19 14:07:47 +00:00
Richard Alam
76e7e6d568
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into start-pause-stop-screen-sharing-with-webrtc
2016-08-17 18:44:49 +00:00
Lajellu
8e7b1d6317
HTML5 - Changes config organization and all files dependant on config files
2016-08-17 08:48:03 -07:00
Oswaldo Acauan
e5c29a9bec
Change operations order to prevent currentSlide being undefined
2016-08-15 19:25:36 +00:00
Oleksandr Zhurbenko
33359acc52
Creating a new empty captions object when a moderator takes ownership over the locale
2016-08-09 12:29:11 -07:00
Oleksandr Zhurbenko
76574be9c2
Fixed a bug with adding an empty initial captions object
2016-08-09 12:25:49 -07:00
Richard Alam
dcd226dc9f
Merge branch 'merge-webrtc-screenshare-2' of https://github.com/perroned/bigbluebutton into perroned-merge-webrtc-screenshare-2
2016-08-09 14:26:40 +00:00
Oleksandr Zhurbenko
10272d5317
Changed the way of how we iterate through captions' collection
2016-08-08 14:45:09 -07:00
Lajellu
76679c9cb9
removes HTML5 whiteboard extra code, whiteboard css trailing space, and rename service in slide controls
2016-08-05 13:13:48 -07:00
perroned
fc8438f61a
move some data into verto JS
2016-08-05 18:42:02 +00:00
Lajellu
12ec76d375
Fixes slide control PR comments
2016-08-05 11:39:24 -07:00
perroned
c057111367
Merge remote-tracking branch 'upstream/master' into merge-webrtc-screenshare-2
...
Conflicts:
bigbluebutton-client/resources/config.xml.template
bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/ScreenshareManager.as
2016-08-04 18:23:45 +00:00
Lajellu
219078f49d
adds slide controls and new bbb icons
2016-08-02 15:55:20 -07:00
Lajellu
565150b382
Merge remote-tracking branch 'upstream/master' into presentationControls
2016-08-02 15:38:28 -07:00
Oswaldo Acauan
afe1a66e02
Fix conflicts and merge master
2016-07-28 19:50:44 +00:00
Oswaldo Acauan
b8e4a2692c
Add handlers for kick
2016-07-28 19:48:26 +00:00
Oleksandr Zhurbenko
79c06588e3
Updated update_caption_owner_message
...
So that owner_id could be updated in multiple objects
2016-07-28 11:53:13 -07:00
perroned
8c7fdc0036
Merge remote-tracking branch 'upstream/master' into join-components-with-skeleton
...
Conflicts:
bigbluebutton-client/resources/prod/lib/verto_extension.js
2016-07-27 19:32:01 +00:00
Anton Georgiev
a1fde6ae12
add httpS flag in config instead of detecting prod vs dev env
2016-07-27 16:36:33 +00:00
Lajellu
1ead9ced59
adds presentation controls
2016-07-26 13:56:43 -07:00
Oswaldo Acauan
2c93c41fc5
Update handler payload check
2016-07-26 18:50:18 +00:00
Anton Georgiev
860916efc1
refactor 2 cases
2016-07-26 17:47:36 +00:00
Anton Georgiev
3e070872cf
fix issue with slide calc under https
2016-07-26 17:33:35 +00:00
Oleksandr Zhurbenko
6c7cb5a65b
Changed the way we store captions on the initial history retrieving
2016-07-25 16:33:33 -07:00
perroned
2a23778ea9
Merge remote-tracking branch 'upstream/master' into join-components-with-skeleton
...
Conflicts:
bigbluebutton-client/resources/config.xml.template
bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/managers/ScreenshareManager.as
bigbluebutton-client/src/org/bigbluebutton/modules/screenshare/model/ScreenshareOptions.as
bigbluebutton-html5/imports/api/verto/index.js
bigbluebutton-html5/imports/ui/components/deskshare/service.js
2016-07-22 19:20:00 +00:00
Oleksandr Zhurbenko
c5c0f32df6
Handling all messages related to closed-captions
...
send_caption_history_reply_message , update_caption_owner_message , edit_caption_history_message
2016-07-21 18:27:26 -07:00
Oleksandr Zhurbenko
331ad1e3c4
Fixed a bug when we couldn't retrieve the initial Chat history
...
Happened when meeting and chat messages appeared before the Meteor joined
2016-07-18 10:42:53 -07:00
Oleksandr Zhurbenko
9b85629f2c
Initial handling of the 'update_caption_owner_message'
2016-07-14 13:55:49 -07:00
Anton Georgiev
6a984c2b68
adding captions support in html5 (part1)
2016-07-14 12:03:30 -07:00
Oswaldo Acauan
306ef94237
Fix conflicts
2016-07-12 14:02:48 +00:00
Oleksandr Zhurbenko
8947f732b3
Restructuring
2016-07-11 08:49:26 -07:00
Oswaldo Acauan
9b53090c81
Change Auth service to be a singleton class
2016-07-11 13:45:24 +00:00
Oswaldo Acauan
1c0132ed5b
Merge after git conflict/lost object
2016-07-11 12:34:58 +00:00
Oleksandr Zhurbenko
bcfa3d41ec
Linting
2016-07-08 16:13:26 -07:00
Oleksandr Zhurbenko
7948571525
Added support for png and check to see if the image is ready
...
resolves #3206
2016-07-08 16:11:52 -07:00
Gabriel Carvalho de Campes
537d8753fe
Merge remote-tracking branch 'origin/master' into router-changes
...
* origin/master:
upgrade sip.js to 0.7.5
Moved polling files back to components folder
Fixed a small issue with reduce() in the poll annotation
Made polling buttons accessible
Updated packages and fixed some of the warnings introduced by React 15.2.0
Updates to bbb-conf for BigBlueButton 1.1 (mostly changes to support systemd on Ubuntu 16.04)
Centering polling buttons
Title and calculated styling for the polling UI
Mark open chat as active
Remove some old code
Changes the way user actions are rendered
Replaced polling under the whiteboard
Solve issues from github comments
Remove color-generator because it is not being used
polish code
Updates the userlist
Conflicts:
bigbluebutton-html5/imports/ui/components/app/container.jsx
2016-07-08 11:59:05 +00:00
Gabriel Carvalho de Campes
6c4eae35bb
Adds link to meteor issue on comment, remove unused import
2016-07-07 16:15:12 +00:00
Gabriel Carvalho de Campes
e8f1a877c4
Remove logs, and add some removed code back
2016-07-07 14:46:18 +00:00
Gabriel Carvalho de Campes
ac3353d855
Changes Router in order for the livereloading to work again
2016-07-07 14:01:40 +00:00
Oswaldo Acauan
d1f2614d00
Fix merge conflicts
2016-07-05 16:50:14 +00:00
Oswaldo Acauan
55538202d6
Change chat message timestamp from string to int
2016-07-04 18:34:36 +00:00
Oleksandr Zhurbenko
83fff53269
Replaced polling under the whiteboard
2016-06-29 15:00:06 -07:00
Jaeeun Cho
9eacf32497
fixes html5 clinet logout and nav-bar
2016-06-28 15:30:43 -04:00
Oleksandr Zhurbenko
390935e304
Changed 'let' to 'const' where it was possible and adjusted imports
2016-06-27 14:48:46 -07:00
Oleksandr Zhurbenko
3d0132685f
Fixed a bug with Polls deletion from all meetings
...
Which happened when we published a poll, cleared a collection, and then received a poll_stopped_message
2016-06-27 11:30:37 -07:00
Oleksandr Zhurbenko
8b4747a89d
Fixed all the 120+ linter warnings
2016-06-27 11:24:37 -07:00
Oleksandr Zhurbenko
40cedc28bc
Fixed a bug with the deletion of the Poll
...
It was always undefined here
2016-06-27 09:31:15 -07:00
Jaeeun Cho
991034b5bf
Merge remote-tracking branch 'upstream/master' into logOut
2016-06-24 10:48:52 -04:00
Jaeeun Cho
3325ac4974
fixes html5 clinet logout and nav-bar
2016-06-24 10:48:09 -04:00
Oleksandr Zhurbenko
1e694b2a01
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-react
2016-06-23 13:55:40 -07:00
Anton Georgiev
4195905c2b
change audio to default to SIP
2016-06-21 15:34:10 +00:00
Jaeeun Cho
73c9898698
fixes html5 clinet logout and nav-bar
2016-06-17 18:15:11 -04:00
perroned
86035fce39
Adds verto manager window functions
2016-06-17 17:47:24 +00:00
Oleksandr Zhurbenko
0d1ad108f0
Fixed polling for the HTML5 viewers
2016-06-15 14:04:25 -07:00
perroned
a95ed82293
Merge remote-tracking branch 'upstream/master' into join-components-with-skeleton
...
Conflicts:
bigbluebutton-html5/imports/api/verto/index.js
bigbluebutton-html5/imports/ui/components/deskshare/service.js
2016-06-15 20:07:42 +00:00
Oleksandr Zhurbenko
9bd1d6f15a
Moved check for polling to AddShapeToCollection
...
So that it worked for both get_whiteboard_shapes_reply and send_whiteboard_shape_message
2016-06-15 11:09:05 -07:00
Oleksandr Zhurbenko
0ad772345a
Removed unused properties
2016-06-14 13:02:37 -07:00
perroned
e9fd499851
Readding verto sharing
2016-06-14 16:11:04 +00:00
Anton Georgiev
7fb2184c02
fix querry for existing meetings
2016-06-13 21:39:31 +00:00
Oleksandr Zhurbenko
2ff5afd056
Fixed issues with adding and updating Text shape objects to the db
2016-06-10 10:39:47 -07:00
perroned
c2702522ca
Upgrades html5 client for new verto code
2016-06-08 20:09:43 +00:00
Oleksandr Zhurbenko
e39963d4de
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-react
...
Conflicts:
bigbluebutton-html5/package.json
2016-06-02 15:20:41 -07:00
Richard Alam
424de0f2f9
Merge pull request #3161 from antobinary/captions
...
recover caption funct; prepare akka-apps for captions on bbb-html5
2016-06-02 17:02:03 -04:00
Oswaldo Acauan
b77b8ce971
Fix Welcome message not being parsed
2016-06-02 16:34:17 -03:00
Oswaldo Acauan
f204e6007a
Sanitize chat messages client and server-side
2016-06-02 16:08:17 -03:00
Oswaldo Acauan
d642cb1c99
Add chat send message functionality
2016-06-02 15:40:27 -03:00
Oswaldo Acauan
f39b7171af
Move session/auth logic to separated services
2016-06-02 10:46:35 -03:00
Anton Georgiev
9cf03a8ce8
move helpers; extract nodejsApp
2016-06-01 17:18:13 +00:00
perroned
844210faea
Fixes audio permission, render tag
2016-06-01 15:56:12 +00:00
gcampes
ce32ae5b20
Merge branch 'html5-new-userlist' into html-userlist
2016-05-31 08:37:14 -03:00
perroned
c8fdf66099
Lints
2016-05-27 16:34:03 +00:00
perroned
393b49fdbe
Cleans up duplicate code
2016-05-27 16:17:16 +00:00
perroned
2f9afaa8d6
Uses same name for voiceBridge where possible
2016-05-26 20:25:55 +00:00
perroned
b8ae3a5304
Fixes some imports
2016-05-26 20:01:49 +00:00
Oleksandr Zhurbenko
50597726d9
Ported changes in addShapeToCollection func and the structure of the text shape obj to the new server side structure
2016-05-26 09:37:54 -07:00
Anton Georgiev
02f03205a4
minor edit to handle voice events
2016-05-25 16:32:23 -03:00
Anton Georgiev
61236078c7
bring callback out of if/else
2016-05-25 16:32:11 -03:00
perroned
ef56169ebb
Access sip function through window
2016-05-19 20:18:20 +00:00
perroned
e8229b1851
Some linting
2016-05-19 19:27:49 +00:00
perroned
3934ae3dce
Adds some work for verto calling
2016-05-19 18:33:27 +00:00
perroned
428941f896
Hangs up from sip audio
2016-05-19 16:21:22 +00:00
perroned
8117f91ec9
Fixes some imports
2016-05-19 16:14:12 +00:00
perroned
97c94ecace
Merge remote-tracking branch 'upstream/master' into join-components-with-skeleton
...
Conflicts:
bigbluebutton-html5/imports/api/cursor/server/modifiers/initializeCursor.js
bigbluebutton-html5/imports/api/phone/index.js
bigbluebutton-html5/imports/api/users/server/modifiers/userJoined.js
2016-05-19 15:47:47 +00:00
perroned
955c27efcc
Beginning to add exiting sip
2016-05-19 15:20:36 +00:00
perroned
a637c29710
Fixes some paths
2016-05-19 15:19:42 +00:00
perroned
d83c96bf5d
Changes Meteor.config to an export
2016-05-18 20:19:50 +00:00
perroned
66a391c191
Updates server function to use new argument
2016-05-18 19:31:20 +00:00
perroned
4be18d2156
Updates client side data gathering for audio call
2016-05-18 19:29:28 +00:00
Anton Georgiev
eea6bc0829
adjust path of collections
2016-05-16 20:26:24 +00:00
Anton Georgiev
8d52dc1b40
Merge branch 'join-components-with-skeleton' of github.com:perroned/bigbluebutton into router-merging
...
Conflicts:
bigbluebutton-html5/imports/api/chat/server/methods/sendChatMessagetoServer.js
bigbluebutton-html5/imports/api/meetings/server/modifiers/addMeetingToCollection.js
bigbluebutton-html5/imports/api/polls/server/methods/publishVoteMessage.js
bigbluebutton-html5/imports/api/slides/server/modifiers/clearSlidesCollection.js
bigbluebutton-html5/imports/api/users/server/methods/muteUser.js
bigbluebutton-html5/imports/api/users/server/methods/setUserPresenter.js
bigbluebutton-html5/imports/api/users/server/methods/unmuteUser.js
bigbluebutton-html5/imports/api/users/server/methods/userSetEmoji.js
bigbluebutton-html5/imports/api/users/server/methods/validateAuthToken.js
bigbluebutton-html5/imports/startup/server/eventHandlers.js
bigbluebutton-html5/imports/ui/components/app/AppService.js
2016-05-16 19:54:51 +00:00
Anton Georgiev
cbef1c4abd
split emitter.on; move to api
2016-05-16 19:12:49 +00:00
perroned
5be138fd31
Fixes cursor structure
2016-05-16 13:13:03 -05:00
perroned
4adad8bb32
Changes credential passing to 1 object
2016-05-16 13:12:27 -05:00
perroned
98aae7aade
Changes collection imports
2016-05-16 13:05:44 -05:00
Anton Georgiev
a263c1388b
lint mostly
2016-05-16 14:35:59 +00:00
perroned
109a8da350
Fixes whitespace
2016-05-16 09:14:28 -05:00
perroned
d9dbb51023
Moves to api/collection/index
2016-05-16 09:14:02 -05:00
perroned
642a4e45c5
Merge remote-tracking branch 'anton/router-merging' into join-components-with-skeleton
...
Conflicts:
bigbluebutton-html5/imports/ui/components/app/AppService.js
2016-05-13 14:54:19 -05:00
perroned
6a9ccb355f
Updates callServer arguments and passes credential object
2016-05-13 11:17:00 -05:00
Anton Georgiev
57352f193c
rework users publish
2016-05-13 16:11:44 +00:00
perroned
d966aee2d7
Fixing paths for structure
2016-05-12 14:50:02 -05:00
perroned
3e0c3d1ee1
Merge remote-tracking branch 'anton/router-merging' into join-components-with-skeleton
...
Conflicts:
bigbluebutton-html5/imports/ui/components/app/AppService.js
2016-05-12 14:30:46 -05:00
Anton Georgiev
ecd3b3de17
log in user properly
2016-05-12 19:22:51 +00:00
perroned
3b8c9c2971
Changing structure to /api/list/index.js
2016-05-12 14:04:00 -05:00
perroned
dc3dd43f1a
Merge remote-tracking branch 'upstream/master' into join-components-with-skeleton
...
Conflicts:
bigbluebutton-html5/imports/api/polls/polls.js
bigbluebutton-html5/imports/ui/components/app/AppService.js
2016-05-12 13:58:06 -05:00
Anton Georgiev
6a92c9400b
restructure modifiers and methods
2016-05-12 17:43:59 +00:00
perroned
f1f24acda8
Adds some services
2016-05-12 10:43:09 -05:00
Anton Georgiev
699fde7344
accommodate for poll and deskshare
2016-05-10 20:25:24 +00:00
Anton Georgiev
298927cf4f
Merge branch 'join-components-with-skeleton' of github.com:perroned/bigbluebutton into router-merging
...
Conflicts:
bigbluebutton-html5/collections/collections.js
bigbluebutton-html5/imports/api/meetings/server/meetings.js
bigbluebutton-html5/imports/startup/server/collectionManagers/poll.js
bigbluebutton-html5/imports/startup/server/eventHandlers.js
bigbluebutton-html5/imports/startup/server/helpers.js
bigbluebutton-html5/imports/startup/server/meteorMethods/publishVoteMessage.js
bigbluebutton-html5/imports/startup/server/publish.js
bigbluebutton-html5/imports/ui/components/app/AppService.js
bigbluebutton-html5/server/server.js
2016-05-10 19:39:01 +00:00
Anton Georgiev
45342b8a04
restructure; subscribe for remaining collections
2016-05-10 18:53:05 +00:00
perroned
84acf39fd3
Begins adding phone service
2016-05-10 10:54:55 -05:00
perroned
57add2fa50
rename poll -> polls.js
2016-05-10 10:34:13 -05:00
perroned
587627562c
Fixes some api structure
2016-05-10 10:23:22 -05:00
Anton Georgiev
bfd4afd07d
Users collection now available on client side
2016-05-09 21:19:45 +00:00
perroned
67115c0169
Begins adding deskshare functionality
2016-05-06 15:15:47 -05:00
perroned
3769c67534
Adds font control for settings
2016-05-05 16:15:15 -05:00
