Commit Graph

199 Commits

Author SHA1 Message Date
Klaus Klein
ca09b69555 Merge branch 'Acl' into Refactor2x
* Acl:
  Add check to undefined role
  Lint to eslint
  Missing merge file
  Fix lint problems
  Change Acl lookup
  Change ACL to be more extensible
  Fix a few review comments
  Acl refactor working
  Mostly working, still problems with user subs
  Code refactored
2017-06-19 11:28:17 -03:00
Klaus Klein
c627deca36 Move api to api/1.1 2017-06-19 08:57:32 -03:00
Klaus Klein
cb02f2979d Missing merge file 2017-06-05 13:55:29 -03:00
Klaus Klein
b574859ab2 Merge remote-tracking branch 'upstream/master' into Acl
* upstream/master:
  Improve lint script
  Update package-lock with the new packages
  Add missing packages and fix formating
  Switched from 2 deprecated packages
  Corrected findDOMNode import for the poll shape
  Switched from the deprecated react-addons-css-transition-group package to a recommended one
  Updated react-meteor-data to remove a new React 15 warning
  Updated main packages
  Switched to prop-types package to remove new React 15 warnings
  Improve ESLint rules
  Linter auto fix
  Change lint import configs to our pattern
  Remove autofix script
  Replace JSCS in favor of ESLint
2017-06-05 13:52:37 -03:00
Klaus Klein
d701966434 Fix lint problems 2017-06-05 13:40:36 -03:00
Oswaldo Acauan
1c5c74db67 Fix merge conflicts 2017-06-05 13:52:46 +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
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
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
Klaus Klein
fc73992a63 Fix a few review comments 2017-06-01 17:40:55 -03: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
a4c8ff493a Code refactored 2017-05-31 14:54:43 -03: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
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
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
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
Klaus Klein
8d4b69b578 Remove unnecessary fields 2017-05-16 08:26:19 -03:00
Klaus Klein
82f638384b Fix the lock user icon to work as flash, HTML5 2017-05-15 16:26:03 -03:00
KDSBrowne
fc2a36f14b remove element refs not being used 2017-05-15 09:01:46 -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
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
bd923e0f39 HTML5 - added locked status for users 2017-05-10 14:00:03 -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
KDSBrowne
9462221af6 remove unneeded ref and id's 2017-05-09 07:13:55 -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
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
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