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
Tainan Felipe
2c48392b2c
change intl id
2017-12-18 08:53:37 -02: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
Tainan Felipe
c582f5bf08
add meetingEnded in Base component aand add intl translation
2017-12-14 17:03:34 -02:00
Joao Siebel
45ec92c230
Merge remote-tracking branch 'upstream/v2.0.x-release' into whiteboard-toolbar-locale
2017-12-14 08:47:45 -02:00
Tainan Felipe
a66db4797a
Merge remote-tracking branch 'upstream/v2.0.x-release' into toast-breakout-ends
2017-12-11 08:14:27 -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
João Francisco Siebel
950eb488a0
Add locale to whiteboard toolbox items
2017-12-08 11:28:02 -02: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
5f66e79263
linter fixes
2017-11-23 09:49:10 -02:00
Tainan Felipe
37440e11f1
Merge remote-tracking branch 'upstream/v2.0.x-release' into toast-breakout-ends
2017-11-22 11:11:21 -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
gcampes
1dda597fca
Toast notifications on audio and overall changes
2017-10-18 17:40:01 -02:00
Tainan Felipe
114689d284
add toast notification for ended breakout room
2017-10-18 17:24:26 -02:00
gcampes
d1bc675465
changes setdevices to bridge
2017-10-17 17:16:42 -02:00
gcampes
fafbba06cb
Merge remote-tracking branch 'upstream/v2.0.x-release' into audio-refactor
2017-10-12 13:58:39 -03:00
Anton Georgiev
4acecd358c
Merge pull request #4505 from OZhurbenko/merge-2.0-1.1-api
...
[HTML5] - Merged 2.0 and 1.1 api folders
2017-10-12 13:45:46 -03:00
KDSBrowne
31b9a17e2c
add new line
2017-10-12 09:17:20 -07:00
KDSBrowne
5d6a273a57
add missing en.json strings
2017-10-12 09:14:05 -07:00
gcampes
6b44504e5d
Adds timeout to transfer, fix css, remove logs
2017-10-12 11:49:50 -03:00
Anton Georgiev
af9f1e4dd3
Merge pull request #4506 from KDSBrowne/z01-update-locale-files
...
[HTML5] - add translation files from Transifex
2017-10-12 10:17:28 -03:00
Oleksandr Zhurbenko
015ca3d719
Changed imports and removed 'initializeCursor.js' since it's not needed
2017-10-11 19:00:28 -07:00
gcampes
3cba60201e
Merge remote-tracking branch 'upstream/v2.0.x-release' into audio-refactor
2017-10-11 18:22:36 -03:00
gcampes
f943e5dd08
changes error handlers in audio
2017-10-11 18:04:10 -03:00
Anton Georgiev
a850d1c9c1
Merge pull request #4494 from oswaldoacauan/redis-queue-rewrite
...
[HTML5] Redis class refactor
2017-10-11 17:40:28 -03:00
KDSBrowne
5d80b29ca5
add traslations from Trasifex
2017-10-11 12:06:33 -07:00
Anton Georgiev
aa39361360
Merge pull request #4483 from OZhurbenko/presenter-functionality-2x
...
Fix for the Pencil Mongo additions
2017-10-11 15:22:39 -03:00
Anton Georgiev
351a0e43cb
Merge pull request #4470 from KDSBrowne/xx-07-allow-html5-modorator
...
[HTML5] -Allow HTML5 Moderator
2017-10-11 09:04:54 -03:00
Oleksandr Zhurbenko
bbe1f99527
Improvements
2017-10-10 16:20:52 -07:00
Oleksandr Zhurbenko
8b5a53a59a
Moved pencil_chunk_size to the config
...
... And adjusted the way we fetch annotation statuses from the config
2017-10-10 14:50:11 -07:00
gcampes
02cdcb2562
changes to styles and texts in audio flow
2017-10-10 15:03:29 -03:00
Oswaldo Acauan
80a318309c
Implement multi queues and async messages on Redis class
2017-10-10 14:43:42 -03:00
Maxim Khlobystov
d1f6d7c4e0
Replaced double quotes with single ones in the YAML file.
2017-10-06 18:05:30 +00:00
KDSBrowne
d89f0e511f
Merge branch 'v2.0.x-release' into xx-07-allow-html5-modorator
2017-10-06 11:02:17 -07:00
Maxim Khlobystov
5f79db2554
Fixed the issue with the Bulgarian locale always displaying as a default one in the Settings modal.
2017-10-06 16:29:52 +00:00
KDSBrowne
58ab2f974d
add missing locale string
2017-10-06 06:29:16 -07:00
KDSBrowne
4191ce56ed
set allowHTML5Moderator to true
2017-10-06 06:27:45 -07:00
gcampes
40795950c2
updates to the audio manager
2017-10-04 17:49:11 -03:00
gcampes
81a430039d
add echo test component. WIP
2017-10-03 17:42:10 -03:00
Oleksandr Zhurbenko
76bcdd55d6
Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x
2017-10-03 10:34:10 -07:00
Oswaldo Acauan
89c2947d78
Merge remote-tracking branch 'upstream/v2.0.x-release' into presentation-manager-merge
2017-09-29 17:32:31 -03:00
Oswaldo Acauan
2a7fd5ba4d
Rename share method to set to match akka
2017-09-29 10:01:01 -03:00
Oswaldo Acauan
e699c342b6
Add missing suported mimes
2017-09-29 09:31:38 -03:00
Oleksandr Zhurbenko
e0a7bfc9fa
Refactored whiteboard-toolbar
2017-09-22 23:27:55 -07:00
Oswaldo Acauan
cca1e58167
Move default presentation name to config file
2017-09-22 17:49:11 -03:00
Oswaldo Acauan
36699bedb1
Merge remote-tracking branch 'upstream/master' into presentation-manager-merge
2017-09-22 15:11:48 -03:00
Klauswk
22da4648b9
Update en.json
2017-09-22 14:55:05 -03:00
Klaus
97d2f6d3e5
Rollback to the right locales
2017-09-22 14:51:47 -03:00
Klaus
ccf4b1ba21
Fix locales problems
2017-09-22 14:23:25 -03:00
Oleksandr Zhurbenko
e054358947
Created a whiteboard config and moved static values there
2017-09-21 16:44:32 -07:00
Klaus
29922c896a
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-refactor-userlist
2017-09-21 15:40:18 -03:00
Augusto Bennemann
d0592a7acb
HTML5 video: share and unshare buttons
2017-09-20 00:12:10 -03:00
Oswaldo Acauan
c0307e36a6
Presentation Uploader to 2.0
2017-09-07 15:18:14 -03:00
Oleksandr Zhurbenko
65da71c12a
Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x
2017-09-05 18:53:51 -07:00
JaeeunCho
43f6fd9c03
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into destroy_meeting_users
2017-09-01 11:22:45 -07:00
Augusto Bennemann
5ec827e17d
HTML5 video with kurento (port)
2017-09-01 12:26:57 -03:00
Anton Georgiev
d60e06e28f
Merge pull request #4221 from JaeeunCho/change_localeId_to_camelCase
...
[HTML5] changed string id to camelCase
2017-09-01 10:05:50 -04:00
Oswaldo Acauan
6070a4ea25
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into presentation-uploader-2x
2017-08-31 09:49:59 -03:00
Oleksandr Zhurbenko
d5f07a574c
Fixed publishShape message for 4 common shapes
...
Line, Rectangle, Triangle, Ellipse
2017-08-18 19:47:31 -07:00
JaeeunCho
73b6054b42
[HTML5] implemented promote/demote user
2017-08-18 11:23:05 -07:00
Oleksandr Zhurbenko
643d55938c
Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x
2017-08-16 19:24:59 -07:00
JaeeunCho
1dff7f0ef2
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into destroy_meeting_users
2017-08-14 12:56:56 -07:00
Klaus
e996bea1e9
Handling separate redis channel
2017-08-14 15:55:17 -03:00
JaeeunCho
b20ea78e2a
fixed conflict
2017-08-10 14:34:21 -07:00
JaeeunCho
3f773684bc
[HTML5] changed string id to camelCase
2017-08-10 10:34:34 -07:00
JaeeunCho
8590d2f414
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into destroy_meeting_users
2017-08-08 12:31:56 -07:00
Klauswk
0ce41afabb
Merge branch 'bbb-2x-mconf' into html5-toggle-mute
2017-08-08 13:59:00 -03:00
Oswaldo Acauan
716ee5902f
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into userlist-2x-design
2017-08-08 11:52:26 -03:00
Klaus
0807960da4
Fix missing method for mute user
2017-08-04 17:05:18 -03:00
Oswaldo Acauan
0022c121d3
Fix chat bug and styles
2017-08-04 14:58:55 -03:00
Oleksandr Zhurbenko
227f9d540f
Added permissions to Move Cursor presenter action
2017-08-03 14:18:01 -07:00
Oleksandr Zhurbenko
43566245ac
Added permissions to Undo and Clear All presenter actions
2017-08-03 14:09:19 -07:00
Anton Georgiev
6afb7ca8b3
Merge pull request #4124 from Klauswk/html5-2x-chat-options
...
[HTML5 2.0] Add public chat new options
2017-08-03 14:33:32 -04:00
Anton Georgiev
1d465909e8
Merge pull request #4198 from KDSBrowne/x2.0.1-transifex-fetch-translation
...
[HTML5 2.0] - Transifex script & Translations.
2017-08-03 14:21:48 -04:00
Oswaldo Acauan
14f586faad
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into userlist-2x-design
2017-08-03 09:23:12 -03:00
Klaus
e02e5d75ce
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-chat-options
2017-08-03 09:17:50 -03:00
Oleksandr Zhurbenko
fa1458c3eb
Handling and publishing multi-user mode switch
2017-08-02 18:24:38 -07:00
KDSBrowne
daa1439099
add script to pull translation from transifex
2017-08-02 11:11:33 -07:00
Klaus
63fee3b615
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-chat-options
2017-08-02 11:36:16 -03:00
Klaus
d45ae64558
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into slides-refactor-2x
2017-08-02 11:29:33 -03:00
Oleksandr Zhurbenko
b207a1275e
Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x
2017-08-01 13:49:46 -07:00
Oswaldo Acauan
df35a22676
Merge branch 'bbb-2x-mconf' into userlist-2x-design
2017-08-01 14:29:12 -03:00
JaeeunCho
08818948ac
changed logout-confirmation and en.json
2017-08-01 09:09:06 -07:00
JaeeunCho
04636ca25b
[HTML5] added endMeeting by moderator
2017-08-01 08:53:05 -07:00
Klaus
9d42ca9bd7
Move from users to voice-users
2017-08-01 10:10:12 -03:00
Klaus
1ff3df770a
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-voice-user
2017-07-31 17:01:04 -03:00
Anton Georgiev
7b40122c89
Merge pull request #4121 from mmarangoni/call-manager
...
[HTML5] Implemented AudioManager
2017-07-31 14:29:42 -04:00
Klaus
9bc9116e5c
handling a few messages
2017-07-31 08:10:52 -03:00
Oswaldo Acauan
dca47fcbb6
Add missing locales
2017-07-28 10:51:18 -03:00
Klaus
e43a44e828
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into html5-2x-chat-options
2017-07-28 08:47:56 -03:00
Klauswk
e751bcdadf
Merge branch 'bbb-2x-mconf' into slides-refactor-2x
2017-07-27 17:27:35 -03:00
Klaus
c13155aa6a
Move shapes to annotations
2017-07-27 09:35:55 -03:00
Matthew Marangoni
0ab3bcc599
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into call-manager
2017-07-26 10:59:05 -07:00
Anton Georgiev
5ca6f63d7e
Merge branch 'bbb-2x-mconf' of github.com:bigbluebutton/bigbluebutton into html5-2x-fix-audio
2017-07-26 13:49:57 -04:00
Klaus
745b9070f6
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into slides-refactor-2x
2017-07-26 11:11:40 -03:00
Oleksandr Zhurbenko
6ea4d39da9
Merge branch 'bbb-2x-mconf' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality-2x
2017-07-25 15:08:29 -07:00
Klaus
9cd3ac3f87
Merge branch 'bbb-2x-mconf' into fix-presenter-rule
2017-07-25 13:43:26 -03:00
Oleksandr Zhurbenko
5aed767436
Moved SwitchSlide method to 2.0
2017-07-24 14:04:49 -07:00
Anton Georgiev
b7d6427e63
rename deskshare to screenshare and adjust condition for viewing
2017-07-24 15:29:34 -04:00
Klaus
78a6fee038
Slides reflecting akkaApps
2017-07-24 14:50:44 -03:00
Klaus
5c2369b992
Merge remote-tracking branch 'upstream/bbb-2x-mconf' into call-manager
2017-07-24 11:00:30 -03:00
Klaus
39288e6e70
Add clear history, copy and save as chat options
2017-07-21 13:27:28 -03:00
Klaus
7cf05cdbf5
Add public history clear eventHandler and method
2017-07-21 11:39:40 -03:00
Matthew Marangoni
f521ef0402
Merge remote-tracking branch 'upstream/master' into call-manager
2017-07-19 11:55:45 -07:00
Matthew Marangoni
1feb7629d6
detailed errors and error codes are displayed in the audio notifications when an audio failed case is received
2017-07-18 17:04:12 -07:00
