BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,921 Commits 13 Branches 260 Tags 1.1 GiB
82a1ad2c8a
Commit Graph

2488 Commits

Author SHA1 Message Date
Oswaldo Acauan
60fcd5aab1 Improve lint script 2017-06-05 14:18:06 +00:00
Klaus Klein
a96393e23c Change Acl lookup 2017-06-05 11:16:19 -03:00
KDSBrowne
e840c358b3 auto focus first selectable element userlist item dropdown 2017-06-05 07:04:12 -07:00
Oswaldo Acauan
67c086d433 Update package-lock with the new packages 2017-06-05 14:04:04 +00:00
Oswaldo Acauan
1c5c74db67 Fix merge conflicts 2017-06-05 13:52:46 +00:00
Oswaldo Acauan
1bc9943b72 Add missing packages and fix formating 2017-06-05 13:26:47 +00: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
Maxim Khlobystov
b0762b9d84 Update the acceptance testing docs 
This commit does the following updates:
- fixes the misprint that prevented Chrome from being installed
- removes the step of creating the `tools` directory (we don't need this anymore, since the directory is commited now)
 2017-06-04 23:52:04 +00:00
Maxim Khlobystov
5b0e0d35eb Add an empty hidden file inside tools to be able to commit the directory 2017-06-04 23:44:36 +00:00
Oleksandr Zhurbenko
94fef64251 Switched from 2 deprecated packages 2017-06-04 16:37:12 -07:00
Maxim Khlobystov
f100563516 Upgrade test reporting 
This commit does the following:
- adds the Spec test reporter to display all the passed/failed test specs after all the tests finish running
- removes console logging (we don't need it anymore, since we can see the reported results at the end of every test run)
- adds the XML test reporter for easier Jenkins integration
 2017-06-04 23:25:51 +00:00
Oleksandr Zhurbenko
df077afe51 Corrected findDOMNode import for the poll shape 2017-06-04 16:25:21 -07:00
Oleksandr Zhurbenko
0e55b04a7a Switched from the deprecated react-addons-css-transition-group package to a recommended one 2017-06-04 16:20:38 -07:00
Oleksandr Zhurbenko
599c0f6307 Updated react-meteor-data to remove a new React 15 warning 2017-06-04 16:17:06 -07:00
Oleksandr Zhurbenko
25c9f2dde6 Updated main packages 2017-06-03 19:56:07 -07:00
Oleksandr Zhurbenko
06493fda7f Switched to prop-types package to remove new React 15 warnings 2017-06-03 19:40:14 -07:00
Oleksandr Zhurbenko
3ef376e095 Switched from String refs to callback refs 2 2017-06-03 17:02:00 -07:00
Oleksandr Zhurbenko
a0224dcffc Replaced String refs with callback refs 
String refs will be deprecated in the next React releases, since they have some performance issues
 2017-06-03 16:58:27 -07:00
Oleksandr Zhurbenko
47c1ac6083 Fixed links in the chat 2017-06-03 12:11:49 -07:00
Maxim Khlobystov
48b5ca32cb Translate the page object classes to ES6 2017-06-03 01:27:29 +00:00
Oleksandr Zhurbenko
87a2ef93dc Added transitions for the color and thickness icons on the toolbar 2017-06-02 17:41:39 -07:00
Maxim Khlobystov
584d15d7c6 Fix the JSCS errors introduced by the new testing code 2017-06-03 00:25:39 +00:00
Oleksandr Zhurbenko
c8af9c70b1 Added a font-size setting for the text shape to the whiteboard-toolbar 2017-06-02 16:46:02 -07:00
Oleksandr Zhurbenko
cc47b991b6 Renamed customSvgIcon to customIcon 2017-06-02 16:41:28 -07:00
Oleksandr Zhurbenko
9550c4235d Fixed race condition for the drawSettings 2017-06-02 16:40:52 -07:00
Oswaldo Acauan
d279e6d4f4 Improve ESLint rules 2017-06-02 20:42:13 +00:00
Klaus Klein
6031b21067 Change ACL to be more extensible 2017-06-02 17:37:22 -03:00
Anton Georgiev
ebd8cce82a Merge pull request #3976 from oswaldoacauan/fix-chat-max-message-length 
[HTML5] Add check for min/max length for chat message
 2017-06-02 15:27:02 -04:00
Oswaldo Acauan
e6412275a6 Linter auto fix 2017-06-02 19:25:02 +00:00
Oswaldo Acauan
1573d641a6 Change lint import configs to our pattern 2017-06-02 19:16:30 +00:00
Oswaldo Acauan
9e0ffdc000 Remove autofix script 2017-06-02 19:01:57 +00:00
KDSBrowne
9b6f6e2fa1 fix merge conflict 2017-06-02 12:01:12 -07:00
Oswaldo Acauan
b10d3748a8 Replace JSCS in favor of ESLint 2017-06-02 18:55:23 +00:00
KDSBrowne
95a81315d3 fix focus managment 2017-06-02 10:22:22 -07:00
JaeeunCho
eb4619dbde HTML5 - fixed long string at cc box 2017-06-02 08:27:55 -07:00
KDSBrowne
bf6b85414a remove nested select function 2017-06-01 16:38:56 -07:00
KDSBrowne
636e848a80 fix tab key focusing only second element in dropdown list 2017-06-01 14:49:42 -07:00
Klaus Klein
fc73992a63 Fix a few review comments 2017-06-01 17:40:55 -03:00
JaeeunCho
510288bfe1 HTML5 - added new line at the end of the file 2017-06-01 13:13:14 -07:00
JaeeunCho
8d776b1811 Merge remote-tracking branch 'upstream/master' into disappear_dialog 2017-06-01 13:10:22 -07:00
Klaus Klein
1db64e2bb7 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into Acl 
* 'master' of https://github.com/bigbluebutton/bigbluebutton:
  HTML5 - removed 'lockedLayout' variable
  Update README.md
  Improved the detection if IP addresses in bbb-conf
  Removing event listeners in handleHide
  Fixed click listeners' initialization
  Bump version number to 1.1.0
  Update BigBlueButton.html
  remove new lines being rendered in log/development.log
  remove new operator
  add suggested changes
  HTML5 - put the order at media class
  HTML5 - removed unused media query
  HTML5 - removed unused media query
  HTML5 - fixed order and slide control position
  change file permission to 644
  fix new lint issues
  set files permission to 644
  Fix client lint issues except those which are comment related
  HTML5 - fixed fixed closed-caption display
  HTML5 - fixed closed-caption display
 2017-06-01 16:38:58 -03:00
Klaus Klein
8a31d29e17 Acl refactor working 2017-06-01 14:32:04 -03:00
Oswaldo Acauan
067bd96272 Fix merge conflicts 2017-06-01 14:27:12 +00:00
Oswaldo Acauan
3702da3e08 Add check for min/max length for chat message 2017-06-01 14:24:29 +00:00
Klaus Klein
de3a5e9cb6 Mostly working, still problems with user subs 2017-06-01 10:12:11 -03:00
Klaus Klein
a4c8ff493a Code refactored 2017-05-31 14:54:43 -03:00
Maxim Khlobystov
3b048bc475 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into webdriverio-setup 2017-05-30 02:53:57 +00:00
Maxim Khlobystov
41645c315c Get rid of all the old testing code that can't be run anymore. 2017-05-30 02:04:27 +00:00
Maxim Khlobystov
4ea0d7e7f8 Remove all the Jasmine-related Meteor startup parameters that are not used anymore. 2017-05-30 01:55:03 +00:00
Maxim Khlobystov
77c776bd78 Initialize custom command for a login action (not used yet, will be utilized in future tests). 2017-05-30 01:45:30 +00:00
Maxim Khlobystov
b2f09ad1f0 Add Node.js installation step to the docs on acceptance testing. 2017-05-30 01:17:13 +00:00
Maxim Khlobystov
73892627ae Fix multiple misprints in the acceptance testing docs. 2017-05-30 00:49:39 +00:00
JaeeunCho
2b0e6df6d6 HTML5 - removed 'lockedLayout' variable 2017-05-29 13:34:33 -07:00
JaeeunCho
5efb697c9c HTML5 - fixed conflict 2017-05-29 13:24:29 -07:00
Maxim Khlobystov
5dbd42ce2e Update the acceptance test docs 
This commit adds the steps of how to run and configure the acceptance test specs and suites.
 2017-05-28 05:32:52 +00:00
Maxim Khlobystov
68de9493a5 Group the login acceptance tests into a single test suite. 2017-05-28 05:07:06 +00:00
Maxim Khlobystov
5828dcecce Integrate acceptance tests with npm scripts 
This commit adds a special test npm command to be able to run the acceptance tests using npm scripts.
 2017-05-28 04:45:41 +00:00
Maxim Khlobystov
3cef659a43 Set the test runner to take only those files that have *.conf.js filenames. 2017-05-28 03:30:11 +00:00
Oleksandr Zhurbenko
cd5cb62949 Generating the shape id above all the draw listeners 2017-05-26 15:06:49 -07:00
Oleksandr Zhurbenko
b5171ae4eb Fixed a problem with selecting elements while drawing, splitted getTransformedSvgCoordinate so that it could be reused by the text shape 2017-05-26 14:20:55 -07:00
Oleksandr Zhurbenko
967c0bb4fb Restructuring, improvements 
Removed unnecessary state, 'out of bounds' check, adjusted the coordinate system for the text shape
 2017-05-26 13:06:34 -07:00
Oleksandr Zhurbenko
21f09edaeb Fixed a bug with cursor not moving vertically/horizontally 2017-05-26 12:06:35 -07:00
Oleksandr Zhurbenko
4296bac515 Improved presenter's cursor component 
Changed naming and removed unnecessary variables from the state
 2017-05-26 12:05:19 -07:00
Maxim Khlobystov
4703692de8 Start writing the Getting Started guide for the acceptance tests 
This commit adds the INSTALL.md file with all the steps to get the Selenium server up and running.
 2017-05-25 23:43:53 +00:00
Anton Georgiev
4a4cb684ac Merge pull request #3960 from OZhurbenko/dropdown-listeners-fix 
HTML5 - dropdown click listeners' fix
 2017-05-25 13:57:52 -04:00
Anton Georgiev
250c6cdb8b Merge pull request #3948 from KDSBrowne/x0-lint-Client 
[HTML5] - Fix client lint issues
 2017-05-25 13:57:04 -04:00
JaeeunCho
4c9c5701c3 HTML5 - fixed setting's dropdown re-render issue 2017-05-24 15:42:02 -07:00
Anton Georgiev
6df3eb2afe Merge pull request #3940 from JaeeunCho/hidden_closedCaption 
HTML5 - fixed closed-caption display
 2017-05-24 15:57:58 -04:00
KDSBrowne
58c777b456 fix locale string format 2017-05-23 14:49:02 -07:00
KDSBrowne
eabf5cb4e1 use += and -= operator 2017-05-23 06:45:28 -07:00
KDSBrowne
f4dd6628ee remove switch statment 2017-05-23 06:35:55 -07:00
KDSBrowne
477ca85615 fix hoisting issue and switch to keydown event 2017-05-23 06:23:26 -07:00
Oleksandr Zhurbenko
c4250c3fa9 Removing event listeners in handleHide 2017-05-22 16:50:32 -07:00
Oleksandr Zhurbenko
98ab79507b Fixed click listeners' initialization 2017-05-22 16:39:08 -07:00
Maxim Khlobystov
220fa275b4 Add two test cases to verify that user can't enter the client without a username 
This commit does the following:
- Adds two specs to test the landing page behaviour with no username entered (clicking the Join button or pressing Enter key)
- Fixes the test case that checks the landing page title (it previously didn't really do the job)
 2017-05-22 02:38:42 +00:00
Maxim Khlobystov
d69fc3bfaa Test both ways of joining HTML5 client from the landing page: clicking the Join button and pressing Enter 
This commit improves the landing page test spec by introducing the way to enter the client by pressing Enter. We also temporarily switch to Chrome in the main config file due to the bug in Geckodriver that doesn't allow us to use keyboard keys.
 2017-05-22 01:56:02 +00:00
Maxim Khlobystov
e6cce3d0e6 Set the Selenium test runner to log everything. 2017-05-22 01:24:41 +00:00
Oleksandr Zhurbenko
ff197c3773 Pencil annotation 2017-05-19 16:43:33 -07:00
KDSBrowne
ff1a152f0b remove new lines being rendered in log/development.log 2017-05-19 09:05:09 -07:00
KDSBrowne
beddf61532 remove new operator 2017-05-19 07:25:24 -07:00
KDSBrowne
159a47694e add suggested changes 2017-05-18 16:16:17 -07: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
KDSBrowne
de6e7093f3 remove custom aria prop name 2017-05-18 11:38:07 -07:00
KDSBrowne
f6a701b103 remove PascalCase notation 2017-05-18 10:29:25 -07:00
KDSBrowne
225f8aef68 switch to arrow functions 2017-05-18 10:23:23 -07:00
Anton Georgiev
409a471ab5 bring catch clause on the same line as closing curly brace 2017-05-18 10:52:59 -04: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
Anton Georgiev
71d4e8b0e0 catch Meteor error on userLeaving 2017-05-17 15:17:27 -04:00
KDSBrowne
d1543584ba change file permission to 644 2017-05-17 09:07:41 -07:00
KDSBrowne
f4d6f173ea fix new lint issues 2017-05-17 09:02:13 -07:00
KDSBrowne
16e507fbb2 fix merge conflicts 2017-05-17 08:54:48 -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
Anton Georgiev
e9eef8119b recover meeting propery needed for lock settings 2017-05-17 11:51:25 -04:00
Anton Georgiev
b4f3c41993 Merge pull request #3951 from KDSBrowne/x0-change-locale-string-format 
[HTML5] - Change the format of locale strings
 2017-05-17 11:42:39 -04:00
KDSBrowne
a2520dbbbc change format for other locales 2017-05-17 08:35:24 -07:00
Anton Georgiev
a89c70a04c Merge branch 'userlist-accessibility' of github.com:KDSBrowne/bigbluebutton into userlist-accessibility 2017-05-17 11:27:17 -04:00
Anton Georgiev
fc831440c3 Merge pull request #3932 from antobinary/address-error-500-and-stuck-users 
HTML5: Auto allow benign actions (logoutSelf); Disallow meteor calls if credentials are null
 2017-05-17 11:25:16 -04:00
Anton Georgiev
49a1f09536 minor improve syntax based on review comment 2017-05-17 11:24:12 -04: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
985cf43a93 change message descriptions 2017-05-17 07:32:35 -07:00
KDSBrowne
97514dc5c5 remove default messages 2017-05-16 17:30:42 -07:00
KDSBrowne
2f79f3ff20 change locale stringformat 2017-05-16 17:02:27 -07:00
KDSBrowne
f9fae74d08 fix merge conflicts 2017-05-16 09:33:26 -07:00
KDSBrowne
675a886fd0 fix merge conflicts 2017-05-16 09:28:28 -07: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
Anton Georgiev
f1a58eac24 Merge pull request #3941 from OZhurbenko/fix-issue-3938 
[HTML5] Text Shape 2.0
 2017-05-16 11:14:31 -04:00
Klauswk
2c1507567d Update app.yaml 2017-05-16 11:10:44 -03:00
Klaus Klein
8d4b69b578 Remove unnecessary fields 2017-05-16 08:26:19 -03:00
Maxim Khlobystov
0535edf6c1 Upgrade the landing page test to enter the actual HTML5 client 
This commit adds the action of submitting the landing page form to the test spec.

Note: Geckodriver 0.11.1 has a bug that prevents running our landing page test on Firefox 5.3 (version 5.2 works fine).
 2017-05-16 03:15:22 +00:00
JaeeunCho
87b013fd5b HTML5 - fixed fixed closed-caption display 2017-05-15 14:45:44 -07:00
Klaus Klein
2b53dd19e5 Code refactored 2017-05-15 16:45:00 -03:00
Klaus Klein
82f638384b Fix the lock user icon to work as flash, HTML5 2017-05-15 16:26:03 -03:00
Klaus Klein
95b47fd54a Fix lang fallback error 2017-05-15 13:32:41 -03:00
KDSBrowne
fc2a36f14b remove element refs not being used 2017-05-15 09:01:46 -07:00
Klaus Klein
81ab785daa Made 'Choose options' unselectable, HTML5 close #3935 2017-05-15 10:58:26 -03:00
Maxim Khlobystov
0c41baa439 Setup wdio + Finish the dummy landing page title test 
This commit adds the config file for the wdio test runner. Using the packaged runner instead of the particular Jasmine runner allows us to do the following:
- Use the global browser object (simplifies access to the Selenium methods from any particular assertion)
- Avoid installing Jasmine globally

The dummy landing page title test actually does the job now.
 2017-05-15 01:29:00 +00:00
Maxim Khlobystov
2013109236 Do initial WebdriverIO setup + Add dummy landing page title test 
This commit adds 2 packages:
    - WebdriverIO main package
    - Jasmine integration for WebdriverIO

Dummy landing page spec is created (supposed to test the title, but doesn't actually do that yet). This new spec follows the Page Object pattern.
 2017-05-14 03:52:43 +00:00
Oleksandr Zhurbenko
371419c41c Text shape preserves white space now and handles new lines 2017-05-12 12:46:10 -07:00
Oleksandr Zhurbenko
84aab7706a Text shape preserves white space now and handles new lines 2017-05-12 12:43:06 -07:00
JaeeunCho
92bc296bc0 HTML5 - fixed closed-caption display 2017-05-12 12:17:08 -07:00
KDSBrowne
9e672c2c88 remove commented code 2017-05-12 11:23:55 -07:00
KDSBrowne
a824ca2a79 fix lint issues 2017-05-12 11:11:42 -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
66852961d4 Merge pull request #3920 from JaeeunCho/hidden_title 
Tested, seems fine
 2017-05-12 11:53:42 -04: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
2e688e2a82 Merge pull request #3934 from antobinary/user-leaving-fix 
HTML5: Fix issue with userLeave on breakout end
 2017-05-12 09:47:34 -04:00
Anton Georgiev
b5601ecabc fix issue with userLeave on breakout end 2017-05-12 09:14:26 -04:00
Anton Georgiev
2e9c519e1a switch console logs for logClient 2017-05-12 08:24:06 -04:00
Anton Georgiev
3dc21e2cae increase the connectionTimeout value for production 2017-05-11 15:20:59 -04:00
Anton Georgiev
a4dcf72975 do not allow meteor calls if credentials are null 2017-05-11 15:18:34 -04:00
Anton Georgiev
5191168492 auto allow benign actions 2017-05-11 15:15:12 -04:00
KDSBrowne
296f024d45 use the ref callback attribute 2017-05-11 07:11:17 -07:00
JaeeunCho
fc5856a4ce HTML5 - linted code 2017-05-10 14:05:18 -07:00
JaeeunCho
ca808195f2 HTML5 - added locked status for users 2017-05-10 14:02:50 -07:00
JaeeunCho
bd923e0f39 HTML5 - added locked status for users 2017-05-10 14:00:03 -07:00
Oleksandr Zhurbenko
8de7b895b5 Optimized and validated undo/clear/send annotation methods 2017-05-10 11:59:17 -07:00
KDSBrowne
73819c9d1d fix switch statment 2017-05-10 11:39:03 -07:00
KDSBrowne
7e0ff7bf76 clean up code more 2017-05-10 11:24:09 -07:00
KDSBrowne
f0bce326b9 clean up code 2017-05-10 11:10:27 -07:00
KDSBrowne
bd3c8fb405 add aria tags 2017-05-10 08:12:24 -07:00
Anton Georgiev
e8b01dcdcc Merge pull request #3909 from antobinary/fix-cc 
HTML5: Changes to the closed captions settings menu
 2017-05-10 07:48:58 -04:00
Oleksandr Zhurbenko
f4b066ffc2 Added an additional check to prevent rendering the slide if Tomcat failed and didn't publish the slide 2017-05-09 13:40:05 -07:00
Oleksandr Zhurbenko
f04dae31c8 Added a version for the shape model and implemented shouldComponentUpdate 
Which prevents the shapes from being re-calculated if nothing has changed
 2017-05-09 13:34:46 -07:00
Anton Georgiev
e8fb481722 add logic to trigger logout if user timed out on auth step 2017-05-09 16:04:30 -04:00
KDSBrowne
9462221af6 remove unneeded ref and id's 2017-05-09 07:13:55 -07:00
KDSBrowne
735bdb4a87 fix query selector console error 2017-05-09 07:07:55 -07:00
JaeeunCho
4012a0d077 HTML5 - fixed navbar to be displayed 2017-05-08 14:03:22 -07:00
Oleksandr Zhurbenko
0268c59487 Optimized shape rendering 
WhiteboardShapeModel was created for each shape, but now we create one ShapeGroup which keeps a hashtable of Shape component references and calls them efficiently
 2017-05-08 13:37:09 -07:00
Oleksandr Zhurbenko
8482ad5a9b Fixed a bug with cursot mouseEvent not firing after changing the drawing settings 2017-05-08 13:29:54 -07:00
KDSBrowne
8bb1da0ed5 fix focus and tab order bugs 2017-05-06 16:04:59 -07:00
KDSBrowne
569ba42042 fix userlist styling 2017-05-06 09:01:16 -07:00
Anton Georgiev
1f640ea3e4 only offer taking over a locale for cc to moderators 2017-05-05 15:52:23 -04:00
KDSBrowne
77d529b2ac fix error for out of bound index 2017-05-05 12:11:28 -07:00
KDSBrowne
85a468f4b3 add key codes for left and right arrow 2017-05-05 07:37:01 -07:00
Klaus Klein
b2195da345 Fix client reconnection timeout 2017-05-05 11:30:15 -03:00
KDSBrowne
8194059e43 fix count bug 2017-05-04 14:58:33 -07:00
KDSBrowne
65323d0789 remove unused id's 2017-05-04 14:43:48 -07:00
KDSBrowne
eca2dbba93 clean up code 2017-05-04 14:41:09 -07:00
Oleksandr Zhurbenko
56c693cd81 Improved Cursor rendering 
The whole presentation component was recalculated when cursor coordinates were changed, that wasn't nice. Now it's good
 2017-05-04 14:10:49 -07:00
KDSBrowne
f6642b0dee make userlist keyboard accessible - incomplete 2017-05-04 13:39:53 -07:00
Oleksandr Zhurbenko
50cbefaf23 Fixed a bug with the shapes' thickness being depended on the slide sizes 2017-05-04 13:20:30 -07:00
Anton Georgiev
93baf362e6 remove old import 2017-05-04 15:14:14 -04:00
Anton Georgiev
91ce6e20d5 unify user and audiouser in verto bridge 2017-05-04 14:44:20 -04:00
Anton Georgiev
bd56001733 disable cc menu if toggled off 2017-05-04 14:42:55 -04:00
Oleksandr Zhurbenko
0028b5128d Plugged in thickness and color to the whiteboard-overlay from the whiteboard-toolbar 2017-05-04 07:33:16 -07:00
Anton Georgiev
453a2cf6a4 code style improvements of closed-captions 2017-05-03 17:54:26 -04: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
Fred Dixon
837654dc85 Merge pull request #3895 from perroned/update-verto-libs 
Update verto libs and WebRTC Extension
 2017-05-03 16:50:34 -04: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
6d71e943a0 Merge pull request #3893 from antobinary/check-mute-user 
HTML5: Update callServer to makeCall to fix user item calls
 2017-05-03 13:54:15 -04:00
Klauswk
b668b24cac Merge branch 'ClientLog' into test-3865 2017-05-03 14:31:13 -03:00
Anton Georgiev
038405f907 some changes to logClient api 2017-05-03 13:19:21 -04:00
Klauswk
74c2219fc9 Update index.js 2017-05-03 14:09:33 -03:00
Anton Georgiev
8ab7865419 Merge branch 'ClientLog' of github.com:Klauswk/bigbluebutton into test-3865 2017-05-03 12:59:33 -04: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
Anton Georgiev
3a4b8cc388 update callServer to makeCall to fix user item calls 2017-05-03 12:56:27 -04:00
Klauswk
b0b455e591 Merge branch 'master' into ClientLog 2017-05-03 13:40:57 -03:00
Klaus Klein
5a37750bf6 Change leave button label 2017-05-03 13:19:45 -03:00
Anton Georgiev
02c6f6d80f Merge pull request #3860 from JaeeunCho/userlist_name_space 
HTML5 - fixed display unread count for long name user
 2017-05-03 11:16:23 -04:00
Anton Georgiev
0521571218 Merge pull request #3838 from Klauswk/AddServerCallback 
Add server callback with error
 2017-05-03 11:11:35 -04:00
Anton Georgiev
8d037bc4fa resolve issues with modal on breakouts 2017-05-03 11:06:28 -04:00
perroned
66061fa33d Handle lib update/fix errors 2017-05-03 14:13:53 +00:00
KDSBrowne
583677df18 fix focus bug in userlist 2017-05-03 07:09:39 -07:00
Klaus Klein
bede8ab447 Fix missing line and tab problem 2017-05-03 09:27:33 -03:00
Oleksandr Zhurbenko
2c01a6ae5a Passed the data from the whiteboard-toolbar to the whiteboard-overlay 2017-05-02 17:05:41 -07:00
Oleksandr Zhurbenko
f415390673 Added rounded borders for the rectangle shape to be consistent with the Flash client 2017-05-02 15:49:15 -07:00
Oleksandr Zhurbenko
49124c12b1 Replaced the cursor icons in html5 with the new ones 
Included original svg files for the future reference and creating different cursor icons of different sizes
 2017-05-02 13:24:48 -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
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
Oleksandr Zhurbenko
303e6b2edb Displayed and positioned icons for the whiteboard tools 2017-05-02 09:04:05 -07:00
Klaus Klein
131f23f42d Fix lint problems 2017-05-02 08:30:32 -03:00
Oleksandr Zhurbenko
286f077ed3 Added initial drawing functionality for Line/Rectangle/Triangle/Ellipse 2017-05-01 14:34:24 -07:00