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
d13be2c77b
Add tooltip to recording indicator
2018-02-16 11:47:55 -02:00
João Francisco Siebel
919c2aa644
Implement start/stop recording logic
2018-02-15 17:42:50 -02:00
Lucas Fialho Zawacki
fcca273f8f
Merge branch 'settings-lock-video-dock' of https://github.com/Tainan404/bigbluebutton into settings-lock-video-dock
2018-02-14 15:55:10 +00:00
Tainan Felipe Pauli de Almeida
473fdea28b
revert changes in en.json
2018-02-14 09:39:15 -02:00
Lucas Fialho Zawacki
23b635b4ff
Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into settings-lock-video-dock
2018-02-08 14:48:33 +00: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
Tainan Felipe Pauli de Almeida
cba6628de0
add to the functionality of deactivating the videodock via settings
2018-01-30 14:32:37 -02:00
Tainan Felipe Pauli de Almeida
0bfe3093c0
add interface for data saving tab
2018-01-30 09:20:51 -02:00
Anton Georgiev
7d6868ef63
Merge pull request #5033 from antobinary/pull-locales-2
...
Pulled html5 client locales 2018-01-25
2018-01-26 16:09:11 -02:00
Anton Georgiev
d2709c9d9d
adjust production settings to match changes on dev settigns
2018-01-26 11:22:17 -05:00
Anton Georgiev
952b4457f5
pull the latest German translations
2018-01-25 14:15:51 -05:00
Anton Georgiev
e5b1289b9c
remove duplicated Japanese locale
2018-01-25 13:42:33 -05:00
Anton Georgiev
ba7d3325b7
adjust Khmer locale, related to #4538
2018-01-25 13:36:19 -05:00
Anton Georgiev
0d2f52c033
pulled html5 client locales 2018-01-25
2018-01-25 12:28:45 -05:00
Anton Georgiev
72ea8b8906
remove duplicated keys in en.json
2018-01-24 16:49:48 -05:00
Anton Georgiev
b8400c7501
remove duplicated keys in en.json
2018-01-24 16:46:18 -05:00
Anton Georgiev
3159973533
Merge pull request #4961 from KDSBrowne/z.0.3-transifex-blank-locale
...
Make transifex.sh ignore locales with no translated strings
2018-01-19 18:54:19 -02: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
Oleksandr Zhurbenko
f6ed7c3575
Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into fix-issue-4897
2018-01-15 12:33:29 -08:00
KDSBrowne
387f539c52
remove empty locale file
2018-01-14 10:29:36 -08:00
prlanzarin
acc9650370
Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into video-upstream-errors
2018-01-12 21:39:24 +00:00
prlanzarin
8594ce169d
Merge remote-tracking branch 'mconftec/fixes-lucas' into video-upstream-errors
2018-01-12 20:02:45 +00:00
Tainan Felipe
8ae1fd1820
Merge remote-tracking branch 'upstream/v2.0.x-release' into fix-moderator-ends
2018-01-11 09:19:56 -02: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
Augusto Bennemann
e2ef3281ec
Localize video and screnshare error messages
2018-01-05 19:43:53 +00:00
Anton Georgiev
d22a6d5a96
Merge pull request #4883 from OZhurbenko/fix-issue-4863
...
Updated the message displayed to the kicked user
2018-01-04 14:20:00 -02:00
Anton Georgiev
850ac870e9
Merge pull request #4884 from OZhurbenko/fix-issue-4715
...
Updated the html5 client's font to use the latest icons
2018-01-04 13:30:36 -02:00
Anton Georgiev
34a503b218
Merge pull request #4624 from Tainan404/toast-breakout-ends
...
[HTML5] show audio modal and toast notification when breakout room ends
2018-01-03 19:11:27 -02: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
Oleksandr Zhurbenko
d8533a86b3
Changed the message displayed to the kicked user
...
Fixes #4863
2018-01-03 12:25:13 -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
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
Anton Georgiev
2d4db1c9de
Merge pull request #4113 from oswaldoacauan/fix-meeting-add
...
[HTML5 2.0] Fix meeting add
2017-07-18 10:02:08 -04:00
Oswaldo Acauan
c6f517b3cb
Fix selector and get welcomeMessage from meeting object
2017-07-18 10:25:11 -03:00
Klaus
3af281d648
Merge remote-tracking branch 'upstream/master' into merge-master-mconf
2017-07-17 13:33:45 -03:00
Klaus
b630fcd632
Fix presenter assign
2017-07-17 09:00:18 -03:00
Oswaldo Acauan
5353a3a80d
Add guest policy to html5
2017-07-14 11:18:07 -03:00
JaeeunCho
1a1fb6dc57
HTML5 - fixed errors when the meeting is ended by apimate
2017-07-05 07:59:18 -07: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
Anton Georgiev
1d1a4c31f9
Merge pull request #4016 from MaximKhlobystov/grunt-to-npm-scripts-move
...
[HTML5 Client] Transition from Grunt to NPM Scripts
2017-06-26 16:11:09 -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
KDSBrowne
c32f614bc8
add new line to end of file
2017-06-10 12:04:52 -07:00
KDSBrowne
cb96a26717
remove string concatenation
2017-06-10 11:56:14 -07:00
KDSBrowne
c189faceff
fix merge conflicts
2017-06-08 11:00:06 -07: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
KDSBrowne
1cfc37eac9
remove unneeded localized strings
2017-06-05 12:33:45 -07: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
KDSBrowne
58c777b456
fix locale string format
2017-05-23 14:49:02 -07:00
Anton Georgiev
746ef9478c
Merge pull request #3939 from KDSBrowne/userlist-accessibility
...
[HTML5] - Userlist accessibility improvement
2017-05-17 11:52:52 -04:00
KDSBrowne
a2520dbbbc
change format for other locales
2017-05-17 08:35:24 -07:00
KDSBrowne
2f79f3ff20
change locale stringformat
2017-05-16 17:02:27 -07:00
KDSBrowne
dd1e830dc2
fix merge conflicts
2017-05-12 10:52:12 -07:00
KDSBrowne
1940d49c4b
fix aria labeling
2017-05-12 10:45:41 -07:00
Anton Georgiev
b9f75f88ae
Merge pull request #3928 from JaeeunCho/locked_status
...
HTML5 - added locked status for users
2017-05-12 12:56:53 -04:00
Anton Georgiev
3dc21e2cae
increase the connectionTimeout value for production
2017-05-11 15:20:59 -04:00
JaeeunCho
bd923e0f39
HTML5 - added locked status for users
2017-05-10 14:00:03 -07:00
Klaus Klein
b2195da345
Fix client reconnection timeout
2017-05-05 11:30:15 -03:00
Anton Georgiev
935219148a
Merge pull request #3871 from Klauswk/LeaveButtonOnErrorScreen
...
Add leave button to error screen
2017-05-03 12:58:28 -04:00
Oswaldo Acauan
ff5d3d1211
Merge remote-tracking branch 'upstream/master' into presentation-uploader
...
* upstream/master: (83 commits)
resolve issues with modal on breakouts
Update generate_css_dpi.sh comments.
Added multi-resolution generated css files for the mobile client.
Added a shell script to generate multi-dpi css files for the mobile client.
Fix origin on pencil cursor
Fix a missing bracket in mobile demo
Delete services directory.
New cursors for flash client
update mobile demo to support https
Set icon-44.png to its true size and set value for allowBrowserInvocation in Main-app.xml
Delete services/bbb-web-api project.
Delete bbb-web-api project.
Renamed clours for mobile application styles.
Handle audio on refactored modal (#2 )
Put all toolbar logic in TopToolbarMediatorAIR to avoid double mediator registration.
fix lint issues
Fix the audio-modal
fix tabIndex for the settings closed caption submenu
remove extra list separator
fix console errors for missing key and invalid prop
...
2017-05-03 13:36:54 -03:00
Oswaldo Acauan
71fc15a803
Add presenter upload capabilities
2017-05-03 13:36:16 -03:00
Klaus Klein
5a37750bf6
Change leave button label
2017-05-03 13:19:45 -03:00
KDSBrowne
eef9fd782a
fix merge conflict
2017-05-01 12:23:01 -07:00
Anton Georgiev
85d6f7aa6e
add label descriptions for cancel and save
2017-04-28 15:13:42 -04:00
Anton Georgiev
5d0022f214
localize user popup menu
2017-04-28 14:28:55 -04:00
Anton Georgiev
5abf6413a8
localize controls in Settings menu
2017-04-28 11:56:27 -04:00
Anton Georgiev
121cb47093
localize mute, unmute buttons
2017-04-28 11:34:20 -04:00
Anton Georgiev
d9cf45152d
pulled translations from transifex
2017-04-27 18:00:36 -04: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
KDSBrowne
737da5937d
add aria descriptionfor current status
2017-04-27 08:57:41 -07:00
KDSBrowne
230bc1f11c
fix merge conflicts
2017-04-26 07:14:25 -07:00
KDSBrowne
9203cc60e3
add localized messages
2017-04-24 19:08:18 -07:00
Anton Georgiev
835acfa195
Merge pull request #3835 from KDSBrowne/accessibility-05-update
...
[HTML5] - Accessibility update 05
2017-04-24 15:34:05 -04:00
KDSBrowne
1e07098527
add messages for settings application submenu
2017-04-21 12:04:46 -07:00
KDSBrowne
97402b4628
add aria-label to chat log
2017-04-20 06:53:03 -07:00
KDSBrowne
cc04f96955
add suggested changes
2017-04-19 10:10:17 -07:00
KDSBrowne
a4fcffaa9a
add DropdownListTitle component
2017-04-19 08:28:13 -07:00
gcampes
9f39f9ce6a
merge conflicts
2017-04-18 16:14:39 -03:00
gcampes
eda7648043
Merge remote-tracking branch 'upstream/master' into settings-localization-dropdown
...
* upstream/master: (51 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.
fix event name causing issues with listenOnly status
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
...
2017-04-17 15:49:35 -03:00
KDSBrowne
ca09907d47
add formatted messages
2017-04-17 11:19:27 -07:00
KDSBrowne
4ac45b30f9
add aria label for userlist btn notification
2017-04-17 10:00:15 -07:00
KDSBrowne
4a480f77eb
fix aria labels for hide and close chat btns
2017-04-14 16:18:40 -07:00
KDSBrowne
e316f38cda
fix merge conflicts
2017-04-11 07:07:49 -07:00
KDSBrowne
cd014929fe
add defined messages
2017-04-10 13:27:29 -07:00
KDSBrowne
3ff1096cf4
fix merge conflict
2017-04-06 07:11:57 -07:00
gcampes
ded1de0b40
Adds localization dropdown
2017-04-06 09:36:59 -03:00
Anton Georgiev
fe998aacd3
Merge pull request #3769 from Gcampes/settings-refactor
...
[HTML5] Adds settings service
2017-04-06 08:31:59 -04:00
gcampes
3ea21df973
Fix closed captions settings issue
2017-04-06 08:46:15 -03:00
KDSBrowne
e932f707a9
clean up code
2017-04-05 15:35:09 -07:00
KDSBrowne
e01f34cf23
fix merge conflicts
2017-04-05 09:56:41 -07:00
gcampes
f0ac39f420
Merge remote-tracking branch 'upstream/master' into settings-refactor
...
* upstream/master: (63 commits)
add styles for separator
In whiteboard text tool, a single click while editing a text sends it without creating a new text zone.
Fixed https://github.com/bigbluebutton/bigbluebutton/issues/3777
- escape all user passed strings
- display length of recording in minutes instead of milliseconds
- fix window size - run dos2unix to remove ^M but it formatted the whole file :(
- add dimension of screen share
add formatted message for close chat link
add formatted message for userlist toggle btn label
remove unused import
fix DropdownListSeparator to work with NVDA
remove local storage usage and add separator
change role from section to region
add menu item separation NVDA fiendly
add formatted messages and remove generic divs
remove direct DOM manipulation
remove span element
add aria-label for unread messages
add missing import to fix JoinAudio Btn
fix lint issues
...
2017-04-05 13:56:07 -03:00
KDSBrowne
940905e4b7
add aria-label to status btn
2017-04-03 10:34:37 -07:00
KDSBrowne
8ec0c6bb04
change formatted msg and remove duplicate div
2017-03-30 10:25:29 -07:00
KDSBrowne
767c9181f9
add desc to give context to unread message count
2017-03-30 06:42:11 -07:00
KDSBrowne
00f77d1fd4
add formatted message for close chat link
2017-03-29 08:35:07 -07:00
KDSBrowne
4cbf7bedbb
add formatted message for userlist toggle btn label
2017-03-29 08:22:26 -07:00
KDSBrowne
208383d3a5
fix DropdownListSeparator to work with NVDA
2017-03-29 08:09:47 -07:00
KDSBrowne
2fae315db2
add menu item separation NVDA fiendly
2017-03-27 14:41:10 -07:00
KDSBrowne
782deb6525
add formatted messages and remove generic divs
2017-03-27 12:49:46 -07:00
gcampes
c7f7d5b58a
Merge remote-tracking branch 'upstream/master' into settings-refactor
...
* upstream/master: (53 commits)
center modal title
HTML5 - removed unused imports, fixed variable names
Added a missing import
Updated icon sets to the latest
Moved the recording systemd scripts into the core directory
record-and-playback: Split rap-worker into separate workers per step.
cleanup
audio join - apply structure and style from designs
"Video Chat" Layout has a dark background, controls are and title are removed in this layout.
Delete unused layout event class and videconf view.
HTML5 - changed underscore to lodash
revert tabIndex change
add local folder
remove unused imports
move handleExitAudio to service
remove merge conflict
fix more linting issues
lint nav settings dropdown container
remove unused imports
change function name
...
2017-03-24 09:30:41 -03:00
gcampes
8582c18be9
Merge conflicts
2017-03-22 10:00:37 -03:00
KDSBrowne
ceeb66ceed
Merge remote-tracking branch 'upstream/master' into Fullscreen-Label-Change
2017-03-21 08:50:09 -07:00
KDSBrowne
c7c44c4c63
add local folder
2017-03-21 07:46:41 -07:00
gcampes
acb8b1155b
Merge conflicts
2017-03-20 15:00:04 -03:00
Oswaldo Acauan
72dc94ab31
Remove old Kicked screen in favor of the new error screen
2017-03-17 14:38:18 +00:00
Oswaldo Acauan
9c84105319
Add missing packages
2017-03-10 19:18:23 +00: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
