BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
38,296 Commits 13 Branches 260 Tags 1.1 GiB
72c995fc95
Commit Graph

359 Commits

Author SHA1 Message Date
Tainan Felipe
b451ce24f8 Implements the virtualizes list for userlist 2020-03-25 08:30:08 -03:00
Chad Pilkey
431f9a67b6
Merge pull request #8720 from antobinary/smaller-license-commit 
Add license and copyright info for HTML5 client
 2020-03-06 11:38:17 -05:00
Anton Georgiev
262e2fb0c6 add license and copyright info for HTML5 client 2020-03-06 11:27:45 -05:00
Anton Georgiev
d36c545706 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merging 2020-03-04 23:41:18 +00:00
Anton Georgiev
8129468300 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merging 2020-03-04 23:36:21 +00:00
Chad Pilkey
163026ebff
Merge pull request #8680 from antobinary/remove-history-package 
Remove unused package "history"
 2020-02-28 19:46:40 -05:00
Anton Georgiev
f356a530e9 remove unused package "history" 2020-02-28 14:23:09 -05:00
Maxim Khlobystov
42a263b583 Removed babel-plugin-react-remove-properties to keep data-test attributes in production 2020-02-26 16:07:59 -05:00
Anton Georgiev
36a7536ca0 bump up node-sass to 4.13.1 as part of npm audit 2020-02-26 14:57:55 -05:00
Maxim Khlobystov
7518b4cd99 Make the Puppeteer tests work with master branch 2020-01-28 14:25:27 -05:00
Anton Georgiev
ecacd176aa
Merge pull request #8522 from capilkey/virtualized-chat 
Virtualized chat
 2020-01-22 11:28:52 -05:00
Anton Georgiev
f3c89f84fd bump up node-sass version via npm audit fix 2020-01-17 17:40:02 +00:00
Vitor Mateus
1f27b9760e Merge remote-tracking branch 'upstream/master' into issue-8504 2020-01-17 10:25:44 -03:00
Vitor Mateus
9676bbc434 Merge remote-tracking branch 'upstream/master' into issue-7850-2 2020-01-13 16:36:02 -03:00
Vitor Mateus
cc943498e2 Fix check if is mobile to disable draggable 2020-01-10 17:20:26 -03:00
Anton Georgiev
9b7a3f2fac update npm packages to latest - tippy, babel/runtime etc 2020-01-09 19:30:45 +00:00
Anton Georgiev
b802a4563e webdriver* and wdio* packages are not node12 ready 2020-01-07 14:58:15 +00:00
Tainan Felipe
45307c9fc9 Merge remote-tracking branch 'upstream/master' into issue-8120 2019-12-05 18:23:08 -03:00
Anton Georgiev
f4d4838949
Merge pull request #8396 from KDSBrowne/tooltip-update 
Fix tool-tips after tippy.js update to 5.1.1
 2019-12-05 11:56:07 -05:00
Anton Georgiev
62bda69d84 update package fibers to 4.0.1 to work with node12 2019-12-04 21:50:57 +00:00
Anton Georgiev
689427b092 commented out memwatch usage - not supported on node12 2019-12-03 20:26:45 +00:00
Anton Georgiev
371456d147 meteor npm update 2019-12-03 20:07:39 +00:00
KDSBrowne
7c253dda0f fix tooltips after tippy.js update 5.1.1 2019-12-03 18:49:09 +00:00
Tainan Felipe
441605d0da Merge remote-tracking branch 'upstream/master' into issue-8120 2019-11-12 09:53:56 -03:00
Tainan Felipe
3798817110 Virtualized list for the chat 2019-11-01 17:38:14 -03:00
Tiago Daniel Jacobs
d49578342d Add script to start meteor using external mongo (from packaging) instead of embeded mongo 2019-10-12 19:51:20 -03:00
Joao Siebel
35061811b7 Add heapdump dependecy 2019-09-24 17:09:56 -03:00
Anton Georgiev
620fe746da
Merge pull request #8098 from antobinary/external-video-player 
Use react-player for external video playback and add arc player support
 2019-09-12 08:18:17 -04:00
Anton Georgiev
43c0670ed8 Merge branch 'new-arc-player' of github.com:lfzawacki/bigbluebutton into external-video-player 2019-09-10 16:35:50 -04:00
Chad Pilkey
2d12b01fef
Merge pull request #8084 from antobinary/memory-usage 
Add monitor for memory usage in nodejs html5
 2019-09-09 16:37:00 -04:00
