Commit Graph

139 Commits

Author SHA1 Message Date
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
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
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
gcampes
ded1de0b40 Adds localization dropdown 2017-04-06 09:36:59 -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
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
Gabriel Carvalho de Campes
bc969c8aad [HTML5] Open first submenu for settings 2017-03-13 17:03:18 -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
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
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
596f985bc2 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into closed-captioning-ui 2016-12-20 10:50:01 -08:00
KDSBrowne
90e63b0b54 moved this.setState 2016-12-18 17:00:42 -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
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
38b9227f04 improved application settings - incomplete 2016-12-13 19:40:32 -08: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
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