BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
42,268 Commits 13 Branches 260 Tags 1.1 GiB
c49603ff38
Commit Graph

440 Commits

Author SHA1 Message Date
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
Oleksandr Zhurbenko
5b5f06d714 Upgraded Meteor to 1.3.2.4 2016-04-21 14:30:54 -07:00
Maxim Khlobystov
f675681ce4 Set Grunt to rerun the syntax check on any JS/JSX file change. 2016-04-06 10:08:42 -03:00
Maxim Khlobystov
f2dcb7b96c Got rid of unused Grunt plugins. 2016-04-06 10:08:29 -03:00
Maxim Khlobystov
69df37265d Incorporated linting into the build process. 2016-04-06 10:06:08 -03:00
Maxim Khlobystov
30b6a3c5b7 Added lint checking to the HTML5 client. 2016-04-06 10:06:02 -03:00
Maxim Khlobystov
1c311fb9cf Combined two npm configuration files together and put it into the root directory of HTML5 client (required by Meteor to recognize the location of packages installed). 2016-04-06 10:05:52 -03:00
Maxim Khlobystov
65d2c56f8f Added the ability to run Jasmine tests with a single command. 2015-11-21 22:34:58 -08:00
Maxim Khlobystov
5a91abe468 Made Grunt work without additional step of making grunt command recognizable (added grunt-cli to the default installation). 2015-11-21 22:18:33 -08:00
Anton Georgiev
d830e3358d move the HTML5 client code outside of labs 2015-03-05 17:55:23 +00:00