Merge development with master #81
Open
This pull request is big! We’re only showing the most recent 250 commits.
Commits on Aug 11, 2017
-
-
-
-
* add coveralls badge * implement BFA feedback
-
* add coveralls badge * implement BFA feedback * add codeclimate badge. add dist files. update package.json * update readme.md * add test db * add dist/ files * update readme.md
-
* add coveralls badge * implement BFA feedback * add codeclimate badge. add dist files. update package.json * update readme.md * add test db * add dist/ files * update readme.md * update route and middleware
-
* add coveralls badge * implement BFA feedback * add codeclimate badge. add dist files. update package.json * update readme.md * add test db * add dist/ files * update readme.md * update route and middleware * update sequelizerc (#25)
-
* add coveralls badge * implement BFA feedback * add codeclimate badge. add dist files. update package.json * update readme.md * add test db * add dist/ files * update readme.md * update route and middleware * update sequelizerc (#25) * Implement bfa feedback merge (#27) * update sequelizerc * update index.js * Update route index.js
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Commits on Aug 15, 2017
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
* add coveralls badge * implement BFA feedback
-
-
-
* add coveralls badge * implement BFA feedback * add codeclimate badge. add dist files. update package.json * update readme.md * add test db * add dist/ files * update readme.md * update route and middleware * update sequelizerc (#25)
-
* add coveralls badge * implement BFA feedback * add codeclimate badge. add dist files. update package.json * update readme.md * add test db * add dist/ files * update readme.md * update route and middleware * update sequelizerc (#25) * Implement bfa feedback merge (#27) * update sequelizerc * update index.js * Update route index.js
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Merge pull request #31 from adesege/implement-lf-feedback
Implement lf feedback
-
Merge branch 'test-deploy' of https://github.com/adesege/HelloBooks i…
…nto test-deploy
-
-
-
-
-
Commits on Aug 16, 2017
Commits on Aug 19, 2017
-
-
-
-
-
-
-
-
-
-
-
-
-
-
* update travis.yml file * add scripts in template folder to exclude path * initial commit * add bookcategory controller * add constraint in BookClass.create() method * add bookcategory controller * create bookCategory migration file * create bookCategory model * define bookCategory route * update update() in book category controller * update create() in book controller * update put() in books categories route * add test for books categories * remove dist files * add config.json * update package.json
-
-
-
Merge branch 'development' of https://github.com/adesege/HelloBooks i…
…nto development
-
-
-
-
Commits on Aug 20, 2017
-
-
-
-
* add api versioning * add version number to paths * change quotes to template literal
Commits on Aug 22, 2017
Commits on Aug 29, 2017
-
-
-
-
-
* add api versioning * add version number to paths * change quotes to template literal * setup react * use express as server for react app * add coveralls reporting * update heroku-postbuild script in package.json * remove ruby script in travis.yml file * change version number of jquery and popperjs in package.json * add run build for client app to heroku-postbuild * remove SET in start script * chnage bootstrap version number * write components for all template pages * resolve deployment error on Heroku * integrate signup api with client * delete flashMessage when component will unmount * add confirmPassword in user and admin object in test file
-
Commits on Aug 30, 2017
Commits on Sep 6, 2017
Commits on Sep 10, 2017
-
* add api versioning * add version number to paths * change quotes to template literal * setup react * use express as server for react app * add coveralls reporting * update heroku-postbuild script in package.json * remove ruby script in travis.yml file * change version number of jquery and popperjs in package.json * add run build for client app to heroku-postbuild * remove SET in start script * chnage bootstrap version number * write components for all template pages * resolve deployment error on Heroku * integrate signup api with client * delete flashMessage when component will unmount * add confirmPassword in user and admin object in test file * resolve merge conflict * integrate signin api with react * resolve merge conflict * update hound file * remove 404 middleware from routes * add material ui * display error message in signup component * vertically align input icon * [UNCOMPLETED] integrate books api with react * fetch from remote branch * [UNCOMPLETED] react add books api. [COMPLETED] refactor server test, travis, codeclimate and coveralls * add DS_STORE to gitignore * resolve merge conflict * fix travis before_script block * add build script to travis before_script block * update travis file * add $CODECLIMATE_REPO_TOKEN environment variable * update repo_token * update travis file * update travis file * fix book controller based on houndci review. update eslint config files * ignore all assests files in .eslintignore
Commits on Sep 11, 2017
Commits on Sep 14, 2017
-
* add api versioning * add version number to paths * change quotes to template literal * setup react * use express as server for react app * add coveralls reporting * update heroku-postbuild script in package.json * remove ruby script in travis.yml file * change version number of jquery and popperjs in package.json * add run build for client app to heroku-postbuild * remove SET in start script * chnage bootstrap version number * write components for all template pages * resolve deployment error on Heroku * integrate signup api with client * delete flashMessage when component will unmount * add confirmPassword in user and admin object in test file * resolve merge conflict * integrate signin api with react * resolve merge conflict * update hound file * remove 404 middleware from routes * add material ui * display error message in signup component * vertically align input icon * [UNCOMPLETED] integrate books api with react * fetch from remote branch * [UNCOMPLETED] react add books api. [COMPLETED] refactor server test, travis, codeclimate and coveralls * add DS_STORE to gitignore * resolve merge conflict * fix travis before_script block * add build script to travis before_script block * update travis file * add $CODECLIMATE_REPO_TOKEN environment variable * update repo_token * update travis file * update travis file * fix book controller based on houndci review. update eslint config files * ignore all assests files in .eslintignore * add css and client/node_modules to eslintignore list * add coveralls to coverage script * revert package.json to a previous working state * add get, edit and delete books api with client * fix travis error * change test database parameters * use isEmpty instead of Object.keys() * resolve travis build fail * remove package-lock.json
-
* add api versioning * add version number to paths * change quotes to template literal * setup react * use express as server for react app * add coveralls reporting * update heroku-postbuild script in package.json * remove ruby script in travis.yml file * change version number of jquery and popperjs in package.json * add run build for client app to heroku-postbuild * remove SET in start script * chnage bootstrap version number * write components for all template pages * resolve deployment error on Heroku * integrate signup api with client * delete flashMessage when component will unmount * add confirmPassword in user and admin object in test file * resolve merge conflict * integrate signin api with react * resolve merge conflict * update hound file * remove 404 middleware from routes * add material ui * display error message in signup component * vertically align input icon * [UNCOMPLETED] integrate books api with react * fetch from remote branch * [UNCOMPLETED] react add books api. [COMPLETED] refactor server test, travis, codeclimate and coveralls * add DS_STORE to gitignore * resolve merge conflict * fix travis before_script block * add build script to travis before_script block * update travis file * add $CODECLIMATE_REPO_TOKEN environment variable * update repo_token * update travis file * update travis file * fix book controller based on houndci review. update eslint config files * ignore all assests files in .eslintignore * add css and client/node_modules to eslintignore list * add coveralls to coverage script * revert package.json to a previous working state * add get, edit and delete books api with client * fix travis error * change test database parameters * use isEmpty instead of Object.keys() * resolve travis build fail * remove package-lock.json
-
-
* add api versioning * add version number to paths * change quotes to template literal * setup react * use express as server for react app * add coveralls reporting * update heroku-postbuild script in package.json * remove ruby script in travis.yml file * change version number of jquery and popperjs in package.json * add run build for client app to heroku-postbuild * remove SET in start script * chnage bootstrap version number * write components for all template pages * resolve deployment error on Heroku * integrate signup api with client * delete flashMessage when component will unmount * add confirmPassword in user and admin object in test file * resolve merge conflict * integrate signin api with react * resolve merge conflict * update hound file * remove 404 middleware from routes * add material ui * display error message in signup component * vertically align input icon * [UNCOMPLETED] integrate books api with react * fetch from remote branch * [UNCOMPLETED] react add books api. [COMPLETED] refactor server test, travis, codeclimate and coveralls * add DS_STORE to gitignore * resolve merge conflict * fix travis before_script block * add build script to travis before_script block * update travis file * add $CODECLIMATE_REPO_TOKEN environment variable * update repo_token * update travis file * update travis file * fix book controller based on houndci review. update eslint config files * ignore all assests files in .eslintignore * add css and client/node_modules to eslintignore list * add coveralls to coverage script * revert package.json to a previous working state * add get, edit and delete books api with client * fix travis error * change test database parameters * use isEmpty instead of Object.keys() * resolve travis build fail * remove package-lock.json * remove ** from exclude paths * update codeclimate, coveralls and eslintignore files
Commits on Sep 15, 2017
-
React add borrow book api (#56)
* integrate borrow book api with react redux
Commits on Sep 16, 2017
-
Integrate borrow book and category API with client
* integrate borrow book and category api with client
Commits on Sep 17, 2017
-
Integrate stock manager api with client and increase coveralls coverage
* Integrate stock manager api with client. * Increase coveralls coverage
Commits on Sep 22, 2017
-
* - remove create-react-app - use webpack for bundle files
Commits on Oct 31, 2017
-
chore(implement-lf-feedback): implement LF feedback during code defen…
…ce with Temi Lajumoke
-
chore(implement-lf-feedback): implement LF feedback during code defen…
…ce with Temi Lajumoke
-
Merge branch 'development' of http://github.com/adesege/HelloBooks in…
…to development
Commits on Nov 1, 2017
-
-
* bug(make-test-pass): make test pass on travis
-
Merge branch 'development' of http://github.com/adesege/HelloBooks in…
…to development
Commits on Nov 2, 2017
-
-
-
* feature(social-auth): add facebook and google social login
-
Merge branch 'development' of http://github.com/adesege/HelloBooks in…
…to development
-
-
#152500870 Client reset password
feat(reset-password): reset password on client side
Commits on Nov 3, 2017
-
Merge branch 'development' of http://github.com/adesege/HelloBooks in…
…to development
Commits on Nov 5, 2017
-
Chore/152535776/refactor server test (#67)
* chore(server-test): refactor server test to separate folders
Commits on Nov 6, 2017
-
Merge branch 'development' of http://github.com/adesege/HelloBooks in…
…to development
-
#152593317 Refactor readme documentation (#68)
* chore(reactor-readme): implement LF feedback by refactoring readme file
Commits on Nov 10, 2017
-
#152768727 Refactor server side api versioning (#69)
* chore(implement-lf-feedback): implement LF feedback during code defence with Temi Lajumoke * bug(make-test-pass): make test pass on travis * feature(social-auth): add facebook and google social login * bug(bug-fix): change the order of users migration files * feat(reset-password): reset password on client side * chore(server-test): refactor server test to separate folders * chore(reactor-readme): implement LF feedback by refactoring readme file * chore(server): refactor server side to use express-api-versioning to dynamically route between different api versions
Commits on Nov 16, 2017
-
#152768199 Stabilize base app (#70)
* chore(implement-lf-feedback): implement LF feedback during code defence with Temi Lajumoke * bug(make-test-pass): make test pass on travis * feature(social-auth): add facebook and google social login * bug(bug-fix): change the order of users migration files * feat(reset-password): reset password on client side * chore(server-test): refactor server test to separate folders * chore(reactor-readme): implement LF feedback by refactoring readme file * chore(server): refactor server side to use express-api-versioning to dynamically route between different api versions * chore(stabilize-base-application): stabilize base application for deployment on Heroku - remove jquery dependency - remove client build from VC - add env.sample files to client and server applications - rename folders to follow airbnb style guide - make client app build on Heroku - remove extraneous dependecies in client app - add disqus for reviewing a book - add webpack alias for eslint
-
Merge branch 'development' of http://github.com/adesege/HelloBooks in…
…to development
-
chore(client-validation): add client side validation to sigin, signup…
… and add category forms
-
#152917456 Client validation forms (#71)
* chore(implement-lf-feedback): implement LF feedback during code defence with Temi Lajumoke * bug(make-test-pass): make test pass on travis * feature(social-auth): add facebook and google social login * bug(bug-fix): change the order of users migration files * feat(reset-password): reset password on client side * chore(server-test): refactor server test to separate folders * chore(client-validation): add client side validation to sigin, signup and add category forms
Commits on Nov 18, 2017
-
#152991073 Users can't add book (#72)
* chore(implement-lf-feedback): implement LF feedback during code defence with Temi Lajumoke * bug(make-test-pass): make test pass on travis * feature(social-auth): add facebook and google social login * bug(bug-fix): change the order of users migration files * feat(reset-password): reset password on client side * chore(server-test): refactor server test to separate folders * chore(client-validation): add client side validation to sigin, signup and add category forms * bug(bug-fix): fix bug that doesn't allow users add a book in production
-
Merge branch 'development' of http://github.com/adesege/HelloBooks in…
…to development
Commits on Nov 19, 2017
-
#152991945 Refactor add book error handling (#73)
* chore(implement-lf-feedback): implement LF feedback during code defence with Temi Lajumoke * bug(make-test-pass): make test pass on travis * feature(social-auth): add facebook and google social login * bug(bug-fix): change the order of users migration files * feat(reset-password): reset password on client side * chore(server-test): refactor server test to separate folders * chore(client-validation): add client side validation to sigin, signup and add category forms * bug(bug-fix): fix bug that doesn't allow users add a book in production * bug(bug-fix): refactor error handling when book can't be added - add page loader - remove documentPath from book validation - remove extraneous dependencies in client
-
Merge branch 'development' of http://github.com/adesege/HelloBooks in…
…to development
-
Commits on Nov 23, 2017
Commits on Nov 24, 2017
-
feature(notifications): add admin notifications when user borrows and…
… returns a book (#74)
-
Merge branch 'development' of http://github.com/adesege/HelloBooks in…
…to development
Commits on Nov 26, 2017
Commits on Dec 11, 2017
-
-
-
Merge branch 'development' of http://github.com/adesege/HelloBooks in…
…to development
Commits on Jan 8, 2018
-
chore(refactor-server-test): refactor server test naming convention
- rename server controller and model file naming convention - rewrite the way errors are sent in server - test actual values in server test
-
chore(refactor-api-documentation): use slate for api documentation
- fix user should be able to change password feeature - refactor readme documentation - remove multiple eslint config files - fix restart dyno issues in production - add JSDOC documentation to server and client side code
-
chore(jsdoc-tags-description): add description to jsdoc tags
- change `data` variable name - add error boundary to resolve component errors in production
-
chore(api-documentation): refactor documentation to mirror actual res…
…ponse from the server
-
-
chore: fix admin logout when updating book
- account for potential errors by adding catch callbacks to some model calls - change error messages to be more descriptive - use approprite status code in user controller - fix uneven background height on different viewport
-
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.