Commit Graph

15090 Commits

Author SHA1 Message Date
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
Oswaldo Acauan
b10d3748a8 Replace JSCS in favor of ESLint 2017-06-02 18:55:23 +00:00
Anton Georgiev
8f2ad070b9 Merge pull request #3966 from JaeeunCho/disappear_dialog
HTML5 - fixed setting's dropdown re-render issue
2017-06-02 11:00:27 -04: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
Anton Georgiev
7c16023c9e Merge pull request #3971 from JaeeunCho/removed_lockedLayout
HTML5 - removed 'lockedLayout' variable
2017-06-01 14:07:42 -04: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
Fred Dixon
bd8d072925 Update README.md 2017-05-27 21:29:57 -04: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
JaeeunCho
d74f573007 Merge remote-tracking branch 'upstream/master' into disappear_dialog 2017-05-24 15:32:38 -07:00
Anton Georgiev
6df3eb2afe Merge pull request #3940 from JaeeunCho/hidden_closedCaption
HTML5 - fixed closed-caption display
2017-05-24 15:57:58 -04:00
JaeeunCho
de89b9760a Merge remote-tracking branch 'upstream/master' into disappear_dialog 2017-05-23 09:28:36 -07:00
Fred Dixon
3749e513ce Merge pull request #3963 from ffdixon/fix-ip-detection
Improved the detection if IP addresses in bbb-conf
2017-05-23 11:29:37 -04:00
Fred Dixon
66aa72e1e7 Improved the detection if IP addresses in bbb-conf 2017-05-23 10:29:16 -05: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
Fred Dixon
8096c2e5a2 Merge pull request #3958 from ffdixon/1.1-0-release
Bump version number to 1.1.0
2017-05-22 11:25:06 -04:00
Fred Dixon
eabfd7e862 Bump version number to 1.1.0 2017-05-22 10:23:55 -05:00
Fred Dixon
237c6f8fbc Update BigBlueButton.html 2017-05-20 12:33:42 -04:00
KDSBrowne
ff1a152f0b remove new lines being rendered in log/development.log 2017-05-19 09:05:09 -07:00
Jesus Federico
4c2df2e529 Merge pull request #3955 from jfederico/bbb-web
bbb-web: Fixed issue in getRecordings not responding the meetingID co…
2017-05-19 11:21:34 -04:00
jfederico
a4b0cb7436 bbb-web: Fixed issue in getRecordings not responding the meetingID correctly 2017-05-19 15:11:08 +00:00
KDSBrowne
beddf61532 remove new operator 2017-05-19 07:25:24 -07:00
Anton Georgiev
bb75ca73e1 Merge pull request #3953 from antobinary/adjust-3934
Revisit pull request #3934
2017-05-19 10:22:55 -04: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
bba5170f43 Merge remote-tracking branch 'upstream/master' into hidden_closedCaption 2017-05-18 12:42:45 -07:00
Chad Pilkey
7a46382e86 Merge pull request #3946 from riadvice/fix-presenter-share-only
Delete the option "presenterShareOnly" in favor of lock settings
2017-05-18 12:29:21 -04:00
Anton Georgiev
409a471ab5 bring catch clause on the same line as closing curly brace 2017-05-18 10:52:59 -04: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
Anton Georgiev
71d4e8b0e0 catch Meteor error on userLeaving 2017-05-17 15:17:27 -04: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
Anton Georgiev
e9eef8119b recover meeting propery needed for lock settings 2017-05-17 11:51:25 -04:00
Anton Georgiev
b4f3c41993 Merge pull request #3951 from KDSBrowne/x0-change-locale-string-format
[HTML5] - Change the format of locale strings
2017-05-17 11:42:39 -04:00
KDSBrowne
a2520dbbbc change format for other locales 2017-05-17 08:35:24 -07:00
Anton Georgiev
a89c70a04c Merge branch 'userlist-accessibility' of github.com:KDSBrowne/bigbluebutton into userlist-accessibility 2017-05-17 11:27:17 -04:00
Anton Georgiev
fc831440c3 Merge pull request #3932 from antobinary/address-error-500-and-stuck-users
HTML5: Auto allow benign actions (logoutSelf); Disallow meteor calls if credentials are null
2017-05-17 11:25:16 -04:00
Anton Georgiev
49a1f09536 minor improve syntax based on review comment 2017-05-17 11:24:12 -04:00
Anton Georgiev
0579506e2e Merge pull request #3944 from Klauswk/FixUnselectableOption
Fix unselectable 'Choose Language' and fallback lang error.
2017-05-17 11:17:38 -04:00