Anton Georgiev
f0a35a7381 add monitor for memory usage in nodejs html5 2019-09-09 14:45:54 -04:00
Chad Pilkey
872681a699 improve chat rendering performance and rework read message detection 2019-09-09 17:08:36 +00:00
Maxim Khlobystov
d0fda1e3c7 New way for tests to login 2019-08-28 15:13:00 -04:00
Lucas Zawacki
546f4cdac5 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into new-arc-player 2019-08-27 15:09:40 -03:00
Anton Georgiev
471cf27712 update npm dependencies 2019-07-19 21:09:32 +00:00
Lucas Zawacki
3a5984de51 Update styles and packages for external video 2019-07-16 17:56:07 -03:00
Lucas Zawacki
a2068d06b6 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into new-react-player 2019-07-16 17:33:27 -03:00
KDSBrowne
741728e09e update lodash / npm audit fix 2019-07-15 03:45:13 +00:00
Lucas Fialho Zawacki
e98333c45e Use react-player for external video 2019-07-12 20:08:55 +00:00
Maxim Khlobystov
b1cd809948 Update for the WebdriverIO tests 2019-06-21 16:11:05 -04:00
Maxim Khlobystov
34eef01460 Update browser-bunyan and enable flushOnClose 2019-06-21 14:21:22 -04:00
Anton Georgiev
2c85ff6c65
Merge pull request #7540 from MaximKhlobystov/webdriverio-tests 
WebdriverIO Tests
 2019-06-04 11:10:24 -04:00
Maxim Khlobystov
1eafbf04f8 WebdriverIO tests. 2019-06-04 11:05:27 -04:00
Anton Georgiev
5db7311a07
Merge pull request #6885 from vitormateusalmeida/issue-6724 
Make webcam draggable
 2019-06-03 12:42:42 -04:00
Anton Georgiev
885d432d4b update axios from 0.18 to 0.19 (vuln) 2019-06-03 14:32:04 +00:00
Vitor Mateus
6de7650ec9 Merge remote-tracking branch 'upstream/master' into issue-6724 2019-05-27 19:18:26 -03:00
Vitor Mateus
d1b910a558 Fix errors in grid layout 2019-05-27 19:06:52 -03:00
prlanzarin
ca9a0fad4a Added unified-plan/plan-b translation for Safari endpoints 2019-05-21 16:48:01 +00:00
Pedro Beschorner Marin
9867aa6b78 Shared notes lock settings first commit 2019-05-08 20:36:36 +00:00
Chad Pilkey
0cd79b7c05 move legacy browser versions into settings.yml 2019-05-01 17:33:03 -07:00
Anton Georgiev
83ecc5575f trim whitespace at end of youtube url 2019-05-01 20:09:49 +00:00
Chad Pilkey
098c8ce255 add alternate legacy browser content 2019-04-24 15:12:27 -07:00
Anton Georgiev
c268bed1ab
Revert "Add alternate legacy browser content" 2019-04-24 16:22:19 -04:00
Chad Pilkey
99fa3d6bb5 add alternate legacy browser content 2019-04-23 16:10:55 -07:00
Vitor Mateus
90290c6b67 Merge remote-tracking branch 'upstream/master' into issue-6724 2019-03-22 17:54:23 -03:00
Anton Georgiev
20c131438b updated version of react-color (npm audit) 2019-03-08 17:36:31 +00:00
Vitor Mateus
e1616c0a3b Make sigle webcam draggable #6724 2019-02-28 18:39:57 -03:00
Anton Georgiev
597ea5f557
Merge branch 'master' into update-packages 2019-02-14 16:58:04 -05:00
Anton Georgiev
dcabfe1dc1 meteor seems to find core-js in 1.8 2019-02-14 20:43:16 +00:00
Anton Georgiev
4b18d50b42 update npm packages versions 2019-02-13 19:44:21 +00:00
KDSBrowne
f176d47f1b prevent SR from announcing btn labels twice 2019-01-30 16:07:39 +00:00
Lucas Zawacki
3c75690d8c Let's try vimeo 2019-01-18 10:34:03 -03:00
Lucas Zawacki
550bbcd492 Share synchronized youtube video in presentation area 2019-01-14 14:40:27 -03:00
KDSBrowne
5adac9c88b adjust packages / fix bug 2018-12-10 01:08:16 +00:00
KDSBrowne
462f20d9bb Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into html5-packages-upgrade 2018-12-05 20:54:37 +00:00
Maxim Khlobystov
4b5193fa65 Moving tests-related dependencies to the main package.json 2018-11-22 13:22:52 -05:00
Oswaldo Acauan
44c7e5c10a Fix husky pre-commit 2018-11-06 16:49:27 -02: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
8dfdaa0f29 added "repository" to package.json 2018-10-26 14:35:42 +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
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
Maxim Khlobystov
0568a01692
Merge pull request #4923 from MaximKhlobystov/selenium-visual-regression 
[HTML5 Client] Initial Visual Regression Tests Setup
 2018-01-23 11:13:54 -05:00
