BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17,161 Commits 13 Branches 260 Tags 1.1 GiB
47f012f08f
Commit Graph

2508 Commits

Author SHA1 Message Date
Klaus
27a92698cc Moved the meetingId to be last param 2017-06-29 10:09:11 -03:00
Klaus
6f93a5f9f6 Change to have default meeting param 2017-06-29 09:23:04 -03:00
Klaus
93927a3b53 Merge remote-tracking branch 'anton/handle-messages' into html5-2x-polls-messages 2017-06-29 09:22:34 -03:00
Oswaldo Acauan
ace3afeb70 Remove console.log 2017-06-29 09:01:10 -03:00
Oswaldo Acauan
63522c6a95 Use flat package on mongo upsert 2017-06-29 08:54:19 -03:00
Klaus
2098c2dff7 Handle polls messages 2017-06-28 17:37:45 -03:00
Anton Georgiev
3ab794cbdb obtain meetingId outside handler 2017-06-28 16:04:41 -04:00
Anton Georgiev
7e798b96dd clearing some linting issues 2017-06-28 15:24:19 -04:00
Anton Georgiev
56da45f071 handle adding presentation, slide 2.0 2017-06-28 15:05:50 -04:00
Klaus
4a24769f20 Change var name 2017-06-28 15:34:22 -03:00
Klaus
0e1d81ceb5 Change var name 2017-06-28 15:33:06 -03:00
Klaus
aab51bdaed Change import and remove console.err 2017-06-28 15:14:29 -03:00
Klaus
4fe5a074df Userlist working correct 2017-06-28 14:16:04 -03:00
Klaus
d3a50416cc Merge remote-tracking branch 'anton/handle-messages' into html5-whiteboard-messages 2017-06-28 13:56:33 -03:00
Klaus
894fd70e68 Fix presenter assigned message handle 2017-06-28 13:44:11 -03:00
Anton Georgiev
d899a573a6 Merge branch 'html5-whiteboard-messages' of github.com:Klauswk/bigbluebutton into handle-messages 2017-06-28 11:37:54 -04:00
Anton Georgiev
e0a5fa48f4 add default webcam_stream and adjust emoji 2017-06-28 11:33:03 -04:00
KDSBrowne
1cc5c5df92 change variable name and condition 2017-06-27 20:35:15 -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
83cbb47195 Fix pencil update, thanks to @capilkey 2017-06-27 14:36:37 -03:00
Klaus
6f3aeb7a8d Fix imports 2017-06-27 09:45:08 -03:00
Klaus
c90d94d5ac Handle presenterAssigned and emojiStatus 2017-06-27 09:40:28 -03:00
Klaus
5304a87b7b Add last message 2017-06-27 09:27:57 -03:00
Anton Georgiev
91cfc02d13 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into handle-messages 2017-06-26 17:21:42 -04:00
Anton Georgiev
ff01a66228 Merge branch 'html5-whiteboard-messages' of github.com:Klauswk/bigbluebutton into handle-messages 2017-06-26 17:11:57 -04:00
Anton Georgiev
a43a2c8eed Merge pull request #3993 from oswaldoacauan/git-hooks-linter 
[HTML5] Add a hook to run linters agains staged git files
 2017-06-26 16:34:11 -04:00
Oswaldo Acauan
404598d735 Fix conflicts 2017-06-26 20:24:58 +00:00
Anton Georgiev
16168ddd5b Merge pull request #3997 from Klauswk/DetectSystemLang 
[HTML5] Add support to default system/browser language
 2017-06-26 16:18:22 -04:00
Anton Georgiev
1d1a4c31f9 Merge pull request #4016 from MaximKhlobystov/grunt-to-npm-scripts-move 
[HTML5 Client] Transition from Grunt to NPM Scripts
 2017-06-26 16:11:09 -04:00
