Anton Georgiev
|
21b6dab852
|
Merge pull request #5267 from Tainan404/issue-5237
Add custom logo area
|
2018-04-05 15:08:05 -04:00 |
|
Tainan Felipe
|
539d9b7b15
|
Add branding setting on setting-production.json
|
2018-04-05 15:48:56 -03:00 |
|
Anton Georgiev
|
38aeba2c31
|
Merge pull request #5221 from jfsiebel/handle-audio-configuration
Handle audio configuration
|
2018-03-26 11:05:06 -04:00 |
|
Tainan Felipe Pauli de Almeida
|
978b8c7cdc
|
switch displayBrandingArea for false
|
2018-03-21 15:46:33 -03:00 |
|
Tainan Felipe Pauli de Almeida
|
505a00daba
|
add custom logo area
|
2018-03-21 15:19:09 -03:00 |
|
Tainan Felipe Pauli de Almeida
|
938bac7527
|
Merge remote-tracking branch 'upstream/v2.0.x-release' into issue-5160
|
2018-03-15 16:55:54 -03:00 |
|
Anton Georgiev
|
d17ca71a60
|
Merge pull request #5157 from jfsiebel/implement-start-stop-recording-html5
Implement start stop recording html5
|
2018-03-09 14:28:14 -05:00 |
|
Joao Siebel
|
48cc9f3ca9
|
Handle join audio connection errors and update production settings
|
2018-03-08 10:38:18 -03:00 |
|
Anton Georgiev
|
34a2959b34
|
Merge pull request #5222 from antobinary/increase-logging
Increase logging - needed to detect audio state inconsistencies
|
2018-03-07 11:42:58 -05:00 |
|
Anton Georgiev
|
d29af2bf25
|
increase logging level in production
|
2018-03-07 11:18:02 -05:00 |
|
João Francisco Siebel
|
1cd8aab376
|
Fix handling audio options
|
2018-03-06 11:36:49 -03:00 |
|
Tainan Felipe Pauli de Almeida
|
2c5d894d05
|
add webcam controls in videoMenu button
|
2018-03-06 10:52:16 -03:00 |
|
Anton Georgiev
|
42809a61f0
|
Merge pull request #5099 from jfsiebel/screenshare-data-saving-setting
Implement screen share data saving setting
|
2018-03-05 11:54:48 -05:00 |
|
João Francisco Siebel
|
85b8769ad5
|
Handle autoJoin, listenOnlyMode and skipCheck
|
2018-03-02 09:01:34 -03:00 |
|
Maxim Khlobystov
|
c58fa045e9
|
Removed the filename field from development and production settings.
|
2018-02-28 11:20:58 -05:00 |
|
João Francisco Siebel
|
4d8d522bb8
|
Fix settings file
|
2018-02-19 14:04:26 -03:00 |
|
João Francisco Siebel
|
6bb031076b
|
Resolve merge problems
|
2018-02-19 14:00:43 -03:00 |
|
João Francisco Siebel
|
919c2aa644
|
Implement start/stop recording logic
|
2018-02-15 17:42:50 -02:00 |
|
Joao Siebel
|
eddc480851
|
Implement screenshare data saving setting. Fix #5029
|
2018-02-06 11:33:48 -02:00 |
|
Oleksandr Zhurbenko
|
6e1102999d
|
Turned on logging for the production
|
2018-02-05 12:39:08 -08:00 |
|
Oleksandr Zhurbenko
|
e1568baa24
|
Fixed the logging of the Meteor serser-side methods
|
2018-02-05 12:34:03 -08:00 |
|
Anton Georgiev
|
d2709c9d9d
|
adjust production settings to match changes on dev settigns
|
2018-01-26 11:22:17 -05:00 |
|
Joao Siebel
|
a42d88250e
|
Resolve merge conflict in english locales file
|
2018-01-19 17:43:11 -02:00 |
|
Anton Georgiev
|
2ba9433c1d
|
change copyright year to 2018
|
2018-01-17 16:31:50 -05:00 |
|
Joao Siebel
|
0764ae867c
|
Remove old whiteboard toolbar items config
|
2018-01-11 08:51:37 -02:00 |
|
Joao Siebel
|
0b02d90927
|
Resolve merge conflicts
|
2018-01-10 17:22:42 -02:00 |
|
Oleksandr Zhurbenko
|
7871681448
|
Changed all the references of kick to remove, to be consistent
|
2018-01-09 14:28:48 -08:00 |
|
Oleksandr Zhurbenko
|
4af6d30f6a
|
Switched from the broken 4commerce:env-settings package to native Meteor.settings
|
2018-01-07 16:24:05 -08:00 |
|
Oleksandr Zhurbenko
|
b3ceb4d5f6
|
Updated the html5 client's font to use the latest icons
Fixes #4715
|
2018-01-03 12:35:01 -08:00 |
|
prlanzarin
|
31fb95bf72
|
Removed wrong video peer stop procedure and reset the kurento.yaml config file
|
2017-12-22 12:30:24 +00:00 |
|
prlanzarin
|
3a72afa350
|
Merge remote-tracking branch 'upstream/v2.0.x-release' into video-reconnection
|
2017-12-21 17:37:07 +00:00 |
|
prlanzarin
|
362335f727
|
Made the users own webcam local instead of server-side
|
2017-12-20 20:06:27 +00: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 |
|
Anton Georgiev
|
085eb57556
|
add ejectUserFromVoice for moderator
|
2017-12-08 11:40:52 -05: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 |
|
Tainan Felipe
|
6845aed0e0
|
localize message from when clear the chat
|
2017-11-21 16:31:53 -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 |
|
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 |
|
Anton Georgiev
|
8853d562ce
|
Merge pull request #4497 from Gcampes/audio-refactor
[HTML5] Refactor Audio
|
2017-10-31 15:39:37 -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 |
|
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
|
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 |
|
gcampes
|
6b44504e5d
|
Adds timeout to transfer, fix css, remove logs
|
2017-10-12 11:49:50 -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 |
|
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 |
|
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
|
4191ce56ed
|
set allowHTML5Moderator to true
|
2017-10-06 06:27:45 -07: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 |
|
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 |
|
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 |
|
Augusto Bennemann
|
5ec827e17d
|
HTML5 video with kurento (port)
|
2017-09-01 12:26:57 -03: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
|
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 |
|
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 |
|
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 |
|
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
|
9bc9116e5c
|
handling a few messages
|
2017-07-31 08:10:52 -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 |
|
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 |
|