Commit Graph

55 Commits

Author SHA1 Message Date
Bobak Oftadeh
09147faaac Fixed conflicts after merge 2019-01-03 20:50:43 +00:00
Anton Georgiev
63e2245262 update package-lock.json 2018-12-13 20:35:54 +00:00
KDSBrowne
8b30fe00b3 Merge remote-tracking branch 'Upstream/master' into html5-packages-upgrade 2018-12-10 02:12:42 +00:00
KDSBrowne
5adac9c88b adjust packages / fix bug 2018-12-10 01:08:16 +00:00
Anton Georgiev
69873070b6
Merge pull request #6322 from MaximKhlobystov/html5-tests-v3
Update for the automated tests
2018-12-07 16:46:38 -05:00
KDSBrowne
462f20d9bb Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into html5-packages-upgrade 2018-12-05 20:54:37 +00:00
KDSBrowne
39c75fd449 fix remaining bugs / console errors 2018-12-05 19:31:33 +00:00
João Francisco Siebel
43b44ecc6a Improve user-list-content performance. close #6268 2018-12-04 15:29:40 -02:00
Maxim Khlobystov
34c2ab3b74 Remove the webdriverio-related code and dependencies, remove package.json from the puppeteer folder 2018-11-30 16:22:58 -05:00
Oswaldo Acauan
a8c1df7f22 Upgrade all npm and meteor packages and fix compatibility issues introduced 2018-11-06 12:59:53 -02:00
Anton Georgiev
4a1de5c924 updated packages to fix vulnerabilities (npm audit) 2018-10-26 14:21:25 +00:00
Anton Georgiev
627972ed02 updated package-lock.json 2018-10-26 14:05:55 +00:00
Anton Georgiev
a5c2ddc602 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into remove-react-router 2018-10-25 17:58:00 +00:00
Oswaldo Acauan
f71d32a464 Move from SCSS variables to CSS custom properties (variables) and add custom parameters for theming/skinning
WIP

wip

wip

format

wip

Move from SCSS variables to CSS custom properties (variables) and add custom parameters for theming/skinning
2018-10-23 14:21:58 -02:00
KDSBrowne
14066b4280 Merge branch 'remove-react-router' of https://github.com/antobinary/bigbluebutton into post-router-style-fix 2018-10-15 14:54:15 +00:00
Anton Georgiev
02905fb90d react-router removed, lots of code commented out, client loads 2018-10-03 16:14:10 +00:00
João Francisco Siebel
296ef8fb88 Merge remote-tracking branch 'upstream/master' into HEAD 2018-09-24 14:46:17 -03:00
João Francisco Siebel
6f8a3fd9cd read settings from ini file 2018-09-18 13:12:16 -03:00
Anton Georgiev
35c0a12373
Merge pull request #6055 from bigbluebutton/v2.0.x-release
Pull V2.0.x release into 2.2 (master) to propagate 2.0 fixes
2018-09-10 15:09:55 -04:00
Anton Georgiev
2330ead2e6 update npm packages to resolve sec vulnerabilities 2018-09-07 19:32:53 +00:00
Anton Georgiev
7a23aa40a1 make devDependency npm packages full depencencies (needed in production) 2018-09-07 18:03:18 +00:00
Tainan Felipe
ece61e9918
Merge branch 'master' into compability-to-npm 2018-08-02 17:27:23 -03:00
Tainan Felipe
db2b5ec05c use stable version the reconnecting-websocket package 2018-08-02 17:15:19 -03:00
Tainan Felipe
0c2866ccfb move ReconnectingWebSocket to npm packages 2018-07-27 17:42:45 -03:00
Tainan Felipe
6bfcad0438 Remove unused npm packages and update npm packages for fix vulnerabilities in dependencies 2018-07-26 14:42:01 -03:00
Anton Georgiev
cbb4bbc2fc
Fixed missed unmerged code from #5808 2018-07-23 10:40:54 -04:00
Bobak Oftadeh
bc3e068e2e Client logger implemented 2018-07-04 14:02:10 -07:00
Bobak Oftadeh
5ee63a2aef Fixed Package conflicts 2018-06-25 10:01:34 -07:00
Bobak Oftadeh
c3bc5cb67f Passed Android check through container 2018-06-21 09:19:42 -07:00
Bobak Oftadeh
812e3f765a Use of apackage to detect device type 2018-06-19 10:58:20 -07:00
KDSBrowne
4fa9e745b2 Merge remote-tracking branch 'upstream/v2.0.x-release' into xx.add.Edge-support-html5 2018-06-13 16:30:14 +00:00
KDSBrowne
c030070e28 remove package not being used 2018-06-07 23:40:06 +00:00
KDSBrowne
b8e9f325e2 Merge branch '01.rework-edge-support' into xx.add.Edge-support-html5 2018-06-07 21:36:55 +00:00
KDSBrowne
41ecfd72ec adds and impliments react-render-in-browser package 2018-06-07 20:00:29 +00:00
KDSBrowne
addcb86b12 add browser/os class to <body> / center indicator icons in edge 2018-06-07 17:51:00 +00:00
Anton Georgiev
a77ee38741 make breakout url for html5 and use it 2018-06-07 15:59:06 +00:00
KDSBrowne
8658346b4e add re-resizable package 2018-04-28 10:48:33 -07:00
KDSBrowne
dbe7814f3a adds the makeup-screenreader-trap package 2018-04-23 18:56:49 -07:00
Anton Georgiev
9e05f346c7 added daily log rotation in production env 2018-01-29 16:50:32 -05:00
Oleksandr Zhurbenko
ce1f40ac9a Updated Meteor to 1.6.0.1 2018-01-07 22:17:18 -08:00
Joao Siebel
056dc4051d Add tooltip feature for buttons without label 2017-12-04 17:43:08 -02:00
Oleksandr Zhurbenko
e883995379 Breaking proptypes validation, sorry, any questions to @oswaldoacauan 2017-11-01 13:11:35 -07:00
Oleksandr Zhurbenko
3dd92d94a9 Update 2017-10-30 13:20:55 -07:00
Oleksandr Zhurbenko
6dabe055d8 bug fixes; CSS animation package update; updated package-lock; fixed permissions; 2017-10-25 16:11:06 -07:00
Oswaldo Acauan
317335d359 Revert caret for the react-tostify package 2017-10-18 17:38:53 -02:00
Anton Georgiev
dbd00f3445 Revert "[HTML5 2.0] Presentation Manager" 2017-09-29 11:35:05 -04:00
Oswaldo Acauan
6070a4ea25 Merge remote-tracking branch 'upstream/bbb-2x-mconf' into presentation-uploader-2x 2017-08-31 09:49:59 -03:00
Oswaldo Acauan
096b4d96a5 Update package-lock.json 2017-06-29 13:11:53 -03:00
Oswaldo Acauan
404598d735 Fix conflicts 2017-06-26 20:24:58 +00:00
Oswaldo Acauan
c21abbeb58 Fix merge conflicts 2017-06-13 12:16:58 +00:00