Tainan Felipe
742229e88f
Fix lint errors
2018-08-28 16:30:37 -03:00
Tainan Felipe
25834dd4f8
zoom calc based in flash
2018-08-28 14:13:18 -03:00
Anton Georgiev
aed8577606
Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into log-config-restructure
2018-08-22 18:30:02 +00:00
Anton Georgiev
6da18cd52d
made clientLog structure easier to edit via script
2018-08-22 18:25:43 +00:00
Anton Georgiev
778e22d42f
Merge pull request #5991 from prlanzarin/sfu-cam-target-bitrate
...
[HTML5] Added target bitrate option for WebRTC screenshare and webcam
2018-08-21 10:02:56 -04:00
prlanzarin
9f9e248de7
Made webcam constraints configurable, removed fps limitations and resolution floor
...
Also fixed handlePlayStop and stopWebRTCPeer exceptions
2018-08-20 18:08:10 +00:00
KDSBrowne
29bcbea923
rename to alerts / missing from #5973
2018-08-15 02:35:58 +00:00
Bobak Oftadeh
4d0b8418db
Added help icon
2018-08-10 08:29:52 -07:00
Bobak Oftadeh
9feb47a1ca
Option to disable the help button added
2018-08-09 15:40:52 -07:00
Anton Georgiev
44dc39eaf8
Merge branch 'master' into add-html5-group-chat-support
2018-08-01 14:24:00 -04:00
Anton Georgiev
6533802573
Merge pull request #5932 from oswaldoacauan/presentation-pods
...
Presentation pods support
2018-08-01 13:49:32 -04:00
Bobak Oftadeh
f0d5969b5c
Added configurations to the production settings
2018-08-01 09:18:54 -07:00
Bobak Oftadeh
78bcec7553
Implemented adjustments to logClient
2018-07-31 15:28:03 -07:00
Anton Georgiev
78847f89ad
attempt to pull 2.0 into 2.2
2018-07-31 16:18:23 +00:00
João Francisco Siebel
655483576f
fix unread messages counter on public chat and remove some old chat configurations
2018-07-27 10:44:21 -03:00
Oswaldo Acauan
b7823c406c
Merge remote-tracking branch 'upstream/v2.2-dev' into presentation-pods
2018-07-24 17:20:37 -03:00
Bobak Oftadeh
c3172a7691
The client logger can now be configured on the production settings
2018-07-23 09:15:50 -07:00
Ghazi Triki
66a050b00b
Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into 2.2-merge-with-2.0
...
# Conflicts:
# bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
# bigbluebutton-config/bigbluebutton-release
# bigbluebutton-html5/imports/api/users/server/handlers/guestApproved.js (Not Fixed)
2018-07-16 16:08:38 +01:00
Bobak Oftadeh
5a2d2934fa
Updated settings for client-logger
2018-07-13 12:44:22 -07:00
Bobak Oftadeh
a5354c9c10
Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into fixes3
2018-07-13 12:18:55 -07:00
Bobak Oftadeh
c98bd10024
Replaced console.errors with client logger and alterted logger configurations
2018-07-13 12:16:50 -07:00
Anton Georgiev
5bcbc330af
Merge pull request #5842 from prlanzarin/audio-video-ss-stun-turn
...
[HTML5] STUN/TURN config support for SFU client-side apps and general improvements
2018-07-10 11:24:37 -04:00
prlanzarin
123ec6f3a3
Reverted wrong config changes
2018-07-09 21:33:32 +00:00
prlanzarin
d2bdb67ed3
Propagating configs to WebRTC screenshare script and added support for STUN/TURN config to SFU components
2018-07-09 21:29:59 +00:00
Anton Georgiev
b50dda8566
Merge pull request #5232 from oswaldoacauan/fix-4987
...
Implement basic GroupChat messages
2018-07-06 16:45:14 -04:00
James Jung
82229e1a8a
Add 1px option for the pencil thickness
2018-07-06 14:47:50 -04:00
Maxim Khlobystov
f3e8f18a1c
DIsabled chat push notifications by default.
2018-07-05 15:04:53 -04:00
Bobak Oftadeh
bc3e068e2e
Client logger implemented
2018-07-04 14:02:10 -07:00
prlanzarin
2f5aa09fe5
Merge remote-tracking branch 'upstream/v2.0.x-release' into sfu-opt-audio
2018-06-27 17:34:33 +00:00
Anton Georgiev
a7d5f5d698
enable push chat notifications by default
2018-06-20 17:30:04 +00:00
Maxim Khlobystov
98cf239bc7
Merge pull request #5602 from Tainan404/issue-5470
...
Add messages for chat push notifications
2018-06-13 16:23:21 -04:00
Tainan Felipe
46807039a4
add a small style for toast notification and add a content prop in toast
2018-06-12 14:21:31 -03:00
Anton Georgiev
e4978983ba
Merge pull request #5422 from gutobenn/webrtc_stats
...
WebRTC video statistics
2018-06-08 14:35:16 -04:00
Anton Georgiev
81a6b877b9
Merge pull request #5591 from KDSBrowne/edit/config/locale
...
Improve html5 locale fallback selection
2018-06-08 13:51:53 -04:00
prlanzarin
6f78cf057c
Merge remote-tracking branch 'gutobenn/webrtc_stats' into webrtc_stats
2018-06-08 16:36:41 +00:00
Anton Georgiev
21dcb0eaeb
html5 client title - same format as Flash client
2018-06-07 15:18:11 +00:00
Anton Georgiev
1b755bfb24
make window title configurable
2018-06-01 18:31:41 +00:00
Maxim Khlobystov
80da44bb26
Merge pull request #5594 from oswaldoacauan/streams-cursor-wb
...
Whiteboard and Cursor performance update
2018-05-30 11:42:52 -04:00
Oswaldo Acauan
0eb4752818
Clean up
2018-05-30 11:19:19 -03:00
Tainan Felipe
61baba9a53
change last message time
2018-05-29 13:59:44 -03:00
Oswaldo Acauan
ec07b4434d
Change cursor and annotation to user streams and add optimistic updates
...
WIP | Use streams to cursor and optimistic updates
WIP | Use streamss to whiteboard and optimistic updates
WIP | Remove fake delay
Add two way batching (server/client client/server)
Fix null userId exception and remove logs
wip
Add two way batching (server/client client/server) for cursor
Remove message frequency from draw-listeners component since we handle on message publication
Handle clear and undo messages
2018-05-28 14:46:14 -03:00
KDSBrowne
a750e2b2a0
edit config prop / startup-server-index variable names
2018-05-22 12:57:43 -07:00
Augusto Bennemann
5f142fa793
Fix merge conflicts
2018-05-17 14:49:35 -03:00
Anton Georgiev
13e6eb1a05
Merge pull request #5404 from Tainan404/implement-feedback-screen
...
Implement feedback screen
2018-05-14 10:19:53 -04:00
Maxim Khlobystov
e5c6e098f4
Merge pull request #5451 from KDSBrowne/xx.new-accessKey-Modal
...
Adds shortcut modal
2018-05-08 13:30:47 -04:00
prlanzarin
42ed428461
Added config to enable kurento listen only bridge
2018-05-02 15:49:57 +00:00
KDSBrowne
2ed76aa244
add shortcut config to settings-production.json
2018-04-30 12:20:27 -07:00
KDSBrowne
819839cb4e
add shotcuts keys to dev-config
2018-04-30 12:18:29 -07:00
Tainan Felipe
e92bea9312
Merge remote-tracking branch 'upstream/v2.0.x-release' into implement-feedback-screen
2018-04-27 11:35:33 -03:00
Anton Georgiev
8e6e14f902
add custom vs default key and link
2018-04-26 22:55:45 +00:00
Anton Georgiev
6aea0b6297
add custom vs default key and link
2018-04-26 22:52:46 +00:00
Augusto Bennemann
1985958191
WebRTC stats for each video
2018-04-26 22:19:15 +00:00
Anton Georgiev
25f3ced26c
set default KEY and LINK for Chrome screenshare extension - the one from BBB open source
2018-04-26 16:48:25 +00:00
Anton Georgiev
cffe245c12
Revert "[HTML5 Client] Whiteboard Bulk Operations"
2018-04-25 20:41:19 -04:00
Tainan Felipe
8c7ce5b2be
change askForFeedbackonLogout for false
2018-04-25 16:35:49 -03:00
Tainan Felipe
d515a3cbe2
WIP feedback modal
2018-04-25 12:33:05 -03:00
Maxim Khlobystov
4067f5f808
Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into whiteboard-bulk-upsert
2018-04-25 14:39:48 +00:00
Maxim Khlobystov
8d1e80fbf0
Put the bulk lifespan value into configs.
2018-04-25 14:27:53 +00:00
Tainan Felipe
2e76439395
Change hand to pointer icon
2018-04-18 16:32:13 -03:00
Oleksandr Zhurbenko
7c61e4c4b9
Corrected a publisher for presentation-pods
2018-04-09 20:57:24 -07:00
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
Oswaldo Acauan
8b9cc79c3d
Implement basic GroupChat messages. Closes #4987
2018-03-09 15:42:14 -03: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
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
7cf05cdbf5
Add public history clear eventHandler and method
2017-07-21 11:39:40 -03:00
Oswaldo Acauan
c6f517b3cb
Fix selector and get welcomeMessage from meeting object
2017-07-18 10:25:11 -03:00
Klaus
b630fcd632
Fix presenter assign
2017-07-17 09:00:18 -03:00
Anton Georgiev
2e0f6d8610
trigger syncing with state from akka-apps
2017-06-30 11:19:11 -04:00
Anton Georgiev
724e21a0d6
we do not have 1.0 user messages coming from bbb so use 2.0 only
2017-06-27 18:14:53 -04:00
Anton Georgiev
91cfc02d13
Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into handle-messages
2017-06-26 17:21:42 -04:00
Anton Georgiev
16168ddd5b
Merge pull request #3997 from Klauswk/DetectSystemLang
...
[HTML5] Add support to default system/browser language
2017-06-26 16:18:22 -04: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
Maxim Khlobystov
237bcd7f9b
Remove the old Meteor shell configs
...
Those values are now in .npmrc file.
2017-06-15 05:15:26 +00:00
Oswaldo Acauan
ccb6fd2a53
Fix merge conflicts
2017-06-07 12:01:18 +00:00
Klaus Klein
0d9525164f
Add support to default system/browser language
2017-06-06 09:33:53 -03:00
Klaus Klein
a96393e23c
Change Acl lookup
2017-06-05 11:16:19 -03:00
Klaus Klein
9b41e3a475
Merge remote-tracking branch 'upstream/master' into Acl
...
* upstream/master:
HTML5 - added new line at the end of the file
Add check for min/max length for chat message
HTML5 - fixed setting's dropdown re-render issue
2017-06-05 08:37:17 -03:00
Klaus Klein
fc73992a63
Fix a few review comments
2017-06-01 17:40:55 -03:00
Klaus Klein
8a31d29e17
Acl refactor working
2017-06-01 14:32:04 -03:00
Oswaldo Acauan
3702da3e08
Add check for min/max length for chat message
2017-06-01 14:24:29 +00:00
Klaus Klein
a4c8ff493a
Code refactored
2017-05-31 14:54:43 -03:00
Anton Georgiev
3dc21e2cae
increase the connectionTimeout value for production
2017-05-11 15:20:59 -04:00
Klaus Klein
b2195da345
Fix client reconnection timeout
2017-05-05 11:30:15 -03:00
Oswaldo Acauan
71fc15a803
Add presenter upload capabilities
2017-05-03 13:36:16 -03:00
Anton Georgiev
9684195c5f
minor changes in strings
2017-04-27 17:23:43 -04:00
Anton Georgiev
684f87e77a
demote html5 moderator user to viewer based on flag
2017-04-27 16:07:27 -04:00
gcampes
ded1de0b40
Adds localization dropdown
2017-04-06 09:36:59 -03:00
gcampes
3ea21df973
Fix closed captions settings issue
2017-04-06 08:46:15 -03:00
gcampes
acb8b1155b
Merge conflicts
2017-03-20 15:00:04 -03:00
Oswaldo Acauan
be7f36e00c
Refactor the i18n server code
2017-03-09 19:50:21 +00:00
Oswaldo Acauan
886edff059
Add missing configuration file
2017-02-06 19:14:48 +00:00
Anton Georgiev
1b950f5e78
limit sound on unread chat via Settings and Config
2017-01-24 17:32:25 -05:00
KDSBrowne
08e6a32e2b
Show audio modal on client load
2017-01-10 15:14:23 -08:00
Anton Georgiev
8608c6b716
comply with feedback - about component
2016-12-08 15:59:52 +00:00
Anton Georgiev
b56ee1e553
add client information in About
2016-12-07 21:14:14 +00:00
Anton Georgiev
3ed395d079
update client information
2016-12-07 20:52:07 +00:00
KDSBrowne
bf3a65ccf2
added 'warn' level to production
2016-12-01 10:59:58 -08:00
KDSBrowne
24643f01dd
using config file for logger level
2016-12-01 08:15:57 -08:00
Matthew Marangoni
d21545c847
added html5 stun request and reply
2016-10-25 07:59:14 -07:00
Oswaldo Acauan
79cdf636eb
Rewrite Redis related classes
2016-10-18 12:03:51 +00:00
KDSBrowne
db461591d4
HTML5 Welcome Chat Message Fixed
2016-09-14 07:26:45 -07:00
Anton Georgiev
cf45e2ab96
remove obsolete package version and environment path
2016-08-24 22:50:57 +00:00
Laily Ajellu
361ce7f19f
HTML5 - adds captions to config file
2016-08-23 16:48:11 -07:00
Laily Ajellu
2105e911ef
HTML5 - Adds more yaml, adds correct properties to objects in Gruntfile, cleans up logger.js
2016-08-23 14:35:28 -07:00
Laily Ajellu
ce50f58c36
HTML5 - removes old settings and changes setting dependant files
2016-08-23 07:35:06 -07:00
Lajellu
8e7b1d6317
HTML5 - Changes config organization and all files dependant on config files
2016-08-17 08:48:03 -07:00
