0000000000000000000000000000000000000000 d8a6bdf5bcd4188b4b4477255e7193ceb74b6d6f Matt <administrator@administrators-MacBook-Pro.local> 1392220853 -0500	branch: Created from refs/remotes/origin/users
d8a6bdf5bcd4188b4b4477255e7193ceb74b6d6f de8ce76d7ea144522c22dce689671ab38cf9b745 Matt <administrator@administrators-MacBook-Pro.local> 1392229908 -0500	commit: created add users view and starting creating users in a database
de8ce76d7ea144522c22dce689671ab38cf9b745 034d596f4de989ae8e5618de79011c4273137811 Matt <administrator@administrators-MacBook-Pro.local> 1392328693 -0500	commit: modified passport login to check user against database and started setting up route for invited users to set password
034d596f4de989ae8e5618de79011c4273137811 ac3753939077f6e94139ddac8a1480bfa1ee6cd1 Matt <administrator@administrators-MacBook-Pro.local> 1392740030 -0500	pull: Fast-forward
ac3753939077f6e94139ddac8a1480bfa1ee6cd1 b9f64ea43559540e139d413ff53c60b47e41e1b6 Matt <administrator@administrators-MacBook-Pro.local> 1392752867 -0500	commit: added user manage rights
b9f64ea43559540e139d413ff53c60b47e41e1b6 2828f08dc527b1ebfd917384f2b5f028c2750091 Matt <administrator@administrators-MacBook-Pro.local> 1392753024 -0500	merge reset_password: Merge made by the 'recursive' strategy.
2828f08dc527b1ebfd917384f2b5f028c2750091 7495f1ef176807b9925620ce62d03d23b2e0c719 Matt <administrator@administrators-MacBook-Pro.local> 1392753218 -0500	commit: removed hardcoded email and password
7495f1ef176807b9925620ce62d03d23b2e0c719 5d47285cd55b70382b55924994628438ec864e2a Matt <administrator@administrators-MacBook-Pro.local> 1392754404 -0500	commit: setting up reset password page
5d47285cd55b70382b55924994628438ec864e2a a849f456a0cee9bee1cf5af5852ee27afbe8645c Matt <administrator@administrators-MacBook-Pro.local> 1392754875 -0500	pull: Fast-forward
a849f456a0cee9bee1cf5af5852ee27afbe8645c 6a15b8fd0bf8941ce150a724e419f189ac0187c9 Matt <administrator@administrators-MacBook-Pro.local> 1392760964 -0500	commit: added front end for reset password page
6a15b8fd0bf8941ce150a724e419f189ac0187c9 2c737b9a8e4437019eb4b85d3f62b37e7f980672 Matt <administrator@administrators-MacBook-Pro.local> 1392832490 -0500	commit: made sending email more modular and applicable for setting or resetting password, added config folder with config and repo_path, changed generated password for new users to be empty string
2c737b9a8e4437019eb4b85d3f62b37e7f980672 464e2c2101d9cbb2ec3c80eebb6b5cdfeaff28aa Matt <administrator@administrators-MacBook-Pro.local> 1392833044 -0500	commit: modified gitignore for different location of repo_path file
464e2c2101d9cbb2ec3c80eebb6b5cdfeaff28aa b5c419ea596673e0ee8b9936dd62c9b0fa4cd68a Matt <administrator@administrators-MacBook-Pro.local> 1392833240 -0500	commit: fixing repo_path using my own path
b5c419ea596673e0ee8b9936dd62c9b0fa4cd68a a08a0e0e05be5f09866fb95b876386ee42054054 Matt <administrator@administrators-MacBook-Pro.local> 1392833567 -0500	commit: fixing gitignore with general repo_path
a08a0e0e05be5f09866fb95b876386ee42054054 cda2679e8aff2baa14dd2e0034a8ba3d55aa71aa Matt <administrator@administrators-MacBook-Pro.local> 1392917634 -0500	commit: created seperate function for sending reset email and made email.js modular
cda2679e8aff2baa14dd2e0034a8ba3d55aa71aa a155afb01831b26141d0a783960bdf3eb61f65fa Matt <administrator@administrators-MacBook-Pro.local> 1392918675 -0500	commit: added missing parentheses to email.js and started set password front end
a155afb01831b26141d0a783960bdf3eb61f65fa 3eca5d12b427e90a69d3fa46632afb7b41efe351 Matt <administrator@administrators-MacBook-Pro.local> 1392919494 -0500	commit: cleaned up unused code in email.js and routes/user.js, removed duplicate require in app.js and changed get requests parameters to reflect this change
3eca5d12b427e90a69d3fa46632afb7b41efe351 4a60d5d29b0a43122a041edc213084bd846bee5d Matt <administrator@administrators-MacBook-Pro.local> 1392931076 -0500	commit: set up new password page to save the new pw and create a new reset_hash
4a60d5d29b0a43122a041edc213084bd846bee5d eeff148014857deffd7f8bb4f8ae9e15164e507d Matt <administrator@administrators-MacBook-Pro.local> 1392931082 -0500	pull: Merge made by the 'recursive' strategy.
eeff148014857deffd7f8bb4f8ae9e15164e507d f9b95c2ab472a18ffc0631ac2c5eb03007bf4aa4 Matt <administrator@administrators-MacBook-Pro.local> 1392931466 -0500	commit: removed repo_path.js
f9b95c2ab472a18ffc0631ac2c5eb03007bf4aa4 cabc25c45c0844baee9d8b700c20937bf31a00db Matt <administrator@administrators-MacBook-Pro.local> 1392932423 -0500	commit: began merging adrianne's code, the reset_hash is not being passed into the email when users are added and this will cause an error, NEED TO FIX tomorrow
cabc25c45c0844baee9d8b700c20937bf31a00db 4a12366da28949965e2ff78a3f6f2b3e3599fcc5 Matt <administrator@administrators-MacBook-Pro.local> 1393020203 -0500	commit: added auto login for user after password is reset, added error messages for incorrect input, need to change add user middleware order of events to send mail then add to db if there was no error sending
4a12366da28949965e2ff78a3f6f2b3e3599fcc5 466029e916e2018e3492037eb164878e9387e435 Matt <administrator@administrators-MacBook-Pro.local> 1393357911 -0500	commit: added frontend regex check for valid email address before user is invited
466029e916e2018e3492037eb164878e9387e435 d8bf17f7b07cd8e3d18319a30a4134ba665afbb6 Matt <administrator@administrators-MacBook-Pro.local> 1393360137 -0500	commit: fixed error with adding current creation date to db users
d8bf17f7b07cd8e3d18319a30a4134ba665afbb6 b49f7193ba6f838da7a3200eb71f375fcf9953e7 Matt <administrator@administrators-MacBook-Pro.local> 1393365693 -0500	commit: modified user add and list views to be used ofr both admins and users
b49f7193ba6f838da7a3200eb71f375fcf9953e7 19818b536e5ef58b122c633d33aaf233cb3bfea1 Matt <administrator@administrators-MacBook-Pro.local> 1393439752 -0500	commit: added link timeout for set and reset emails
19818b536e5ef58b122c633d33aaf233cb3bfea1 7bd65b7bb35c0b31d403a21d17fc3f2194442a3e Matt <administrator@administrators-MacBook-Pro.local> 1393538535 -0500	commit: added dropdown selections on list and add pages and set up all different user rights
7bd65b7bb35c0b31d403a21d17fc3f2194442a3e 2e3ece2e3779938e9cf8901146ffac3ae974bfd3 Matt <administrator@administrators-MacBook-Pro.local> 1393614852 -0500	commit: fixed drop down selection on list page to keep selected item when form is submitted
2e3ece2e3779938e9cf8901146ffac3ae974bfd3 003ccaac8c8fabe19a7d7951c3fb90721c930b92 Matt <administrator@administrators-MacBook-Pro.local> 1393617071 -0500	commit (merge): merged bootstrap -> users
003ccaac8c8fabe19a7d7951c3fb90721c930b92 175be82a33a1f2c5904723e8a498b3d8bc409fe8 Matt <administrator@administrators-MacBook-Pro.local> 1393620590 -0500	commit: fixed layout.ejs to add list and add tabs to the sidebar
175be82a33a1f2c5904723e8a498b3d8bc409fe8 003ccaac8c8fabe19a7d7951c3fb90721c930b92 Matt <administrator@administrators-MacBook-Pro.local> 1393620819 -0500	reset: moving to HEAD^
003ccaac8c8fabe19a7d7951c3fb90721c930b92 54a9fb565203c68dde806244fca3cde13514ca4b Matt <administrator@administrators-MacBook-Pro.local> 1393620861 -0500	commit: fixed layout.ejs to add list and add tabs to the sidebar
