{"push_id":1018933127,"size":32,"distinct_size":1,"ref":"refs/heads/tim","head":"e246710b119c3c4e74684d2e3ef6f43eac1ff69e","before":"5cdff75942f776a6404abc05ca3970dda73541f6","commits":[{"sha":"0fedb40d00b92c957346f4640505db886ddbc331","author":{"email":"f6d8495096ce2baa90ee359d8a78070bffa896c3@gmail.com","name":"timothy"},"message":"basic structure of assigned classes","distinct":false,"url":"https://api.github.com/repos/varygoode/321-project/commits/0fedb40d00b92c957346f4640505db886ddbc331"},{"sha":"72b5b13d8d4ad59a3f6f73aaf0f011d987a2d142","author":{"email":"f6d8495096ce2baa90ee359d8a78070bffa896c3@gmail.com","name":"timothy"},"message":"basic structure of assigned classes","distinct":false,"url":"https://api.github.com/repos/varygoode/321-project/commits/72b5b13d8d4ad59a3f6f73aaf0f011d987a2d142"},{"sha":"4806d6999efebbc3836dc66ae20c114ac3ee5921","author":{"email":"f6d8495096ce2baa90ee359d8a78070bffa896c3@gmail.com","name":"timothy"},"message":"small fixes and basic factory setup","distinct":false,"url":"https://api.github.com/repos/varygoode/321-project/commits/4806d6999efebbc3836dc66ae20c114ac3ee5921"},{"sha":"fa9a36b7d8f91a271e9b15ace28f34ccbccd59e7","author":{"email":"eef11c30041a4f82398f399adff0363a3c2d54ec@gmail.com","name":"varygoode"},"message":"primitive search functionality (reservations, rooms, users)\nadded member variables and accessors/mutators for Room & User","distinct":false,"url":"https://api.github.com/repos/varygoode/321-project/commits/fa9a36b7d8f91a271e9b15ace28f34ccbccd59e7"},{"sha":"360bfcae210311be770fde136addd259dde3fb95","author":{"email":"eef11c30041a4f82398f399adff0363a3c2d54ec@gmail.com","name":"varygoode"},"message":"primitive search functionality (reservations, rooms, users)\nadded member variables and accessors/mutators for Room & User","distinct":false,"url":"https://api.github.com/repos/varygoode/321-project/commits/360bfcae210311be770fde136addd259dde3fb95"},{"sha":"b9a2c49ca44cfe0e8b5a7db0f5bfc9a16c3ff641","author":{"email":"28f345486e77d89adc0cf9da908f46417c8c0ef9@192.168.2.6","name":"Monique"},"message":"User methods added: login and register and minor supporting methods","distinct":false,"url":"https://api.github.com/repos/varygoode/321-project/commits/b9a2c49ca44cfe0e8b5a7db0f5bfc9a16c3ff641"},{"sha":"34a8abdab1e4519d0b557967b87100f5e5b2675a","author":{"email":"28f345486e77d89adc0cf9da908f46417c8c0ef9@192.168.2.6","name":"Monique"},"message":"Customer class to extend User","distinct":false,"url":"https://api.github.com/repos/varygoode/321-project/commits/34a8abdab1e4519d0b557967b87100f5e5b2675a"},{"sha":"b64fd9342eab0c3ac2d187ae5db8f249fe810ac1","author":{"email":"28f345486e77d89adc0cf9da908f46417c8c0ef9@192.168.2.6","name":"Monique"},"message":"Employee class to extend User","distinct":false,"url":"https://api.github.com/repos/varygoode/321-project/commits/b64fd9342eab0c3ac2d187ae5db8f249fe810ac1"},{"sha":"43b00abba5860a45a2772569972126d40e88bd91","author":{"email":"eef11c30041a4f82398f399adff0363a3c2d54ec@gmail.com","name":"varygoode"},"message":"testDriver as main, fixed up Ledger","distinct":false,"url":"https://api.github.com/repos/varygoode/321-project/commits/43b00abba5860a45a2772569972126d40e88bd91"},{"sha":"a43839391b2a61d378b4f12bfd8a07f82a45b182","author":{"email":"eef11c30041a4f82398f399adff0363a3c2d54ec@gmail.com","name":"varygoode"},"message":"Merge commit '43b00abba5860a45a2772569972126d40e88bd91'\n\nConflicts:\n\tHotelManagement/nbproject/project.properties","distinct":false,"url":"https://api.github.com/repos/varygoode/321-project/commits/a43839391b2a61d378b4f12bfd8a07f82a45b182"},{"sha":"74d8764e1a555e84d8951a6ed01408614fde60e7","author":{"email":"28f345486e77d89adc0cf9da908f46417c8c0ef9@192.168.2.6","name":"Monique"},"message":"all functions completed except Register, Reservation and getReport.","distinct":false,"url":"https://api.github.com/repos/varygoode/321-project/commits/74d8764e1a555e84d8951a6ed01408614fde60e7"},{"sha":"51ba6868611efbb3217d2c4e70ba080a77f62b33","author":{"email":"28f345486e77d89adc0cf9da908f46417c8c0ef9@192.168.2.6","name":"Monique"},"message":"Merge origin/master\n\nConflicts:\n\tHotelManagement/src/hotelmanagement/Reservation.java","distinct":false,"url":"https://api.github.com/repos/varygoode/321-project/commits/51ba6868611efbb3217d2c4e70ba080a77f62b33"},{"sha":"5dfe6f60152ac3237810887555719f640271770b","author":{"email":"f6d8495096ce2baa90ee359d8a78070bffa896c3@gmail.com","name":"timothy"},"message":"reservation factory rewritten as abstract factory","distinct":false,"url":"https://api.github.com/repos/varygoode/321-project/commits/5dfe6f60152ac3237810887555719f640271770b"},{"sha":"b2f35298f321506ea1c4561ed5c81b80c4a5b1e8","author":{"email":"f6d8495096ce2baa90ee359d8a78070bffa896c3@gmail.com","name":"timothy"},"message":"reservation factory rewritten as abstract factory","distinct":false,"url":"https://api.github.com/repos/varygoode/321-project/commits/b2f35298f321506ea1c4561ed5c81b80c4a5b1e8"},{"sha":"6ce579eae6534396841b6af47dcbd39c59d8879c","author":{"email":"dc74f7a53245091a6a1a2686e51f41d05eccbdf1@10.4.159.131","name":"andreapressnell"},"message":"Added code for RoomFactory","distinct":false,"url":"https://api.github.com/repos/varygoode/321-project/commits/6ce579eae6534396841b6af47dcbd39c59d8879c"},{"sha":"28b127da013a5edf56760052208d8f38244050a7","author":{"email":"dc74f7a53245091a6a1a2686e51f41d05eccbdf1@10.4.159.131","name":"andreapressnell"},"message":"Merge origin/master","distinct":false,"url":"https://api.github.com/repos/varygoode/321-project/commits/28b127da013a5edf56760052208d8f38244050a7"},{"sha":"fe6ba1dc28749ff953bc41344c5f2d6c1dc5f67e","author":{"email":"dc74f7a53245091a6a1a2686e51f41d05eccbdf1@10.4.159.131","name":"andreapressnell"},"message":"Removed auto-gen Java applet code\nFactory setup","distinct":false,"url":"https://api.github.com/repos/varygoode/321-project/commits/fe6ba1dc28749ff953bc41344c5f2d6c1dc5f67e"},{"sha":"ce794411c6be95fe5b2b3d1b70a2707a0ebc97c5","author":{"email":"dc74f7a53245091a6a1a2686e51f41d05eccbdf1@10.4.159.131","name":"andreapressnell"},"message":"edit to RoomFactory","distinct":false,"url":"https://api.github.com/repos/varygoode/321-project/commits/ce794411c6be95fe5b2b3d1b70a2707a0ebc97c5"},{"sha":"cb262bbae448cfd0b9aab6f456ecf993b2851699","author":{"email":"dc74f7a53245091a6a1a2686e51f41d05eccbdf1@10.4.159.131","name":"andreapressnell"},"message":"create Display object - made to print statements for text based implementation","distinct":false,"url":"https://api.github.com/repos/varygoode/321-project/commits/cb262bbae448cfd0b9aab6f456ecf993b2851699"},{"sha":"4644410bc6b2a4fe7c9008112d182573b2cfddd0","author":{"email":"f6d8495096ce2baa90ee359d8a78070bffa896c3@gmail.com","name":"timothy"},"message":"mostly functional room and reservation factories. test functions in hotel management.","distinct":false,"url":"https://api.github.com/repos/varygoode/321-project/commits/4644410bc6b2a4fe7c9008112d182573b2cfddd0"}]}