Maxim Khlobystov
75f1992667 Test commands cleanup. 2018-01-16 11:25:04 -05:00
Maxim Khlobystov
65c995339d Added command to regenerate reference screenshots. 2018-01-16 11:21:28 -05:00
Tainan Felipe
18011fe3da Merge remote-tracking branch 'upstream/v2.0.x-release' into fix-language-selector 2018-01-11 10:35:31 -02:00
Maxim Khlobystov
927a2bf005 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into selenium-visual-regression 2018-01-09 15:38:29 -05:00
Maxim Khlobystov
248db82e59 Cleanup + added temporary desktop-only testing command. 2018-01-09 11:36:21 -05:00
Maxim Khlobystov
9ebc82d29f Committing additional test specs. 2018-01-08 21:43:34 -05:00
Maxim Khlobystov
57f2c64ecd Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into selenium-visual-regression 2018-01-08 10:57:19 -05:00
Oleksandr Zhurbenko
ce1f40ac9a Updated Meteor to 1.6.0.1 2018-01-07 22:17:18 -08:00
Oleksandr Zhurbenko
4af6d30f6a Switched from the broken 4commerce:env-settings package to native Meteor.settings 2018-01-07 16:24:05 -08:00
Tainan Felipe
5c5125c7d2 fix issue #4847 2017-12-20 14:56:56 -02:00
Joao Siebel
b03efc021c Remove unused package and fix whiteboard toolbar submenu tooltip 2017-12-07 14:11:34 -02:00
Joao Siebel
056dc4051d Add tooltip feature for buttons without label 2017-12-04 17:43:08 -02:00
Maxim Khlobystov
be6abed94c Introduced the base wdio config file. 2017-12-01 11:35:09 -05:00
Maxim Khlobystov
74f4cd3367 Restructured the testing configs to run 4 browser sessions one after another: desktop Chrome, desktop Firefox, iPhone 6 Plus and Nexus 5X. 2017-11-10 17:21:53 -05:00
Oleksandr Zhurbenko
9934d90fff Integrated babel-plugin-react-remove-properties for Selenium tests 2017-11-04 00:38:44 -07:00
Oleksandr Zhurbenko
716de591ed Integrated webdriver-manager into the testing process 2017-11-03 13:51:14 -07:00
Oleksandr Zhurbenko
f4f3611f73 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into selenium-visual-regression 2017-11-03 10:31:53 -07:00
Oleksandr Zhurbenko
6dabe055d8 bug fixes; CSS animation package update; updated package-lock; fixed permissions; 2017-10-25 16:11:06 -07:00
Oleksandr Zhurbenko
368bba4e43 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into meteor-react-16-update 2017-10-24 16:14:36 -07:00
Oleksandr Zhurbenko
abdd6a0c14 Fixed 'lint-staged' warning 
Which was probably introduced in the latest major release
 2017-10-23 17:20:57 -07:00
