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
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
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
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
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
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
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
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
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
