prlanzarin
3a72afa350
Merge remote-tracking branch 'upstream/v2.0.x-release' into video-reconnection
2017-12-21 17:37:07 +00:00
Lucas Zawacki
06f8b56a82
Merge remote-tracking branch 'prlanzarin1/ghost-webcams' into html5-video-media-flow
...
Conflicts:
bigbluebutton-html5/imports/ui/components/video-dock/component.jsx
2017-12-20 18:43:33 -02:00
prlanzarin
362335f727
Made the users own webcam local instead of server-side
2017-12-20 20:06:27 +00:00
Anton Georgiev
d6aa4ed44d
Merge pull request #4733 from oswaldoacauan/fix-4700
...
Improvements on Presentation Management
2017-12-15 19:03:54 -02:00
Lucas Zawacki
1e514aad04
Merge branch 'bbb-webrtc-sfu' of github.com:prlanzarin/bigbluebutton-1 into bbb-webrtc-sfu
...
Removed several variables that were in this.state to this in the html5 video-dock component
Conflicts:
bigbluebutton-html5/imports/ui/components/video-dock/component.jsx
2017-12-15 13:47:03 -02:00
Anton Georgiev
085eb57556
add ejectUserFromVoice for moderator
2017-12-08 11:40:52 -05:00
prlanzarin
89bd746f1c
Changed webcam localization strings
2017-12-08 16:23:21 +00:00
Anton Georgiev
48bf163559
linting and clean-up
2017-12-07 17:13:44 -05:00
Anton Georgiev
bf7c26f02b
Merge pull request #4712 from Tainan404/localize-public-clear
...
Localize message from when clear the chat.
2017-12-07 18:27:55 -02:00
Anton Georgiev
c9a5ded2c1
Merge pull request #4662 from Tainan404/fix-design
...
Fix design issues
2017-12-05 18:54:08 -02:00
Anton Georgiev
255d64d430
Merge pull request #4687 from Gcampes/audio-refactor-bugfixes
...
Audio bugfixes and improvements
2017-12-05 17:17:35 -02:00
Oswaldo Acauan
938c3c2c0d
Add actual current pres indicator
2017-12-04 14:18:57 -02:00
Lucas Zawacki
1f2f5dc218
More reconnect logic and some translations
2017-12-01 21:40:25 -02:00
prlanzarin
f2bf5cca87
Fixed missing comma in english localization file
2017-11-29 14:02:55 +00:00
Tainan Felipe
488f9eacc3
Merge remote-tracking branch 'upstream/v2.0.x-release' into fix-design
2017-11-29 09:32:39 -02:00
Tainan Felipe
2afd7b16a0
readd missing messages
2017-11-29 08:48:57 -02:00
Oswaldo Acauan
807bd99f82
Fix stuck state on conversion failure
2017-11-28 10:26:00 -02:00
Oswaldo Acauan
e8de534964
Add error handling on presentation upload and covnersion
2017-11-27 15:44:45 -02:00
Tainan Felipe
d15bb139bb
refactor emoji menu
2017-11-23 15:20:27 -02:00
Tainan Felipe
545d9e158b
altered id of the intl message
2017-11-23 11:00:41 -02:00
Tainan Felipe
6845aed0e0
localize message from when clear the chat
2017-11-21 16:31:53 -02:00
Anton Georgiev
697f178b8f
Merge pull request #4647 from Tainan404/translate-slide-option
...
Add localization for slides options
2017-11-20 18:11:37 -02:00
Gabriel Carvalho de Campes
74bb2bb5e8
fix permission overlay positioning, localizes messages
2017-11-17 17:01:52 -02:00
Tainan Felipe
881a8e153e
change name of the variables for goToSlide
2017-11-17 13:54:23 -02:00
Gabriel Carvalho de Campes
effb21fc1f
Changes and enhancements on audio, wIP
2017-11-17 09:52:48 -02:00
Tainan Felipe
0c37aa96df
hchange of slide for slideLabel
2017-11-17 08:27:12 -02:00
Gabriel Carvalho de Campes
36c9d85749
Merge remote-tracking branch 'upstream/v2.0.x-release' into audio-refactor
2017-11-16 09:13:47 -02:00
Anton Georgiev
51652fc790
Merge pull request #4669 from jfsiebel/add-moderator-unmute-config
...
add moderatorUnmute feature in HTML5 client
2017-11-14 16:49:41 -02:00
Anton Georgiev
b6befb3ae0
Merge pull request #4601 from Tainan404/notification-chat-message
...
Add toast notification for new chat messages and uncomment settings for chat notifications.
2017-11-14 13:50:25 -02:00
prlanzarin
f43b77c19f
Merge branch 'node-bbb-apps-packaging' into bbb-webrtc-sfu
...
Conflicts:
bigbluebutton-html5/imports/startup/client/base.jsx
bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx
bigbluebutton-html5/imports/ui/components/app/container.jsx
bigbluebutton-html5/imports/ui/components/screenshare/service.js
bigbluebutton-html5/imports/ui/components/video-dock/component.jsx
bigbluebutton-html5/imports/ui/components/video-dock/container.jsx
bigbluebutton-html5/private/locales/en.json bigbluebutton-html5/server/main.js
2017-11-11 03:41:37 +00:00
prlanzarin
2166b56304
Added toggle options for kurento video/screensharing in the HTML5 config yaml
...
Also made cam button respond to those config values
2017-11-10 21:08:40 +00:00
Tainan Felipe
7318370a7e
Add localization for slides options
2017-11-09 13:45:24 -02:00
prlanzarin
e96fc385f1
Handling HTML5 screensharing stop
...
The action bar stop button is temporary
2017-11-06 15:39:55 +00:00
Anton Georgiev
8b80d7e9c2
Merge pull request #4621 from Tainan404/fix-upload-percentage
...
[HTML 5] Rounds upload percentage, localize messages in presentation uploader
2017-11-02 11:03:03 -02:00
Gabriel Carvalho de Campes
e55ee0d28e
fix listen only dead end on permissions denied
2017-11-02 10:10:01 -02:00
Tainan Felipe
9db759074f
moved intl messages to locales/en
2017-11-01 14:37:44 -02:00
Anton Georgiev
8853d562ce
Merge pull request #4497 from Gcampes/audio-refactor
...
[HTML5] Refactor Audio
2017-10-31 15:39:37 -02:00
Gabriel Carvalho de Campes
fde5d56d87
change ask permissions timing, small code fixes
2017-10-31 08:53:06 -02:00
Joao Siebel
86264dcb11
Read allowModeratorToUnmuteAudio property from config
2017-10-30 17:15:43 -02:00
Joao Siebel
4a0fedce3d
Remove the unmute flag from config, fix mute and unmute options for listen only user and check server-side
2017-10-30 16:27:17 -02:00
Tainan Felipe
e1ca9950a1
add chat push notification and refactor audio notification
2017-10-30 08:34:28 -02:00
Gabriel Carvalho de Campes
81f35bac4f
Fix concerns from review
2017-10-26 15:14:56 -02:00
Joao Siebel
d349150bae
add moderatorUnmute feature in HTML5 client
2017-10-26 10:50:55 -02:00
KDSBrowne
34313c6eaa
replace strings with constants
2017-10-25 12:00:31 -07:00
gcampes
d32330b208
Merge remote-tracking branch 'upstream/v2.0.x-release' into audio-refactor
2017-10-24 11:19:58 -02:00
Oswaldo Acauan
1dcfb9e3fa
Merge remote-tracking branch 'upstream/v2.0.x-release' into toast-notifications
2017-10-23 13:31:33 -02:00
Maxim Khlobystov
03eced3236
Updated locales.
2017-10-20 15:17:52 +00:00
Maxim Khlobystov
f455ec97bd
Updated the Khmer labels (doesn't break anymore).
2017-10-19 20:29:30 +00:00
gcampes
3bd709c629
Merge remote-tracking branch 'oswaldo/toast-notifications' into audio-refactor
2017-10-19 09:39:50 -02:00
Oswaldo Acauan
ebfed7795e
Add notification when recording start/stop
2017-10-19 08:45:07 -02:00
