Commit Graph

192 Commits

Author SHA1 Message Date
Klaus
2343ef3f1f Add missing merge file 2017-07-17 13:38:18 -03:00
Klaus
3af281d648 Merge remote-tracking branch 'upstream/master' into merge-master-mconf 2017-07-17 13:33:45 -03:00
Anton Georgiev
d2d6e1d029 Merge pull request #4056 from KDSBrowne/x03-client-audit-semantics
[HTML5] - Accessibility Contrast & Semantic Fixes
2017-07-14 15:17:49 -04:00
Oswaldo Acauan
5353a3a80d Add guest policy to html5 2017-07-14 11:18:07 -03:00
KDSBrowne
efd933bf28 change $color-white to #fff 2017-07-11 07:08:49 -07:00
JaeeunCho
28b81b32eb changed function to pass two parameters 2017-07-07 08:18:19 -07:00
KDSBrowne
0dfa9ca446 Ensures aria-hidden='true' is not present on the document body 2017-07-06 08:30:50 -07:00
JaeeunCho
440c675e23 made function for duplicated code 2017-07-05 15:56:13 -07:00
JaeeunCho
1a1fb6dc57 HTML5 - fixed errors when the meeting is ended by apimate 2017-07-05 07:59:18 -07:00
KDSBrowne
33da4d391e add missing lang attribute 2017-07-04 07:32:22 -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
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
JaeeunCho
607a3f4e5d HTML5 - put the order at media class 2017-05-18 13:03:35 -07:00
JaeeunCho
050994fc06 HTML5 - removed unused media query 2017-05-18 12:58:21 -07:00
JaeeunCho
8b6f8e857c HTML5 - removed unused media query 2017-05-17 13:09:10 -07:00
JaeeunCho
5ee206e73e HTML5 - fixed order and slide control position 2017-05-17 13:06:07 -07:00
JaeeunCho
4695395508 Merge remote-tracking branch 'upstream/master' into hidden_closedCaption 2017-05-17 13:04:09 -07:00
KDSBrowne
97514dc5c5 remove default messages 2017-05-16 17:30:42 -07:00
JaeeunCho
87b013fd5b HTML5 - fixed fixed closed-caption display 2017-05-15 14:45:44 -07:00
JaeeunCho
92bc296bc0 HTML5 - fixed closed-caption display 2017-05-12 12:17:08 -07:00
Anton Georgiev
66852961d4 Merge pull request #3920 from JaeeunCho/hidden_title
Tested, seems fine
2017-05-12 11:53:42 -04:00
JaeeunCho
4012a0d077 HTML5 - fixed navbar to be displayed 2017-05-08 14:03:22 -07:00
Matthew Marangoni
99788090ee fixed audio and settings modal reopening when changing locale in settings 2017-05-03 14:39:07 -07:00
Oswaldo Acauan
d434ba6893 Fix the audio-modal 2017-05-01 16:52:57 -03:00
Oswaldo Acauan
edd64a97f4 Fix merge conflicts 2017-04-28 16:15:29 +00:00
Klaus Klein
d4917e975c Review change 2017-04-26 17:07:22 -03:00
Klaus Klein
d32dbb12f5 Fix wrong import 2017-04-25 14:26:14 -03:00
Klauswk
73fb753edb Merge branch 'master' into FixAuthentication 2017-04-25 14:09:47 -03:00
Klaus Klein
6f564ba7b6 Fix auth and user kick, HTML5 closes #3844 #3828 2017-04-25 14:04:17 -03:00
Anton Georgiev
d7a61a8a7e Merge pull request #3801 from JaeeunCho/userlist_truncate
HTML5 - Truncate user name and chat name
2017-04-24 15:02:16 -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
Anton Georgiev
9152bfbaf9 move deskshare verto outside of audio/ 2017-04-19 10:59:57 -04:00
Oswaldo Acauan
5fa27107cb Fix merge conflicts 2017-04-18 19:42:55 +00:00
Oswaldo Acauan
334026833b Refactor Modal related components 2017-04-18 19:38:26 +00:00
Anton Georgiev
450d2f3435 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into audio-restructuring 2017-04-17 11:37:49 -04:00
KDSBrowne
2b8c9812ee fix merge conflict 2017-04-17 06:34:11 -07:00
Anton Georgiev
47f1ad0ed5 fix missing import causing breakouts to not work 2017-04-12 15:29:47 -04:00
KDSBrowne
e316f38cda fix merge conflicts 2017-04-11 07:07:49 -07:00
Jaeeun Cho
f9ead27954 Update styles.scss 2017-04-10 15:40:41 -04:00
JaeeunCho
88cccc41ee HTML5 - fixed size for userName 2017-04-10 12:32:48 -07:00
KDSBrowne
a5f1857c67 add descriptions to defined messages 2017-04-10 08:50:03 -07:00
KDSBrowne
7e96f7062f replace FormattedMessage component with definedMessages 2017-04-07 05:44:05 -07:00
Anton Georgiev
c257839e5b Merge pull request #3753 from KDSBrowne/actions-button-fix
[HTML5] - Actions Button Fix
2017-04-07 08:08:14 -04:00
KDSBrowne
8469691256 fix slide control and actionbar btn overlap 2017-04-06 08:13:28 -07:00
gcampes
3ea21df973 Fix closed captions settings issue 2017-04-06 08:46:15 -03: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