{"push_id":680060698,"size":21,"distinct_size":21,"ref":"refs/heads/master","head":"dc393c21a1ba8ba7f9fc568f1b1f31d2b76d8cba","before":"fa92c3ebb50f53e00d7a6ed686172372d728baad","commits":[{"sha":"17973cabc5a97d77daec435b5ebb4b18feaeaccf","author":{"email":"9630af23e3307aeb879c2e3221748c8fb02454a0@gmail.com","name":"Andrew"},"message":"initial devise setup for login.","distinct":true,"url":"https://api.github.com/repos/kachlikmatt/The-Alumbook/commits/17973cabc5a97d77daec435b5ebb4b18feaeaccf"},{"sha":"6b4c9acfd37c30eca9563ea695d1fec52e3a5669","author":{"email":"6cfe19fe90c218aad9dfc62907636cbe5d92ccb9@gmail.com","name":"Matthew Kachlik"},"message":"Merge pull request #37 from andymfred/devise\n\ninitial devise setup for login.","distinct":true,"url":"https://api.github.com/repos/kachlikmatt/The-Alumbook/commits/6b4c9acfd37c30eca9563ea695d1fec52e3a5669"},{"sha":"859e2e828efd151221b3e995ec79f45230e801d0","author":{"email":"9630af23e3307aeb879c2e3221748c8fb02454a0@gmail.com","name":"Andrew"},"message":"Devise branch in progress","distinct":true,"url":"https://api.github.com/repos/kachlikmatt/The-Alumbook/commits/859e2e828efd151221b3e995ec79f45230e801d0"},{"sha":"1aef9805d7ae5cc7023927573c0b1792f21ad778","author":{"email":"9630af23e3307aeb879c2e3221748c8fb02454a0@gmail.com","name":"Andrew"},"message":"Merge branch 'master' of https://github.com/NCC-Capstone-2015/The-Alumbook into devise\n\nConflicts:\n\tdb/schema.rb","distinct":true,"url":"https://api.github.com/repos/kachlikmatt/The-Alumbook/commits/1aef9805d7ae5cc7023927573c0b1792f21ad778"},{"sha":"6192026e403a4191aece9e5dd9bf4c0a6bb708ea","author":{"email":"9630af23e3307aeb879c2e3221748c8fb02454a0@gmail.com","name":"Andrew Fredrickson"},"message":"Latest devise","distinct":true,"url":"https://api.github.com/repos/kachlikmatt/The-Alumbook/commits/6192026e403a4191aece9e5dd9bf4c0a6bb708ea"},{"sha":"ff779e49b86d517aab9b80241040a94b4f83e816","author":{"email":"9630af23e3307aeb879c2e3221748c8fb02454a0@gmail.com","name":"Andrew"},"message":"Devise Functionality Added:\n\n-Login functionality\n-Logout functionality\n-Changed login screen to use foundation features\n-Changed homepage picture\n-Added authentication on localhost:3000/account_logins for display in presenation\n(will refuse entry and send user to sign in)\n-If signed in, admin navbar shows on homepage, if not student shows(for presentation)","distinct":true,"url":"https://api.github.com/repos/kachlikmatt/The-Alumbook/commits/ff779e49b86d517aab9b80241040a94b4f83e816"},{"sha":"832bce648d6d5fad5297f623bfcc3bbd6bc075cb","author":{"email":"6cfe19fe90c218aad9dfc62907636cbe5d92ccb9@gmail.com","name":"Matthew Kachlik"},"message":"Merge pull request #43 from andymfred/devise\n\nDevise","distinct":true,"url":"https://api.github.com/repos/kachlikmatt/The-Alumbook/commits/832bce648d6d5fad5297f623bfcc3bbd6bc075cb"},{"sha":"b46bb396d8f5686e2702a6c01b574358f4161847","author":{"email":"c3ed461e2b7c2d48becbc430ac14f549a7462ce2@gmail.com","name":"chwinger"},"message":"Added seeds for encrypted passwords","distinct":true,"url":"https://api.github.com/repos/kachlikmatt/The-Alumbook/commits/b46bb396d8f5686e2702a6c01b574358f4161847"},{"sha":"2d3071bf4c555e85b22c371a46dfa0c57f77d847","author":{"email":"6cfe19fe90c218aad9dfc62907636cbe5d92ccb9@gmail.com","name":"Matthew Kachlik"},"message":"Merge pull request #54 from chwinger/devise\n\nAdded seeds for encrypted passwords","distinct":true,"url":"https://api.github.com/repos/kachlikmatt/The-Alumbook/commits/2d3071bf4c555e85b22c371a46dfa0c57f77d847"},{"sha":"74bc2c66acba13f63d74dbd889f445968bd7ebba","author":{"email":"c3ed461e2b7c2d48becbc430ac14f549a7462ce2@gmail.com","name":"chwinger"},"message":"Added seeds for various degree statuses","distinct":true,"url":"https://api.github.com/repos/kachlikmatt/The-Alumbook/commits/74bc2c66acba13f63d74dbd889f445968bd7ebba"},{"sha":"ead7d1109dfc012953e1d5e8ea8eb848b053ff79","author":{"email":"6cfe19fe90c218aad9dfc62907636cbe5d92ccb9@gmail.com","name":"Matthew Kachlik"},"message":"Merge pull request #56 from chwinger/master\n\nAdded seeds for various degree statuses","distinct":true,"url":"https://api.github.com/repos/kachlikmatt/The-Alumbook/commits/ead7d1109dfc012953e1d5e8ea8eb848b053ff79"},{"sha":"dbc2e4e4ab08438e8566703018dab4a510ad02a9","author":{"email":"c3ed461e2b7c2d48becbc430ac14f549a7462ce2@gmail.com","name":"chwinger"},"message":"Login working correctly, encrypted password was seeded incorrectly","distinct":true,"url":"https://api.github.com/repos/kachlikmatt/The-Alumbook/commits/dbc2e4e4ab08438e8566703018dab4a510ad02a9"},{"sha":"f0b91bc916b3d582ba5ca2c5b94380711009c51e","author":{"email":"6cfe19fe90c218aad9dfc62907636cbe5d92ccb9@gmail.com","name":"Matthew Kachlik"},"message":"Merge pull request #57 from chwinger/devise\n\nLogin working correctly, encrypted password was seeded incorrectly","distinct":true,"url":"https://api.github.com/repos/kachlikmatt/The-Alumbook/commits/f0b91bc916b3d582ba5ca2c5b94380711009c51e"},{"sha":"ac4fed24223d4577caf3929f837ae8dd319ce188","author":{"email":"c3ed461e2b7c2d48becbc430ac14f549a7462ce2@gmail.com","name":"chwinger"},"message":"Added NCCid and program to users and the proper seeds","distinct":true,"url":"https://api.github.com/repos/kachlikmatt/The-Alumbook/commits/ac4fed24223d4577caf3929f837ae8dd319ce188"},{"sha":"a28d28cb0fd4d5e46172e39418d50b6ff3669cd8","author":{"email":"6cfe19fe90c218aad9dfc62907636cbe5d92ccb9@gmail.com","name":"Matthew Kachlik"},"message":"Merge pull request #58 from chwinger/master\n\nAdded NCCid and program to users and the proper seeds","distinct":true,"url":"https://api.github.com/repos/kachlikmatt/The-Alumbook/commits/a28d28cb0fd4d5e46172e39418d50b6ff3669cd8"},{"sha":"c064b8b5b375636fdbbaafcad780f47a97e1bbb0","author":{"email":"a460f001955e9bff1c870ec93a4feedad5f4ebdc@live.com","name":"Cornelius Donley"},"message":"Merge branch 'master' of https://github.com/NCC-Capstone-2015/The-Alumbook into devise\n\n# By Cornelius Donley (5) and others\n# Via Matthew Kachlik (13) and others\n* 'master' of https://github.com/NCC-Capstone-2015/The-Alumbook:\n  Added NCCid and program to users and the proper seeds\n  Added seeds for various degree statuses\n  implemented basic search and improved functionality of advanced search\n  Seeded a sample survey\n  Removed unneeded folders and files for reports. Created other report partials. Removed dropdown option for Surveys link on navigation bar (since there were no options).\n  Actually fixed the javascript this time! Added gem 'coffee-script-source', '1.8.0' If 'bundle install' doesn't work, run 'bundle update coffee-script-source'\n  I think I fixed the javascript\n  Fix to seeds.rb\n  Finalized initial pages and have developed general queries for reports. Added necessary routes. Corey added seed for Saved List.\n  added new fields to the index of users and changed  registration form\n  Added a title page for surveys. The submit button doesn't work.\n  Changed user_phones_type to user_phone_type in user_informations/show view.\n  Added middle_initial to Login table.\n  Fixed type in UserPhone table: user_phones_type -> user_phone_type Added seed data for User1. Has complete entries for Login, User, UserPhone, UndergraduateDegree, Company, and CompanyInfo tables.\n  added basic search controller and improved advanced search formatting\n\nConflicts:\n\tGemfile.lock\n\tapp/views/homepages/index.html.erb\n\tconfig/routes.rb\n\tdb/schema.rb\n\tdb/seeds.rb","distinct":true,"url":"https://api.github.com/repos/kachlikmatt/The-Alumbook/commits/c064b8b5b375636fdbbaafcad780f47a97e1bbb0"},{"sha":"df329fd83d52d3272d6718c90aee7c9d015ae958","author":{"email":"a460f001955e9bff1c870ec93a4feedad5f4ebdc@live.com","name":"Cornelius Donley"},"message":"Removed duplicate seed data from merge with device branch","distinct":true,"url":"https://api.github.com/repos/kachlikmatt/The-Alumbook/commits/df329fd83d52d3272d6718c90aee7c9d015ae958"},{"sha":"1587396e929505bdf616d5a57e652c3d0db7934b","author":{"email":"a460f001955e9bff1c870ec93a4feedad5f4ebdc@live.com","name":"Cornelius Donley"},"message":"Fixed spacing.","distinct":true,"url":"https://api.github.com/repos/kachlikmatt/The-Alumbook/commits/1587396e929505bdf616d5a57e652c3d0db7934b"},{"sha":"c2e7749e649a30285e6e33137e0b4498e257c657","author":{"email":"6cfe19fe90c218aad9dfc62907636cbe5d92ccb9@gmail.com","name":"Matthew Kachlik"},"message":"Merge pull request #59 from cddigi/devise\n\nDevise","distinct":true,"url":"https://api.github.com/repos/kachlikmatt/The-Alumbook/commits/c2e7749e649a30285e6e33137e0b4498e257c657"},{"sha":"1b57986ec506a1105cbcd2173824761e816b91a0","author":{"email":"6cfe19fe90c218aad9dfc62907636cbe5d92ccb9@gmail.com","name":"Matthew Kachlik"},"message":"got form to work for a new user, added routes for UserPhone","distinct":true,"url":"https://api.github.com/repos/kachlikmatt/The-Alumbook/commits/1b57986ec506a1105cbcd2173824761e816b91a0"}]}