Commit Graph

835 Commits

Author SHA1 Message Date
Oleksandr Zhurbenko
962e659378 Switched the components from deprecated method to 2018-01-07 20:44:42 -08: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
Anton Georgiev
5debc39362
Merge pull request #4818 from antobinary/fix-ios-audio
Add permissionLayout location for Safari
2018-01-03 14:46:19 -02:00
Joao Siebel
845692b9e5 Merge remote-tracking branch 'upstream/v2.0.x-release' into hide-audio-labels 2017-12-14 09:01:38 -02:00
Anton Georgiev
375b8ad68a add permissionLayout location for Safari 2017-12-13 15:37:31 -05:00
Anton Georgiev
886b32d2ef set defaultProps for glow to be false 2017-12-13 14:19:26 -05:00
Anton Georgiev
97989025df audio related linting 2017-12-13 14:03:14 -05:00
Anton Georgiev
4765ff80ef Move <audio> to main.html
Currently it is deep within Base component. So when Base is re-rendered with the updated locale, we lose <audio>. Placing it in main.html, outside Base resolved the problem
2017-12-13 11:32:36 -05:00
Tainan Felipe
5fb0b9b9b7 fix merge conflict 2017-12-11 15:00:16 -02:00
Joao Siebel
8740b7aac6 Hide labels from actions, status, mute/unmute and join/leave audio buttons 2017-12-11 11:48:50 -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
Maxim Khlobystov
8a1efec998 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into selenium-visual-regression 2017-12-01 11:36:11 -05:00
Tainan Felipe
cdfe58e542 removed console.log add accidentallyy 2017-11-22 11:28:11 -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
Gabriel Carvalho de Campes
207d117a4e Merge remote-tracking branch 'upstream/v2.0.x-release' into audio-refactor-bugfixes 2017-11-17 17:19:56 -02:00
Gabriel Carvalho de Campes
74bb2bb5e8 fix permission overlay positioning, localizes messages 2017-11-17 17:01:52 -02:00
Gabriel Carvalho de Campes
effb21fc1f Changes and enhancements on audio, wIP 2017-11-17 09:52:48 -02:00
KDSBrowne
3264ee26f2 replace pixel values with variables 2017-11-09 09:03:32 -08:00
KDSBrowne
d9fedcc8ca remove btnFocus mixin and add styles to button component 2017-11-08 11:42:37 -08:00
Gabriel Carvalho de Campes
92b1081186 add permission overlay on audio 2017-11-08 16:41:15 -02:00
Oleksandr Zhurbenko
9934d90fff Integrated babel-plugin-react-remove-properties for Selenium tests 2017-11-04 00:38:44 -07:00
Gabriel Carvalho de Campes
e55ee0d28e fix listen only dead end on permissions denied 2017-11-02 10:10:01 -02:00
KDSBrowne
2de6540f89 fix audio modal close Btn scroll bug 2017-11-01 09:35:46 -07:00
Gabriel Carvalho de Campes
2cca0c1724 change device selector key generation 2017-10-31 15:34:06 -02:00
Tainan Felipe
6cbd83e51d show audio modal when breakout room ends 2017-10-31 14:46:14 -02:00
Gabriel Carvalho de Campes
fde5d56d87 change ask permissions timing, small code fixes 2017-10-31 08:53:06 -02:00
Gabriel Carvalho de Campes
436e7df7d4 removes unused css, removes unneeded code 2017-10-27 11:19:24 -02:00
Gabriel Carvalho de Campes
cf73251feb Merge remote-tracking branch 'upstream/v2.0.x-release' into audio-refactor 2017-10-26 16:26:19 -02:00
Gabriel Carvalho de Campes
81f35bac4f Fix concerns from review 2017-10-26 15:14:56 -02:00
Oswaldo Acauan
45d604c63d Refactor logger from client to server 2017-10-24 10:58:46 -02:00
gcampes
ff35ad9602 delete unused files, cleanup code 2017-10-23 10:41:09 -02:00
gcampes
029a13d2a0 better error handling, code cleanup 2017-10-20 08:11:51 -02:00
gcampes
1dda597fca Toast notifications on audio and overall changes 2017-10-18 17:40:01 -02:00
gcampes
d1bc675465 changes setdevices to bridge 2017-10-17 17:16:42 -02:00
gcampes
f89e189a88 fixes listenonly issue 2017-10-12 16:22:10 -03: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
gcampes
ceea7b7ed6 Implements audio transfer from echo test 2017-10-12 09:50:23 -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
gcampes
f8c50b8ef7 wire up audio errors to notifications. WIP 2017-10-11 09:05:57 -03:00
gcampes
675c890961 fixes typo 2017-10-10 16:10:36 -03:00
gcampes
02cdcb2562 changes to styles and texts in audio flow 2017-10-10 15:03:29 -03:00
gcampes
317c3e5ee9 changes to bridge and audio components. WIP 2017-10-09 17:48:10 -03: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
KDSBrowne
0838e21674 change css classes to SASS placeholders 2017-10-03 11:00:04 -07:00
KDSBrowne
10f95f11e1 fix merge conflicts 2017-10-02 12:37:51 -07:00
gcampes
37456c9db4 updates do sip bridge 2017-09-29 17:42:34 -03:00
gcampes
d15f0e1183 linter autofix 2017-09-29 10:42:08 -03:00
gcampes
cbb897b23f audio connects. WIP 2017-09-29 10:38:10 -03:00
gcampes
152527d1ab Merge remote-tracking branch 'upstream/bbb-2x-mconf' into audio-refactor 2017-09-26 14:25:11 -03:00
gcampes
62fe06516f Change audio modal styles and structure. WIP 2017-09-25 17:28:36 -03:00
KDSBrowne
a756b90e72 fix audio modal back Btn icon color 2017-09-20 12:52:23 -07:00
gcampes
ea637a1e49 first changes to audio components and services. WIP 2017-09-19 16:31:04 -03:00
KDSBrowne
d7335ade60 move focus styles to central location 2017-09-19 07:44:42 -07:00
KDSBrowne
e78e59e659 add focus style to device selectors 2017-09-18 09:43:21 -07:00
Oleksandr Zhurbenko
251bd22738 PR review fixes 2017-09-06 12:36:52 -07:00
Klaus
dc62d15ad0 Change variable name 2017-08-14 16:19:35 -03:00
Klaus
024fd2a796 Fix removed logic from the AudioContainer 2017-08-04 17:33:25 -03:00
Klaus
0c6ac6364c Fix missing state of audio modal 2017-08-04 09:24:57 -03:00
Klaus
d45ae64558 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into slides-refactor-2x 2017-08-02 11:29:33 -03:00
Anton Georgiev
64b597c420 Merge pull request #4179 from Klauswk/html5-2x-voice-user
[HTML5 2.0] Move AudioUsers to his own Collection
2017-08-01 14:38:26 -04:00
Klaus
11cf4b8d78 A few fixes on client 2017-08-01 10:41:24 -03:00
Klaus
9d42ca9bd7 Move from users to voice-users 2017-08-01 10:10:12 -03:00
Matthew Marangoni
2494f48f52 removed unused constructor 2017-07-31 13:54:18 -07:00
Matthew Marangoni
7c0d802f27 fixed undefined extension 2017-07-26 10:58:39 -07:00
Klaus
9ab4430f68 Fix merge stuff 2017-07-26 11:31:35 -03:00
Klaus
745b9070f6 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into slides-refactor-2x 2017-07-26 11:11:40 -03:00
Klaus
eea2c0ee8b Refactor user 2017-07-26 11:09:07 -03:00
Klaus
d72df301c6 Move to 2.0 2017-07-24 11:15:46 -03:00
Klaus
5c2369b992 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into call-manager 2017-07-24 11:00:30 -03:00
Matthew Marangoni
f521ef0402 Merge remote-tracking branch 'upstream/master' into call-manager 2017-07-19 11:55:45 -07:00
Klaus
b70702dabe Dynamic fetching the stun/turn servers 2017-07-19 09:44:47 -03: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
Klaus
a7ca723fe6 Audio only working on html5 2017-07-18 11:59:05 -03:00
Anton Georgiev
bc9083c0cf Merge pull request #4109 from Klauswk/fix-sass-path
[HTML5 - 2.0] Change relative path of the sass imports to absolute
2017-07-17 14:58:02 -04:00
Klaus
87943cb3f8 Change relative path of the sass to absolute 2017-07-17 15:21:45 -03:00
Klaus
3af281d648 Merge remote-tracking branch 'upstream/master' into merge-master-mconf 2017-07-17 13:33:45 -03:00
Klaus
1dfb054323 A few hotfixes to make the html5 client join again 2017-07-12 15:51:29 -03:00
KDSBrowne
c8b783e526 improve contrast for hover states in join audio modal 2017-07-11 08:15:19 -07:00
KDSBrowne
44afafc448 fix color contrast issues 2017-07-07 09:11:22 -07:00
KDSBrowne
8aee85ed72 ensure form elements have labels 2017-07-06 08:54:18 -07:00
Matthew Marangoni
545a9ea978 fixed issue with changing locales 2017-06-27 15:41:56 -07: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
Matthew Marangoni
482591a2f5 spacing fixes 2017-06-27 10:38:31 -07:00
Matthew Marangoni
6f2f541787 change state when joining and leaving audio 2017-06-22 14:31:27 -07:00
Klaus Klein
c627deca36 Move api to api/1.1 2017-06-19 08:57:32 -03:00
Matthew Marangoni
12d42aaecb set state for AudioManager when joining or leaving audio 2017-06-16 13:22:17 -07:00
Oswaldo Acauan
1c5c74db67 Fix merge conflicts 2017-06-05 13:52:46 +00:00
Oleksandr Zhurbenko
06493fda7f Switched to prop-types package to remove new React 15 warnings 2017-06-03 19:40:14 -07:00
Oswaldo Acauan
e6412275a6 Linter auto fix 2017-06-02 19:25:02 +00:00
KDSBrowne
df76d33cba set files permission to 644 2017-05-16 09:22:59 -07:00
KDSBrowne
6537a0e28c Fix client lint issues except those which are comment related 2017-05-16 08:37:17 -07:00
Matthew Marangoni
d3cfbf93df Merge remote-tracking branch 'upstream/master' into audio-locale-fix 2017-05-03 14:49:00 -07:00
Matthew Marangoni
99788090ee fixed audio and settings modal reopening when changing locale in settings 2017-05-03 14:39:07 -07:00
Anton Georgiev
3904771fc3 if microphone lock is enforced, pick listenOnly join over using mic 2017-05-03 16:12:47 -04:00
Anton Georgiev
038405f907 some changes to logClient api 2017-05-03 13:19:21 -04:00
Klauswk
b0b455e591 Merge branch 'master' into ClientLog 2017-05-03 13:40:57 -03:00
Anton Georgiev
5087e5b24b Handle audio on refactored modal (#2)
* handle audio on refactored modal

* wrap component with withModalMounter
2017-05-02 13:18:01 -04:00
Klaus Klein
131f23f42d Fix lint problems 2017-05-02 08:30:32 -03:00
Oswaldo Acauan
d434ba6893 Fix the audio-modal 2017-05-01 16:52:57 -03:00
Klaus Klein
5a4f05a41a Fix requests on PR #3865 2017-04-28 14:12:08 -03:00
Oswaldo Acauan
edd64a97f4 Fix merge conflicts 2017-04-28 16:15:29 +00:00
Klaus Klein
1c8e78d1c1 Merge with master 2017-04-28 10:53:30 -03:00
Klaus Klein
245ba3c4e3 Add client log, HTML5 2017-04-28 10:47:07 -03:00
Anton Georgiev
9684195c5f minor changes in strings 2017-04-27 17:23:43 -04:00
Anton Georgiev
c80827ee20 fix issue with listenOnly not hanging up 2017-04-24 17:17:53 -04:00
Anton Georgiev
d3bf2ab0b7 fix undefined voiceBridge 2017-04-20 16:53:55 -04:00
Anton Georgiev
0cc9ce4048 moved componentWillMount to component.. 2017-04-20 15:57:35 -04:00
Anton Georgiev
40d0417b9d resolve lint warnings on modified files 2017-04-19 16:52:50 -04:00
Anton Georgiev
17fe4aa9b8 move audio tag to component 2017-04-19 16:42:48 -04:00
Anton Georgiev
67700f605b Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into audio-restructuring 2017-04-19 11:22:48 -04:00
Anton Georgiev
4c49f68771 pass params via bridge constructor 2017-04-19 11:01:28 -04:00
Anton Georgiev
9152bfbaf9 move deskshare verto outside of audio/ 2017-04-19 10:59:57 -04:00
Anton Georgiev
450d2f3435 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into audio-restructuring 2017-04-17 11:37:49 -04:00
Anton Georgiev
8893b3ce19 instantiate audioManager with bridge 2017-03-31 11:46:33 -04:00
Anton Georgiev
afcb365ac6 turned the audio services into classes 2017-03-30 13:57:05 -04:00
Anton Georgiev
6de1c470a1 split phone and verto into audio/main sip-bridge and verto-bridge 2017-03-29 14:46:33 -04:00
Anton Georgiev
9e55ddbbe8 resolve issue with contentLabel missing in modal 2017-03-28 10:48:34 -04:00
Anton Georgiev
f4aeb3f7ee move phone api to audio/service.js 2017-03-28 10:02:23 -04:00
Anton Georgiev
7a45a8467b add Audio container and use for modal 2017-03-27 16:40:44 -04:00
Anton Georgiev
eae765cc69 move styles.sccs to audio-test 2017-03-27 11:45:24 -04:00
Anton Georgiev
3107f3cae3 move audio-notifications under audio/ 2017-03-24 12:38:49 -04:00
Anton Georgiev
8bb1386699 moved audio-modal and audio-settings under audio/ 2017-03-24 12:01:35 -04:00
Anton Georgiev
feac446be4 moved audio-menu under audio/ 2017-03-24 11:34:03 -04:00
Anton Georgiev
8ca0fc1eb3 moved audio-settings under audio/ 2017-03-24 10:55:42 -04:00
Anton Georgiev
e007a60e7d Merge branch 'audio-ui-touches' into audio-restructuring 2017-03-24 10:46:46 -04:00
Anton Georgiev
d585e2f882 moved audio-test component under audio/ 2017-03-23 09:19:44 -04:00
gcampes
3243ff32cf Changes to settings modal 2017-02-15 16:49:40 -02:00
Oswaldo Acauan
8ebb41de3a Change default constraints for the audio-stream-volume component 2016-12-19 17:15:48 +00:00
Oswaldo Acauan
37942569fb Prevent blank device selector comobos 2016-12-19 17:11:43 +00:00
Oswaldo Acauan
d1c4116aee Add missing semicolon 2016-12-19 11:35:33 +00:00
Oswaldo Acauan
cb28149e4f Add audio device selector and mic volume checker 2016-12-08 16:17:17 -02:00