Oleksandr Zhurbenko
92fcc4bc74 Initial packages update 2017-10-23 17:09:40 -07:00
Oswaldo Acauan
317335d359 Revert caret for the react-tostify package 2017-10-18 17:38:53 -02:00
Oswaldo Acauan
c801ad8996 Fix the version of react-toastify util we update to react 16 2017-10-13 15:24:58 -03:00
Oswaldo Acauan
b8261123d0 Add toast notifications 2017-10-12 15:53:33 -03:00
Oswaldo Acauan
230a2d5263 Fix silent changes caused by the old pr revert 2017-10-02 11:12:58 -03:00
Anton Georgiev
dbd00f3445 Revert "[HTML5 2.0] Presentation Manager" 2017-09-29 11:35:05 -04:00
Maxim Khlobystov
ecfed1a728 Initial setup work for visual regression testing. 2017-09-18 21:09:21 -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
716ee5902f Merge remote-tracking branch 'upstream/bbb-2x-mconf' into userlist-2x-design 2017-08-08 11:52:26 -03:00
Oswaldo Acauan
83c117ddde Match user-list with the new styles 2017-07-28 10:43:39 -03:00
Klaus
39288e6e70 Add clear history, copy and save as chat options 2017-07-21 13:27:28 -03:00
Oswaldo Acauan
63522c6a95 Use flat package on mongo upsert 2017-06-29 08:54:19 -03:00
Oswaldo Acauan
404598d735 Fix conflicts 2017-06-26 20:24:58 +00: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
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
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
Oswaldo Acauan
c21abbeb58 Fix merge conflicts 2017-06-13 12:16:58 +00:00
Oswaldo Acauan
5664bf2655 Add missing package and fix bug 2017-06-07 12:52:45 +00:00
Oswaldo Acauan
2b3859d906 Fix linter errors and add missing package 2017-06-07 12:28:41 +00:00
Oswaldo Acauan
ccb6fd2a53 Fix merge conflicts 2017-06-07 12:01:18 +00: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
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
Oswaldo Acauan
f9a2e69e05 Add a hook to run linters agains staged git files 2017-06-05 18:05:46 +00:00
Oswaldo Acauan
60fcd5aab1 Improve lint script 2017-06-05 14:18:06 +00: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
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
25c9f2dde6 Updated main packages 2017-06-03 19:56:07 -07: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
Maxim Khlobystov
5828dcecce Integrate acceptance tests with npm scripts 
This commit adds a special test npm command to be able to run the acceptance tests using npm scripts.
 2017-05-28 04:45:41 +00:00
Maxim Khlobystov
0c41baa439 Setup wdio + Finish the dummy landing page title test 
This commit adds the config file for the wdio test runner. Using the packaged runner instead of the particular Jasmine runner allows us to do the following:
- Use the global browser object (simplifies access to the Selenium methods from any particular assertion)
- Avoid installing Jasmine globally

The dummy landing page title test actually does the job now.
 2017-05-15 01:29:00 +00:00
Maxim Khlobystov
2013109236 Do initial WebdriverIO setup + Add dummy landing page title test 
This commit adds 2 packages:
    - WebdriverIO main package
    - Jasmine integration for WebdriverIO

