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
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
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
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
Oleksandr Zhurbenko
f7d1ff0df2 Text shape and bug fixes 
Restructured code, fixed a bug with thickness icon not displayed when switching from Text tool, added textshape container
 2017-06-16 19:32:41 -07:00
Oleksandr Zhurbenko
a9a8a48413 Fixed a bug with focus not working onBlur in FF 2017-06-16 13:33:10 -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
Oleksandr Zhurbenko
461a702759 Passing the data from the presenter's text shape to the whiteboard overlay 2017-06-10 19:21:37 -07:00
Oleksandr Zhurbenko
443c2f1032 Fixed a bug with ref breaking after changind a slide 2017-06-10 14:57:16 -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
Oleksandr Zhurbenko
16d03ca32b Fixed a bug with the text shape's static clipPath id 
ClipPath worked fine only for the first text shape
 2017-06-09 14:55:38 -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
Oleksandr Zhurbenko
1a8aaefb0e Fixed svg animation for svg whiteboard-toolbar icons 2017-06-07 14:40:15 -07:00
Oleksandr Zhurbenko
9e08cb8567 Refs, PropTypes, fixes 2017-06-07 14:25:47 -07:00
Oleksandr Zhurbenko
44c1140434 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality 2017-06-07 14:16:21 -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
Oleksandr Zhurbenko
1309bb1808 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality 2017-06-07 14:12:04 -07:00
Oleksandr Zhurbenko
6a228c0b77 Corrected the calls to the server-side 2017-06-07 13:45:49 -07:00
Oleksandr Zhurbenko
017ff470c3 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into presenter-functionality 2017-06-07 13:29:35 -07: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
2bcc03527c Added a check isPresenter to shapeFactory in order to render either presenter's or viewer's version of the text shape 2017-06-06 17:14:36 -07:00
Oleksandr Zhurbenko
465c0c1517 Changed whiteboard-toolbar's refs to callbacks, fixed a bug with the initial radius of the thickness svg icon 2017-06-06 16:47:31 -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