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