Dummy landing page spec is created (supposed to test the title, but doesn't actually do that yet). This new spec follows the Page Object pattern.
 2017-05-14 03:52:43 +00:00
Oswaldo Acauan
71fc15a803 Add presenter upload capabilities 2017-05-03 13:36:16 -03:00
Anton Georgiev
2223172612 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into br-kick 2017-03-20 14:44:51 -04:00
Anton Georgiev
6d325297ee remove unused packages 2017-03-20 14:37:55 -04:00
Anton Georgiev
a183595d73 improve check for dismiss object 2017-03-20 14:33:32 -04:00
Oswaldo Acauan
528be3979e Fix merge conflicts 2017-03-13 17:19:43 +00:00
Oswaldo Acauan
9c84105319 Add missing packages 2017-03-10 19:18:23 +00:00
gcampes
b422ab10e9 Merge conflicts 2017-03-09 11:42:31 -03:00
Oleksandr Zhurbenko
bba1d52716 Adjusted history package version to work with the latest react-router 2017-03-02 11:06:51 -08:00
Oleksandr Zhurbenko
6bafa381d6 Updated npm packages to the latest 2017-03-02 10:59:44 -08:00
gcampes
ce703d3b20 First changes to settings 2017-01-27 13:41:11 -02:00
Oleksandr Zhurbenko
8f0d552f4f Finished closed-captions 2016-12-23 00:26:22 -08:00
Oswaldo Acauan
eb6d008e59 Update Meteor and all packages to the lastest releases 2016-12-08 10:29:15 -02:00
Gabriel Carvalho de Campes
85013eac1f Fix issues from merge 2016-11-16 15:44:05 -02:00
Gabriel Carvalho de Campes
dad3c1a4c7 Merge conflicts 2016-11-16 13:35:39 -02:00
Gabriel Carvalho de Campes
a262430871 Add code to handle breakout rooms in html5 2016-11-07 13:52:39 -02:00
Oswaldo Acauan
a76ab6e7e6 Refactor API Slides 2016-10-21 11:41:17 +00:00
Oswaldo Acauan
79cdf636eb Rewrite Redis related classes 2016-10-18 12:03:51 +00:00
Anton Georgiev
27c1896629 Merge branch 'EmojiReworked' of github.com:lajellu/bigbluebutton into merge-pr 2016-09-28 23:47:28 +00:00
Anton Georgiev
3b7db0f81a put hiredis back in dependencies to avoid warning message 2016-09-28 23:29:05 +00:00
Lajellu
c68ad3240d HTML5 - adds Emoji showing up on user list 2016-09-26 13:29:44 -07:00
Anton Georgiev
349b216928 omit hiredis package; cleanup 2016-08-29 21:34:03 +00:00
Laily Ajellu
f0cdbfaf2e Fixed merge conflicts 2016-08-23 16:45:28 -07:00
Oleksandr Zhurbenko
d9ddbfbda6 Cleanup, linting, fixed css modules' imports 2016-08-20 18:14:12 -07:00
Lajellu
19ff007adb Changes logger to NPM package. Makes RedisPubSub and logger run after Meteor.startup 2016-08-19 14:08:46 -07:00
Oleksandr Zhurbenko
d51d0ed3c5 Removed an unused dependency and updated Meteor to 1.4.0.1 2016-08-05 19:03:08 -07:00
Lajellu
219078f49d adds slide controls and new bbb icons 2016-08-02 15:55:20 -07:00
Oleksandr Zhurbenko
d510907179 Upgraded Meteor to 1.4 2016-07-27 14:50:35 -07:00
Oleksandr Zhurbenko
3ecf387297 Updated packages to get rid of warnings in CssTransitionGroup 2016-07-15 16:16:49 -07:00
Oswaldo Acauan
1c0132ed5b Merge after git conflict/lost object 2016-07-11 12:34:58 +00:00
Oleksandr Zhurbenko
e39963d4de Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-react 
Conflicts:
	bigbluebutton-html5/package.json
 2016-06-02 15:20:41 -07:00
Oswaldo Acauan
378c94ce7b Resolve merge conflicts 2016-06-01 13:45:01 -03:00
Oswaldo Acauan
1d8a36564d Add base components and style for Chat 2016-06-01 13:33:19 -03:00
Oleksandr Zhurbenko
ba7cdca648 Added fade in for the slides and a default content 2016-05-30 11:12:02 -07:00
Oleksandr Zhurbenko
50597726d9 Ported changes in addShapeToCollection func and the structure of the text shape obj to the new server side structure 2016-05-26 09:37:54 -07:00
Oleksandr Zhurbenko
1c4c2befb3 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-react 
Conflicts:
	bigbluebutton-html5/Gruntfile.js
	bigbluebutton-html5/client/globals.js
	bigbluebutton-html5/imports/ui/chat/Chat.jsx
	bigbluebutton-html5/imports/ui/chat/ChatInputControls.jsx
	bigbluebutton-html5/imports/ui/chat/PrivateChatToolBar.jsx
	bigbluebutton-html5/imports/ui/shared/Button.jsx
	bigbluebutton-html5/imports/ui/whiteboard/Whiteboard.jsx
	bigbluebutton-html5/package.json
	bigbluebutton-html5/server/collection_methods/shapes.js
	bigbluebutton-html5/server/collection_methods/slides.js
	bigbluebutton-html5/server/server.js
 2016-05-25 15:04:20 -07:00
Oswaldo Acauan
216bfd2ac2 Fix nav-bar userlist toggle icon 2016-05-20 13:39:58 -03:00
Anton Georgiev
dd075faa2e config updates 2016-05-27 14:30:16 -04:00
Oleksandr Zhurbenko
0bfc8ceede Retrieving slide dimensions on the server side 2016-05-13 11:01:29 -07:00
Anton Georgiev
783f150442 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into router-merging 
Conflicts:
	bigbluebutton-html5/imports/startup/client/routes.js
 2016-05-12 18:08:44 +00:00
Anton Georgiev
699fde7344 accommodate for poll and deskshare 2016-05-10 20:25:24 +00:00
Anton Georgiev
bfd4afd07d Users collection now available on client side 2016-05-09 21:19:45 +00:00
Maxim Khlobystov
726015d172 Made sure JSCS only reruns on modified files. 2016-05-05 18:09:13 -04:00
Oswaldo Acauan
ddd38c57ac Add i18n, modular layouts and basic styles 2016-05-03 17:40:46 -03:00
Oswaldo Acauan
01860a8804 Add basic styles for new design 2016-05-02 19:42:54 -03:00
Oswaldo Acauan
7d31eb43f9 Switch from ion-router to react-router 2016-04-28 15:57:14 -04:00
Maxim Khlobystov
2831e3d414 Added CSS modules support and adjusted the userlist to work with encapsulated Sass. 2016-04-27 14:30:45 -04:00