BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,667 Commits 13 Branches 260 Tags 1.1 GiB
8a97afb89e
Commit Graph

11667 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oleksandr Zhurbenko
8a97afb89e Removed code and files which are not used anymore 2016-04-22 15:09:46 -07:00
Oleksandr Zhurbenko
22eb834d95 Returned tooltips 2016-04-22 14:57:06 -07:00
Oleksandr Zhurbenko
046c9d376b Partially adopted Meteor's recommended file structure 2016-04-22 14:19:20 -07:00
Oleksandr Zhurbenko
5b5f06d714 Upgraded Meteor to 1.3.2.4 2016-04-21 14:30:54 -07:00
Oleksandr Zhurbenko
6cd0de19f9 Added necessary imports and temporary styling to make it all work after the merge 2016-04-21 12:21:01 -07:00
Oleksandr Zhurbenko
92d262a104 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into meteor-react 
Conflicts:
	bigbluebutton-html5/.meteor/packages
	bigbluebutton-html5/app/.meteor/versions
	bigbluebutton-html5/app/client/main.js
	bigbluebutton-html5/app/client/main.jsx
	bigbluebutton-html5/client/globals.js
	bigbluebutton-html5/client/main.jsx
	bigbluebutton-html5/client/views/chat/chat_bar.html
	bigbluebutton-html5/client/views/chat/chat_bar.js
	bigbluebutton-html5/client/views/whiteboard/slide.js
	bigbluebutton-html5/client/views/whiteboard/whiteboard.js
	bigbluebutton-html5/server/collection_methods/shapes.js
	bigbluebutton-html5/server/redispubsub.js
	bigbluebutton-html5/server/server.js
 2016-04-20 16:09:47 -07:00
Oleksandr Zhurbenko
c796180e24 Commented out unused whiteboard code(temporarily before removing completely) 2016-04-20 10:52:47 -07:00
Oleksandr Zhurbenko
b3512d0a42 Wrapped header, whiteboard and chat into the MainContainer and injected in into the 'main' 2016-04-20 10:43:02 -07:00
Oleksandr Zhurbenko
ecf92afeb4 Commented out annecessary helpers (temporarily before removing) and changed scaleWhiteboard func so that is could work with Whiteboard.jsx 2016-04-20 10:33:36 -07:00
Oleksandr Zhurbenko
34d1a02484 Added a classnames package 2016-04-20 10:32:02 -07:00
Oleksandr Zhurbenko
29a4b8db20 Added an additional check for Polling 2016-04-20 09:08:23 -07:00
Oleksandr Zhurbenko
af09761048 Fixed return statement, added scaling, added dynamic class change for the polling and presenter controls 2016-04-19 16:49:24 -07:00
Oleksandr Zhurbenko
90680f31ef class -> className 2016-04-19 16:44:01 -07:00
Oleksandr Zhurbenko
9305da4a26 Fixed Raise Hand Button's view 2016-04-19 08:44:32 -07:00
Oleksandr Zhurbenko
7c698eab3f Fixed a reactive chat update when a chat opponent disappears 2016-04-18 15:59:22 -07:00
Oleksandr Zhurbenko
c5717e9ea3 Cleanup 2016-04-13 15:01:34 -07:00
Oleksandr Zhurbenko
f5b3ffbaa3 Ported Whiteboard template to React 2016-04-13 15:01:06 -07:00
Oleksandr Zhurbenko
3c3a7d061f Switched header template to React 2016-04-13 14:56:25 -07:00
Anton Georgiev
4f8b816b3e Merge pull request #3079 from iMDT/react-user-list 
Adds react user-list and meteor 1.3beta to the html5 client
 2016-04-12 12:08:43 -04:00
Fred Dixon
af5c97e159 Merge pull request #3080 from ritzalam/update-locales-apr-6-2016 
Updating locales
 2016-04-06 15:04:05 -04:00
Richard Alam
b0d6cf51ef Updating locales 
Update locales as of Apr 6, 2016
 2016-04-06 18:59:41 +00:00
