Commit Graph

1112 Commits

Author SHA1 Message Date
Klaus
8b6cb71854 Shapes add correct in the collection 2017-06-22 14:24:00 -03:00
Klaus
b3865ef90d Merge remote-tracking branch 'origin/Refactor2x' into SplitRedis 2017-06-20 14:11:19 -03:00
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
JaeeunCho
d902724309 HTML5 - removed useless line 2017-06-07 14:57:27 -07:00
JaeeunCho
c7e654511c Merge remote-tracking branch 'upstream/master' into long_string_cc 2017-06-07 14:53:39 -07:00
Oleksandr Zhurbenko
4dbf02a344 Fixed a bug with the switches ref 2017-06-06 14:55:46 -07:00
JaeeunCho
5b658dcd97 HTML5 - fixed long string at cc box 2017-06-06 10:32:56 -07:00
Oleksandr Zhurbenko
1ba4018629 Cleanup 2017-06-05 20:15:37 -07:00
Oleksandr Zhurbenko
52fae1b8c8 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into refs-to-callbacks 2017-06-05 19:51:20 -07:00
Oleksandr Zhurbenko
9f497d8991 Fixed scrollArea usage 2017-06-05 19:10:06 -07:00
JaeeunCho
cb2c849692 Merge remote-tracking branch 'upstream/master' into long_string_cc 2017-06-05 11:32:50 -07: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
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
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
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
JaeeunCho
eb4619dbde HTML5 - fixed long string at cc box 2017-06-02 08:27:55 -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
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
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
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
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
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
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
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