Klaus
43ffe77cd0 Remove unused import 2017-06-26 15:04:26 -03:00
Klaus
c491d28b78 Handle most of the breakout messages 2017-06-26 15:00:28 -03:00
Klaus
e9d13e3b1e A few fixes 2017-06-26 13:15:28 -03:00
Klaus
8b6cb71854 Shapes add correct in the collection 2017-06-22 14:24:00 -03:00
Klaus
0e0af787f3 Add missing files 2017-06-22 10:22:52 -03:00
Klaus
a209f620e0 Add cursor support 2017-06-22 10:22:34 -03:00
Klaus
8aee5dc069 Fix wrong publish name 2017-06-22 10:11:12 -03:00
Klaus
a1c41f220c Correct handling the whiteboard messages 2017-06-22 10:03:27 -03:00
Klaus
43cdd9754c Fix imports 2017-06-22 08:48:10 -03:00
Maxim Khlobystov
a25779c989 Get rid of the unused npm config file and add --production flag to one of the npm start scripts. 2017-06-22 01:19:13 +00:00
Maxim Khlobystov
6ef0ed946a Simplify the npm start script 
Meteor's ROOT_URL and HOME variables can no longer be changed in the config file (the npm script needs to be modified instead).
 2017-06-22 01:04:42 +00:00
Klaus
692de9f417 Handle a few new messages 2017-06-21 13:54:04 -03:00
Anton Georgiev
13193e1d12 Merge pull request #4009 from KDSBrowne/x0-userlistitem-missing-chevron-fix 
[HTML5] - Missing dropdown menu chevron fix
 2017-06-20 15:40:54 -04:00
Anton Georgiev
42393e21b7 Merge pull request #4015 from JaeeunCho/setPreseter_err_html5 
HTML5 - fixed setPresenter error through HTML5
 2017-06-20 15:39:42 -04:00
