BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,692 Commits 13 Branches 260 Tags 1.1 GiB
4fe5a074df
Commit Graph

16692 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Klaus Klein
f135dbd129 Add check to undefined role 2017-06-07 10:02:31 -03:00
Ghazi Triki
08cb77c604 Merge remote-tracking branch 'bigbluebutton/bbb-2x-mconf' into flex4-mx 
# Conflicts:
#	bigbluebutton-client/build.xml
 2017-06-07 10:16:35 +01:00
KDSBrowne
cf9d2d16e1 remove null values being announced by NVDA 2017-06-06 17:56:50 -07:00
Chad Pilkey
c46f5f8a17 Add instructions for stopping akka apps 2017-06-06 18:18:33 -04:00
Richard Alam
2989e1a694 - create classes for messages in flash client 2017-06-06 15:14:34 -07:00
Oleksandr Zhurbenko
4dbf02a344 Fixed a bug with the switches ref 2017-06-06 14:55:46 -07:00
Richard Alam
5ef4dd9e88 - change how we deserialize message so we can log errors 
- add helper methods to add routing info for messages
 - add a way to deserialize message from client
 2017-06-06 14:25:40 -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
Chad Pilkey
ef8ff6f1b4 add a name next to the whiteboard cursor for clarity 2017-06-05 18:56:10 -04:00
Chad Pilkey
16da46d717 avoid divide by zero case in cursor listener 2017-06-05 18:55:17 -04:00
Chad Pilkey
0913d18661 reset cursor in whiteboard canvas when the canvas is disabled 2017-06-05 18:54:05 -04:00
Richard Alam
6f8f821beb Merge pull request #3983 from antobinary/2.0 
Drop requirement for session[sessionToken]Send sessionToken in enterAPI redirect=false
 2017-06-05 18:37:51 -04:00
Richard Alam
2714e2c805 Merge pull request #3994 from capilkey/fix-whiteboard-IME 
Enable IME for text tool's basic TextField - fixes #2678
 2017-06-05 18:37:32 -04:00
Chad Pilkey
5f34a359c5 Enable IME for text tool's basic TextField - fixes #2678 2017-06-05 18:22:40 -04: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
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
Richard Alam
16f67377e5 Merge pull request #3991 from ritzalam/move-java-classes-from-bbb-web-to-bbb-common-web 
Add instructions on how to convert old message to new message
 2017-06-05 10:39:49 -04:00
Richard Alam
561c5d88e5 - add instructions on how to convert old message to new message 2017-06-05 07:36:55 -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
Richard Alam
61a1734efb Merge pull request #3982 from ritzalam/move-java-classes-from-bbb-web-to-bbb-common-web 
Merging new way of sending messages
 2017-06-05 09:36:08 -04: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
Ghazi Triki
cd8f09170f Add showWebRTCMOS option. 2017-06-05 13:28:24 +01:00