Merge dev to master#13
Open
benadamstyles wants to merge 76 commits into
Open
Conversation
# Conflicts: # .eslintrc.json # client/src/index.js # package.json
Responsive footer images
Fix/user authentication
api/userauth is divided into /login and /signup
lydiahallie
approved these changes
Sep 10, 2018
Should be enforced according to the airbnb styleguide: https://github.com/airbnb/javascript#whitespace--max-len
Extend eslintrc with prettier
req.user set using a custom callback for authentication in passportjs
Feature/connect graphql
… hover from border to outline
…der so it does not appear behind other elements on the page
Codebuddy responsive changes
Removed webpack due to conflic with react-scripts-ts node-sass-chokidar added for compiling .sass files to css and updated import to main.css
Fix/cleanup
railway-app
Bot
temporarily deployed
to
charming-manifestation / production
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
8 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.