BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
15,166 Commits 13 Branches 260 Tags 1.1 GiB
b3865ef90d
Commit Graph

15166 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
d88d4fb0bc Add stuff from 2.x 2017-06-19 10:13:35 -03:00
Klaus Klein
c627deca36 Move api to api/1.1 2017-06-19 08:57:32 -03:00
Fred Dixon
b963f4a5ee Create README.md 2017-06-09 06:03:24 -04:00
Anton Georgiev
76beca5593 Merge pull request #3980 from JaeeunCho/long_string_cc 
HTML5 - fixed long string at cc box
 2017-06-07 18:03:52 -04: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
Anton Georgiev
329a0c0882 Merge pull request #3972 from MaximKhlobystov/webdriverio-setup 
[HTML5 Client] Initial Acceptance Tests Setup
 2017-06-07 17:12:50 -04:00
Anton Georgiev
7f909058aa Merge pull request #3987 from OZhurbenko/refs-to-callbacks 
[HTML5] String refs to callback refs
 2017-06-07 15:11:09 -04:00
Klaus Klein
f135dbd129 Add check to undefined role 2017-06-07 10:02:31 -03: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
JaeeunCho
36c306c36d Merge remote-tracking branch 'upstream/master' into long_string_cc 2017-06-06 10:31:14 -07:00
Anton Georgiev
18d9fb947e Merge pull request #3986 from OZhurbenko/fix-chat-links 
HTML5 - Chat links fix
 2017-06-06 09:49:32 -04: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
Maxim Khlobystov
8ac038e6a1 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into webdriverio-setup 2017-06-06 00:14:10 +00:00
Maxim Khlobystov
03373b5abe Make sure the acceptance tests that involve keyboard are not executed on Firefox 
This commit prevents logging with Enter key from happening in Firefox tests. There's a well-known bug associated with browser.keys() on Firefox. We add an additional check to the Login test specs to prevent that from happening.
 2017-06-05 23:42:33 +00:00
Maxim Khlobystov
dc3533525e Simplify the command inside the test npm script (all bins are already in the PATH when we use npm scripts) 2017-06-05 23:38:03 +00:00
Klaus Klein
59bb9fd31a Lint to eslint 2017-06-05 16:12:06 -03: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
Anton Georgiev
8be6c50055 Merge pull request #3990 from oswaldoacauan/jscs-to-eslint 
[HTML5] Migrate from JSCS to ESLint
 2017-06-05 11:16:22 -04:00
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
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
Anton Georgiev
d229762e9f Merge pull request #3988 from OZhurbenko/packages-props-update 
[HTML5] Updated npm packages
 2017-06-05 09:03:26 -04: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
Maxim Khlobystov
584d15d7c6 Fix the JSCS errors introduced by the new testing code 2017-06-03 00:25:39 +00: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