Commit Graph

348 Commits

Author SHA1 Message Date
Tainan Felipe
4bda76c5bb Merge remote-tracking branch 'upstream/v2.0.x-release' into fix-errors-linter 2017-10-12 15:36:52 -03:00
Oleksandr Zhurbenko
015ca3d719 Changed imports and removed 'initializeCursor.js' since it's not needed 2017-10-11 19:00:28 -07:00
Tainan Felipe
d6a6ff5eca remove .scss extension and changed path 2017-10-11 14:54:00 -03:00
Anton Georgiev
7c4e4a61d9 Merge pull request #4501 from antobinary/hide-lock-settings
[HTML5 client] Temporarily hide moderator view of lock settings
2017-10-11 14:31:23 -03:00
Anton Georgiev
ac93460ba7 temporarily hide moderator view of lock settings 2017-10-11 13:51:41 -03:00
Tainan Felipe
a667e3d05b Merge remote-tracking branch 'upstream/v2.0.x-release' into fix-errors-linter 2017-10-11 11:46:16 -03:00
Tainan Felipe
50cc876cf7 fix errors linter 2017-10-10 19:08:51 -03:00
Maxim Khlobystov
6146f391f0 Made sure the locales that contain underscore are displayed properly when shown as current language in the Settings window. 2017-10-10 20:56:33 +00:00
Maxim Khlobystov
03c94bba73 Dropped the file extension from the stylesheet name. 2017-10-05 19:40:38 +00:00
Maxim Khlobystov
350bbdfcc9 Added a comment to not forget about the push notifications setting. 2017-10-05 19:21:57 +00:00
Maxim Khlobystov
a7798f6c1a Fixed some ESLint errors. 2017-10-05 19:18:30 +00:00
Maxim Khlobystov
c3ba004bec Hidden Push Notifications setting's UI until it is implemented. 2017-10-05 19:06:28 +00: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
Klaus
97d2f6d3e5 Rollback to the right locales 2017-09-22 14:51:47 -03:00
KDSBrowne
d7335ade60 move focus styles to central location 2017-09-19 07:44:42 -07:00
KDSBrowne
a470bfb58f add border size variable and clean up css 2017-09-18 09:23:15 -07:00
KDSBrowne
ae443a8430 add custom focus to select elements 2017-09-15 12:25:45 -07:00
Oleksandr Zhurbenko
251bd22738 PR review fixes 2017-09-06 12:36:52 -07:00
Klaus
eea2c0ee8b Refactor user 2017-07-26 11:09:07 -03:00
Anton Georgiev
ed5460cba6 Merge pull request #4040 from Klauswk/html5-2x-captions-messages
[HTML5 2.0] Move captions messages to 2.0
2017-07-17 15:52:15 -04: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
KDSBrowne
50eb4d81ef wrap form elements with label 2017-07-07 23:50:33 -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
Klaus
9b63e0c215 Add caption messages 2017-06-29 17:22:09 -03: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
Klaus Klein
c627deca36 Move api to api/1.1 2017-06-19 08:57:32 -03: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
16e507fbb2 fix merge conflicts 2017-05-17 08:54:48 -07:00
Anton Georgiev
0579506e2e Merge pull request #3944 from Klauswk/FixUnselectableOption
Fix unselectable 'Choose Language' and fallback lang error.
2017-05-17 11:17:38 -04: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
Klaus Klein
81ab785daa Made 'Choose options' unselectable, HTML5 close #3935 2017-05-15 10:58:26 -03:00
Anton Georgiev
932209bf06 Merge pull request #3898 from mmarangoni/audio-locale-fix
Tested, seems to work fine
2017-05-12 11:31:52 -04:00
Anton Georgiev
1f640ea3e4 only offer taking over a locale for cc to moderators 2017-05-05 15:52:23 -04:00
Anton Georgiev
bd56001733 disable cc menu if toggled off 2017-05-04 14:42:55 -04: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
30e73e7640 Merge pull request #3879 from KDSBrowne/accessibility-update-07
[HTML5] - Accessibility update 07
2017-05-02 15:12:21 -04:00
Anton Georgiev
78937a5ac9 Merge pull request #3831 from oswaldoacauan/modal-refactor-pr
[HTML5] Refactor of the Modal component state
2017-05-02 15:09:38 -04:00
KDSBrowne
c3ce8192d1 fix lint issues 2017-05-01 12:59:17 -07:00
KDSBrowne
80d4feedcc fix tabIndex for the settings closed caption submenu 2017-05-01 12:46:21 -07:00
Anton Georgiev
85d6f7aa6e add label descriptions for cancel and save 2017-04-28 15:13:42 -04:00
Oswaldo Acauan
edd64a97f4 Fix merge conflicts 2017-04-28 16:15:29 +00:00
Anton Georgiev
5abf6413a8 localize controls in Settings menu 2017-04-28 11:56:27 -04:00
Anton Georgiev
684f87e77a demote html5 moderator user to viewer based on flag 2017-04-27 16:07:27 -04:00
KDSBrowne
ef18f652aa fix lint issues 2017-04-26 07:08:47 -07:00
KDSBrowne
a752b97809 add message descriptions 2017-04-25 05:21:12 -07:00
KDSBrowne
330abe06e5 fix aria semantics 2017-04-25 04:59:52 -07:00
KDSBrowne
1e4e730278 fix aria labels 2017-04-24 19:27:28 -07:00
KDSBrowne
9203cc60e3 add localized messages 2017-04-24 19:08:18 -07:00
KDSBrowne
423318962d add aria labels to closed caption submenu 2017-04-23 06:26:01 -07:00
KDSBrowne
41a5e01e2c fix missing section announcment 2017-04-21 12:14:55 -07:00
KDSBrowne
1e07098527 add messages for settings application submenu 2017-04-21 12:04:46 -07:00
Anton Georgiev
a9f2a18475 Merge pull request #3834 from antobinary/audio-restructuring
[HTML5] Audio restructuring part 1
2017-04-20 16:00:59 -04:00
Anton Georgiev
40d0417b9d resolve lint warnings on modified files 2017-04-19 16:52:50 -04:00
Anton Georgiev
67700f605b Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into audio-restructuring 2017-04-19 11:22:48 -04:00
Oswaldo Acauan
5fa27107cb Fix merge conflicts 2017-04-18 19:42:55 +00:00
Oswaldo Acauan
c8dd83aebe Split modal into two separated components and move state to a hoc on the base 2017-04-18 19:37:01 +00:00
gcampes
9f39f9ce6a merge conflicts 2017-04-18 16:14:39 -03:00
gcampes
5d1b280f05 Remove debug code 2017-04-18 14:28:35 -03:00
gcampes
5c3754c614 Fix ids displaying instead of messages on locale change 2017-04-18 14:26:27 -03:00
KDSBrowne
ca09907d47 add formatted messages 2017-04-17 11:19:27 -07:00
Anton Georgiev
450d2f3435 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into audio-restructuring 2017-04-17 11:37:49 -04:00
KDSBrowne
d4511eae5b add description to messages 2017-04-10 14:21:54 -07:00
KDSBrowne
803e7f0a87 change line endings 2017-04-10 14:11:48 -07:00
KDSBrowne
cd014929fe add defined messages 2017-04-10 13:27:29 -07: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
da25471e3c Adds missing lodash import 2017-04-04 14:51:05 -03:00
gcampes
52578a2eea Fix rollback settings issue 2017-03-28 17:16:57 -03:00
gcampes
1a15f83690 adds settings service 2017-03-28 15:41:48 -03: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
Anton Georgiev
937f020ca1 center modal title 2017-03-23 18:50:30 -04:00
Anton Georgiev
d585e2f882 moved audio-test component under audio/ 2017-03-23 09:19:44 -04:00
Anton Georgiev
a2e0029c65 drop Audio tab from settings 2017-03-23 08:53:04 -04:00
Anton Georgiev
18508b2632 audio join - apply structure and style from designs 2017-03-22 16:10:49 -04:00
gcampes
acb8b1155b Merge conflicts 2017-03-20 15:00:04 -03:00
Oswaldo Acauan
f020964c50 Fix merge conflicts 2017-03-16 20:25:14 +00:00
Oswaldo Acauan
8d21c435b5 Refactor of the App component 2017-03-16 16:52:43 +00:00
Anton Georgiev
59d6f12fad Merge pull request #3734 from Gcampes/settings-refactor
[HTML5] Increases default font size
2017-03-16 10:34:29 -04:00
gcampes
31adb14543 Increases default font size 2017-03-16 10:10:39 -03:00
Gabriel Carvalho de Campes
bc969c8aad [HTML5] Open first submenu for settings 2017-03-13 17:03:18 -03:00
gcampes
ed4f1cf5c2 Fix issues based on PR comments 2017-03-13 08:48:00 -03:00
gcampes
985b9d6939 Change icon names to the new ones 2017-03-09 13:49:28 -03:00
gcampes
417b2e4500 Fix issues based on PR comments 2017-03-09 11:34:33 -03:00
gcampes
91da3e0262 Fix font size not showing in settings modal 2017-03-01 14:37:55 -03:00
gcampes
4918cf9160 fix bug with focus 2017-03-01 09:22:11 -03:00
gcampes
439e7a97f2 fix font size on modal cancel 2017-02-24 17:38:16 -03:00
gcampes
3c02848478 hide moderator settings, implement default settings 2017-02-24 17:19:53 -03:00
gcampes
f941eaea3d solve closed captions settings issue, continue settings implementation 2017-02-21 17:29:36 -03:00
gcampes
3243ff32cf Changes to settings modal 2017-02-15 16:49:40 -02:00
gcampes
ce703d3b20 First changes to settings 2017-01-27 13:41:11 -02:00
Anton Georgiev
0b739ad43c Merge pull request #3534 from KDSBrowne/Audio-Join-UI-Revision
JoinAudio Modal UI Update
2017-01-10 11:16:56 -05:00
Oleksandr Zhurbenko
8a1a6511ce Moved inline styles to the styles.scss where it was applicable 2016-12-23 13:27:49 -08:00
Oleksandr Zhurbenko
40b8462c52 Minor fixes 2016-12-23 10:49:17 -08:00
Oleksandr Zhurbenko
500ff0b397 Changed the default message when there is no active locales 2016-12-23 00:44:15 -08:00
Oleksandr Zhurbenko
848aaa83f5 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into closed-captioning-ui 2016-12-23 00:31:22 -08:00
Oleksandr Zhurbenko
8f0d552f4f Finished closed-captions 2016-12-23 00:26:22 -08:00
Oleksandr Zhurbenko
e9ce459c9c Corrected identation 2016-12-22 17:48:19 -08:00
Oleksandr Zhurbenko
e92e694793 Corrected identation 2016-12-22 17:47:18 -08:00
KDSBrowne
acf204ae37 remove top margin from test audio button 2016-12-22 13:13:33 -08:00
KDSBrowne
e4390de53a position enter session button 2016-12-22 13:08:34 -08:00
Lajellu
b99d0a2407 HTML5 - Emoji - fix merge conflicts 2016-12-21 09:14:46 -08:00
Anton Georgiev
d408bb1522 Merge pull request #3514 from KDSBrowne/New-Settings-Update
New settings update - Application Menu
2016-12-21 12:01:26 -05:00
KDSBrowne
9c4f3e5c50 import as LocalStorage and clear specific values 2016-12-21 08:31:16 -08:00
Oleksandr Zhurbenko
596f985bc2 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into closed-captioning-ui 2016-12-20 10:50:01 -08:00
Lajellu
b3f1d9f804 HTML5 - Add the three emojis: applause, thumbs up, thumbs down and fixes some master lint issues 2016-12-20 10:06:01 -08:00
KDSBrowne
72d53f54ac remove unused import 2016-12-19 14:19:06 -08:00
KDSBrowne
73db970152 add suggestions and store settings until logout 2016-12-19 13:45:09 -08:00
KDSBrowne
e730d7241f removed unused line 2016-12-18 17:13:37 -08:00
KDSBrowne
90e63b0b54 moved this.setState 2016-12-18 17:00:42 -08:00
KDSBrowne
06ef0d09fb moved initialization to constructor 2016-12-16 09:01:40 -08:00
KDSBrowne
83ba4d3d12 removed unused import 2016-12-16 08:58:38 -08:00
KDSBrowne
a6c4713e1a removed unused import 2016-12-16 08:56:17 -08:00
KDSBrowne
c29bbf870f removed unused line 2016-12-14 09:43:07 -08:00
KDSBrowne
0ddde5200d removed unused line 2016-12-14 09:39:58 -08:00
KDSBrowne
83091a969d changed behaviour of fontSizeName bug 2016-12-14 08:42:25 -08:00
KDSBrowne
4bdfb54b4e fixed lint issues 2016-12-14 07:57:54 -08:00
KDSBrowne
adcb46cb41 cleaned up code 2016-12-14 07:50:35 -08:00
KDSBrowne
6512b7be8a fixed bug, removed console logs 2016-12-14 07:40:13 -08:00
KDSBrowne
eb7f58e2bb fixed issues, ready to set up save 2016-12-13 20:04:26 -08:00
KDSBrowne
38b9227f04 improved application settings - incomplete 2016-12-13 19:40:32 -08:00
Oswaldo Acauan
5622296b69 Add audio device selector and mic volume checker 2016-12-08 16:17:08 -02:00
KDSBrowne
2605ca6311 cleaned up 2016-12-05 17:37:46 -08:00
KDSBrowne
87ccc5ff84 cleaned up code 2016-12-05 08:21:55 -08:00
KDSBrowne
ae45f86e7d cleaned up css, still needs fixing 2016-12-01 07:32:22 -08:00
KDSBrowne
b766b713a0 broken down into components - need to fix css 2016-11-30 19:37:52 -08:00
Anton Georgiev
929ac08acb Merge branch 'OpenSettings-Menu-Options' of github.com:KDSBrowne/bigbluebutton into kert-pres-2 2016-11-28 19:17:15 +00:00
KDSBrowne
0fc3883397 removed duplication 2016-11-25 08:07:41 -08:00
KDSBrowne
b52d06fd85 fixed lint issue 2016-11-25 05:11:50 -08:00
KDSBrowne
59ded8461e added suggestions 2016-11-24 20:00:46 -08:00
KDSBrowne
4078337569 removed console logs 2016-11-23 18:12:36 -08:00
KDSBrowne
d580f01efd fixed lint issues 2016-11-23 18:01:51 -08:00
KDSBrowne
525279ecb0 added moderator condition 2016-11-23 17:55:14 -08:00
KDSBrowne
f5d82b8d38 Shows main setting options based on role 2016-11-23 12:01:09 -08:00
KDSBrowne
2e3407e128 clean up - more readable 2016-11-21 06:32:12 -08:00
KDSBrowne
4dd268e25a added new suggestions 2016-11-18 21:28:01 -08:00
KDSBrowne
bdcc8b9bd6 added new suggestions, need to fix console warning 2016-11-17 12:10:05 -08:00
KDSBrowne
6f1680318c update 2016-11-16 07:15:17 -08:00
KDSBrowne
3359ec499a clean up 2016-11-15 08:22:05 -08:00
KDSBrowne
2e3fe72cf4 Lock settings available to Presentor/Moderator 2016-11-07 09:52:21 -08:00
Oleksandr Zhurbenko
8fcd97d278 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into closed-captioning-ui 2016-10-04 13:56:13 -07:00
Oswaldo Acauan
249dd85f92 Move old settings modal to the new component 2016-09-01 13:56:41 +00:00