gcampes
7e39676392 Merge remote-tracking branch 'origin/react-userlist' into react-user-list 
* origin/react-userlist: (60 commits)
  Fix user-list fade-in animation on mobile
  Fix an issue with the emoji status resulted from the last merge
  Adds emoji status icons to the react user list component
  Set Grunt to rerun the syntax check on any JS/JSX file change.
  Cleaning up.
  Updated the instructions on running Grunt.
  Got rid of unused Grunt plugins.
  Got the old start script back to allow the way to run Meteor outside the build process.
  Removed unused configuration files left by Meteor and Meteorite, as well as the old start script.
  Autofixed most of the linter warnings related to the Airbnb JavaScript Style Guide.
  Added an option to autofix linter warnings (where possible) on build.
  Incorporated linting into the build process.
  Added lint checking to the HTML5 client.
  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).
  Change how proptype is imported in react components
  Remove .jshintrc file
  Update README.md
  Move user-list's data fetching and actions to a separate file
  Change user-list to import and export rather than having everything global
  Upgraded to Meteor 1.3 Beta and replaced the Atmosphere's Classnames package with its npm analogue.
  ...
 2016-04-06 10:31:54 -03:00
gcampes
a39a2cfac1 Fix user-list fade-in animation on mobile 2016-04-06 10:09:10 -03:00
gcampes
0777bc7cb6 Fix an issue with the emoji status resulted from the last merge 2016-04-06 10:09:04 -03:00
gcampes
126b28d432 Adds emoji status icons to the react user list component 2016-04-06 10:08:52 -03: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
755c564efa Cleaning up. 2016-04-06 10:08:38 -03:00
Maxim Khlobystov
0cceeee8c2 Updated the instructions on running Grunt. 2016-04-06 10:08:33 -03:00
Maxim Khlobystov
f2dcb7b96c Got rid of unused Grunt plugins. 2016-04-06 10:08:29 -03:00
Maxim Khlobystov
32a84adc7a Got the old start script back to allow the way to run Meteor outside the build process. 2016-04-06 10:08:24 -03:00
Maxim Khlobystov
7131115746 Removed unused configuration files left by Meteor and Meteorite, as well as the old start script. 2016-04-06 10:08:20 -03:00
Maxim Khlobystov
76aa113dda Autofixed most of the linter warnings related to the Airbnb JavaScript Style Guide. 
Conflicts:
	bigbluebutton-html5/client/globals.js
	bigbluebutton-html5/client/views/whiteboard/whiteboard.js
	bigbluebutton-html5/server/collection_methods/users.js
	bigbluebutton-html5/server/server.js
 2016-04-06 10:08:08 -03:00
Maxim Khlobystov
a01ee713ed Added an option to autofix linter warnings (where possible) on build. 2016-04-06 10:06:13 -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
gcampes
c8be1b103e Change how proptype is imported in react components 2016-04-06 10:05:46 -03:00
gcampes
91bad29ceb Remove .jshintrc file 2016-04-06 10:05:31 -03:00
Gabriel Carvalho de Campes
96eca4cf1f Update README.md 2016-04-06 10:05:26 -03:00
gcampes
97cd032833 Move user-list's data fetching and actions to a separate file 2016-04-06 10:05:22 -03:00
gcampes
d2455d43d6 Change user-list to import and export rather than having everything global 2016-04-06 10:05:17 -03:00
Maxim Khlobystov
a2a902bfa8 Upgraded to Meteor 1.3 Beta and replaced the Atmosphere's Classnames package with its npm analogue. 2016-04-06 10:05:07 -03:00
Gabriel Carvalho de Campes
e445fb4b94 Update README.md 2016-04-06 10:05:00 -03:00
gcampes
a10280c3b5 Solve rendering issue 2016-04-06 10:04:55 -03:00
gcampes
8ca2e8837a Change user list css 2016-04-06 10:04:37 -03:00
Oswaldo Acauan
41efd5b5ff Update README from UserList 2016-04-06 10:04:32 -03:00
Oswaldo Acauan
cc435eb424 Fix user-list sharing status list 2016-04-06 10:04:22 -03:00
Oswaldo Acauan
4174a59b2f Fix user-list unread badge styles 
Conflicts:
	bigbluebutton-html5/app/client/react/components/UserList/UserListItem.jsx
 2016-04-06 10:04:09 -03:00
Oswaldo Acauan
1e61823fb9 Change user-list to a tabular markup 
Conflicts:
	bigbluebutton-html5/app/client/react/components/UserList/UserItem.jsx
 2016-04-06 10:00:40 -03:00
gcampes
a0c54d63dc Update react UserList readme 2016-04-06 10:00:08 -03:00