Klaus
3998139e72 Split redis and api for version migration 2017-06-20 14:17:37 -03:00
Klaus
0c596c304d Merge remote-tracking branch 'upstream/bbb-2x-mconf' into SplitRedis 2017-06-20 14:16:16 -03:00
Klaus
b3865ef90d Merge remote-tracking branch 'origin/Refactor2x' into SplitRedis 2017-06-20 14:11:19 -03:00
KDSBrowne
be009fd9ba fix chat log aria label to work with jaws 2017-06-20 09:01:42 -07:00
Anton Georgiev
367b905ec5 use enter api to get meetingId, authToken, etc 2017-06-19 14:03:12 -04:00
Anton Georgiev
8e16114c3f html5client login now redirect=true to url+sessionToken 2017-06-19 14:01:24 -04:00
KDSBrowne
8df4c0a174 suggested change 2017-06-19 09:29:32 -07: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
KDSBrowne
30b5fb3259 fix jaws ability to voice users in the userlist 2017-06-16 11:42:28 -07:00
JaeeunCho
613da8b818 HTML5 - removed setPresenter at viewer 2017-06-16 08:15:49 -07:00
JaeeunCho
cf660527a8 HTML5 - fixed setPresenter error through HTML5 2017-06-16 08:14:02 -07:00
Maxim Khlobystov
60a60fd1ab package.json cleanup 
This commit applies the following 2 changes:
- Removes the preinstall NPM command that installs Grunt (we don't use Grunt anymore)
- Makes sure Meteor database is reset before the client starts up in production mode
 2017-06-16 06:32:18 +00:00
Maxim Khlobystov
237bcd7f9b Remove the old Meteor shell configs 
Those values are now in .npmrc file.
 2017-06-15 05:15:26 +00:00
Maxim Khlobystov
81dec9e858 Remove start.sh 
npm start command does exactly the same thing, so we don't need the Shell script anymore.
 2017-06-15 04:51:27 +00:00
Maxim Khlobystov
2c653ab99a Get rid of Grunt 
This commit removes everything that is related to Grunt, since we can now use NPM instead. Particularly, it does the following things:
- Removes the Gruntfile
- Removes the text file containing Grunt instructions
- Uninstalls all the Grunt-related packages
 2017-06-15 04:42:47 +00:00
Maxim Khlobystov
177a348813 Move the Meteor configs, such as the root URL and production home directory, to NPM 
This commit allows NPM to run the client in development and production modes using all the Meteor-related configs.

Run client in development:
NODE_ENV=development npm start
or
npm start

Run client in production:
NODE_ENV=production npm start

The default rootURL is http://127.0.0.1/html5client. This can be changed in .npmrc.
If prodHome is specified in .npmrc, then its value is used as Meteor's $HOME.
 2017-06-15 04:20:52 +00:00
Maxim Khlobystov
be8bd7ac76 Split the start script into two commands: development and production 
This commit slightly modifies the start script: we don't need to jump to another directory to run start.sh. It also introduces two modes of running the client via npm scripts: default mode (development) and production mode. I only introduce the npm scripts setup, the modes don't differ from each other yet.
 2017-06-15 01:35:12 +00:00
JaeeunCho
3bcae276e1 HTML5 - fixed setPresenter error through HTML5 2017-06-14 13:31:49 -07:00
Oswaldo Acauan
c21abbeb58 Fix merge conflicts 2017-06-13 12:16:58 +00:00
KDSBrowne
5963b1a49f fix lint issue 2017-06-11 20:47:17 -07:00
KDSBrowne
9eaa19e8c7 fix lint issue 2017-06-10 12:29:36 -07:00
KDSBrowne
b80fb29fb2 switch to callback ref 2017-06-10 12:21:13 -07:00
KDSBrowne
c32f614bc8 add new line to end of file 2017-06-10 12:04:52 -07:00
KDSBrowne
cb96a26717 remove string concatenation 2017-06-10 11:56:14 -07:00
KDSBrowne
01a250e5b7 fix console error with FindDOMNode() on unmounted component 2017-06-10 11:22:54 -07:00
KDSBrowne
ae883f1065 remove console log 2017-06-09 12:08:52 -07:00
KDSBrowne
0fc81cf63d clean up key events 2017-06-09 12:04:21 -07:00
KDSBrowne
65bf70b293 add overflow: visible to show userlist item dropdown menu chevron 2017-06-09 09:27:18 -07:00
KDSBrowne
13ab2134a9 remove console log 2017-06-08 11:06:04 -07:00
KDSBrowne
000575f38a fix menu not closing on click 2017-06-08 11:05:11 -07:00
KDSBrowne
c189faceff fix merge conflicts 2017-06-08 11:00:06 -07:00
KDSBrowne
dd4e1ba488 fix keycode events 2017-06-08 10:40:14 -07:00
Klaus Klein
68f52aa107 Remove error from http response 2017-06-08 14:29:35 -03:00
KDSBrowne
3906448d71 fix keydown event bugs 2017-06-08 08:33:25 -07: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
KDSBrowne
0c05597f3d Merge remote-tracking branch 'origin/x0-userlist-accessibility-bug-fixes' into x0-userlist-accessibility-suggestions 2017-06-07 11:37:07 -07:00
KDSBrowne
c2579c7838 fix console error related to messageForm 2017-06-07 11:36:25 -07:00
KDSBrowne
f17dfd04cf fix focus bug 2017-06-07 06:44:18 -07:00
Klaus Klein
f135dbd129 Add check to undefined role 2017-06-07 10:02:31 -03:00
KDSBrowne
cf9d2d16e1 remove null values being announced by NVDA 2017-06-06 17:56:50 -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
JaeeunCho
36c306c36d Merge remote-tracking branch 'upstream/master' into long_string_cc 2017-06-06 10:31:14 -07:00
KDSBrowne
3cae15da59 fix conflicting keypress events 2017-06-06 10:19:25 -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
Klaus Klein
e7e1243fef Add const to defaultLang 2017-06-06 09:43:57 -03:00
Klaus Klein
0d9525164f Add support to default system/browser language 2017-06-06 09:33:53 -03: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
KDSBrowne
1cfc37eac9 remove unneeded localized strings 2017-06-05 12:33:45 -07:00
Klaus Klein
59bb9fd31a Lint to eslint 2017-06-05 16:12:06 -03:00
KDSBrowne
26b40e9fb0 change counter variable name 2017-06-05 12:08:34 -07:00
JaeeunCho
cb2c849692 Merge remote-tracking branch 'upstream/master' into long_string_cc 2017-06-05 11:32:50 -07:00
Oswaldo Acauan
f9a2e69e05 Add a hook to run linters agains staged git files 2017-06-05 18:05:46 +00:00
KDSBrowne
3ffc7f34f8 change confusing counter variable names 2017-06-05 10:57:57 -07:00
KDSBrowne
2e28f25118 change syntax focusing nested parent 2017-06-05 10:41:28 -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
KDSBrowne
0220a98d36 move reused code to function 2017-06-05 09:35:11 -07:00
KDSBrowne
257ca0d911 change condition syntax for event keycodes 2017-06-05 08:51:09 -07:00
KDSBrowne
53712d125b remove removeEventListener() 2017-06-05 08:38:21 -07: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
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
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
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