Skip to content
Snippets Groups Projects
Commit 7e396763 authored by gcampes's avatar gcampes
Browse files

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.
  ...
parents b9b23dc8 a39a2cfa
Loading
Showing
with 743 additions and 283 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment