{"push_id":1120646127,"size":53,"distinct_size":1,"ref":"refs/heads/RouteSelection","head":"36fc12b9e502f964454ed333a3b593866feb3189","before":"1adef1d941b6bfc8d03d2e99fbc1ac896e371142","commits":[{"sha":"368ccaaada5a47a26a7fdea35c84d4b0e105129a","author":{"email":"ada4aaf2d16bb4921bd9f25ced95f9f7423b3d28@gmail.com","name":"Shelley O'Neill"},"message":"Fixing Merge issues","distinct":false,"url":"https://api.github.com/repos/tangyfruits/SWEN301Project2/commits/368ccaaada5a47a26a7fdea35c84d4b0e105129a"},{"sha":"16501210c782b63d14c57ef8e4b10b2a1402349c","author":{"email":"ada4aaf2d16bb4921bd9f25ced95f9f7423b3d28@gmail.com","name":"Shelley O'Neill"},"message":"Merge branch 'master' of\nfile:///C:\\Users\\Shelley\\Documents\\GitHub\\SWEN301Project2\n\nConflicts:\n\tKPSmart/.classpath\n\tKPSmart/bin/.gitignore","distinct":false,"url":"https://api.github.com/repos/tangyfruits/SWEN301Project2/commits/16501210c782b63d14c57ef8e4b10b2a1402349c"},{"sha":"bf38187e96de3525c142fb51ccf307749f8ad2c8","author":{"email":"ada4aaf2d16bb4921bd9f25ced95f9f7423b3d28@gmail.com","name":"Shelley O'Neill"},"message":"Set up log Customer Price Update\n\nSet up input of Customer Price using console in.  Updated log route cost\nto match.","distinct":false,"url":"https://api.github.com/repos/tangyfruits/SWEN301Project2/commits/bf38187e96de3525c142fb51ccf307749f8ad2c8"},{"sha":"e8fee7c92fe8e5f2f26b6c4e0b91191fe42a67e3","author":{"email":"9047c86b9ab9e613048351dc275282fcecbde61b@gmail.com","name":"Peter Scriven"},"message":"Added LogWriter class skeleton. Changed build path to fix error.","distinct":false,"url":"https://api.github.com/repos/tangyfruits/SWEN301Project2/commits/e8fee7c92fe8e5f2f26b6c4e0b91191fe42a67e3"},{"sha":"9845218995b425f103d72e8745fd75a799afb2bb","author":{"email":"dff29269d615e741311e71680bebe9be48e31c9d@192.168.20.107","name":"semillkasz"},"message":"- packages and classes are now organised\n- initial simple gui \n(login screen and page when you're already logged in)","distinct":false,"url":"https://api.github.com/repos/tangyfruits/SWEN301Project2/commits/9845218995b425f103d72e8745fd75a799afb2bb"},{"sha":"3c7fc79553e3ad5351481759f83ab251d4237fd9","author":{"email":"9047c86b9ab9e613048351dc275282fcecbde61b@gmail.com","name":"Peter Scriven"},"message":"Fleshed out writing methods. Still incomplete.","distinct":false,"url":"https://api.github.com/repos/tangyfruits/SWEN301Project2/commits/3c7fc79553e3ad5351481759f83ab251d4237fd9"},{"sha":"a16e53e8974f84eb0466cfe8ce078ec201525d7e","author":{"email":"ada4aaf2d16bb4921bd9f25ced95f9f7423b3d28@gmail.com","name":"Shelley O'Neill"},"message":"Finished logging customer prices and set up unit tests for them.","distinct":false,"url":"https://api.github.com/repos/tangyfruits/SWEN301Project2/commits/a16e53e8974f84eb0466cfe8ce078ec201525d7e"},{"sha":"ccea36e4529ff5eab5fa4a9f25f48a91fa63be3a","author":{"email":"ada4aaf2d16bb4921bd9f25ced95f9f7423b3d28@gmail.com","name":"Shelley O'Neill"},"message":"Fixing merge issues","distinct":false,"url":"https://api.github.com/repos/tangyfruits/SWEN301Project2/commits/ccea36e4529ff5eab5fa4a9f25f48a91fa63be3a"},{"sha":"e1e35d78eec908dd1c43b37c5293df87e6db9d04","author":{"email":"ada4aaf2d16bb4921bd9f25ced95f9f7423b3d28@gmail.com","name":"shelley-oneill"},"message":"Updated tests to fix merging","distinct":false,"url":"https://api.github.com/repos/tangyfruits/SWEN301Project2/commits/e1e35d78eec908dd1c43b37c5293df87e6db9d04"},{"sha":"925f80fde75602e17a1497529068649eaee5c57f","author":{"email":"ada4aaf2d16bb4921bd9f25ced95f9f7423b3d28@gmail.com","name":"Shelley O'Neill"},"message":"Attempting to fix merge issues","distinct":false,"url":"https://api.github.com/repos/tangyfruits/SWEN301Project2/commits/925f80fde75602e17a1497529068649eaee5c57f"},{"sha":"88ea839d6ad4e46ba81043e3d8cc6079fe033ab2","author":{"email":"ada4aaf2d16bb4921bd9f25ced95f9f7423b3d28@gmail.com","name":"Shelley O'Neill"},"message":"Merge remote-tracking branch 'refs/remotes/origin/master' into input_log_customer_price_update\n\n# Conflicts:\n#\tKPSmart/bin/.gitignore\n#\tKPSmart/bin/main/Main.class\n#\tKPSmart/bin/main/Route.class","distinct":false,"url":"https://api.github.com/repos/tangyfruits/SWEN301Project2/commits/88ea839d6ad4e46ba81043e3d8cc6079fe033ab2"},{"sha":"c7a9100e6cc2281c5fb772ab6335533157449aa5","author":{"email":"ada4aaf2d16bb4921bd9f25ced95f9f7423b3d28@gmail.com","name":"shelley-oneill"},"message":"Merge pull request #2 from tangyfruits/input_log_customer_price_update\n\nInput log customer price update","distinct":false,"url":"https://api.github.com/repos/tangyfruits/SWEN301Project2/commits/c7a9100e6cc2281c5fb772ab6335533157449aa5"},{"sha":"2fd87a8ce9c0226e0678c336d865ef7d67547461","author":{"email":"dff29269d615e741311e71680bebe9be48e31c9d@10.140.136.79","name":"semillkasz"},"message":"- kpsGUI\n- login screen","distinct":false,"url":"https://api.github.com/repos/tangyfruits/SWEN301Project2/commits/2fd87a8ce9c0226e0678c336d865ef7d67547461"},{"sha":"906886eaf6e4b9e3f280f37ffd32f161517df4ef","author":{"email":"dff29269d615e741311e71680bebe9be48e31c9d@10.140.136.79","name":"semillkasz"},"message":"Fixing merge","distinct":false,"url":"https://api.github.com/repos/tangyfruits/SWEN301Project2/commits/906886eaf6e4b9e3f280f37ffd32f161517df4ef"},{"sha":"4796a757a90a11d43ecd240fe909c7b429ee7562","author":{"email":"dff29269d615e741311e71680bebe9be48e31c9d@10.140.136.79","name":"semillkasz"},"message":"Merge branch 'master' of\nhttps://github.com/tangyfruits/SWEN301Project2.git\n\nConflicts:\n\tKPSmart/bin/.gitignore","distinct":false,"url":"https://api.github.com/repos/tangyfruits/SWEN301Project2/commits/4796a757a90a11d43ecd240fe909c7b429ee7562"},{"sha":"be1da9ebf88721edbf3c3d6c529caa2d6efd54d1","author":{"email":"dff29269d615e741311e71680bebe9be48e31c9d@MacBook-Pro-2.local","name":"semillkasz"},"message":"Merge remote-tracking branch 'origin/LogWriter' into RouteSelection\n\n# Conflicts:\n#\tKPSmart/bin/main/CustomerPrice.class\n#\tKPSmart/bin/main/Location.class\n#\tKPSmart/bin/main/Main.class\n#\tKPSmart/bin/main/Route.class\n#\tKPSmart/src/main/CustomerPrice.java\n#\tKPSmart/src/main/Location.java\n#\tKPSmart/src/main/Route.java","distinct":false,"url":"https://api.github.com/repos/tangyfruits/SWEN301Project2/commits/be1da9ebf88721edbf3c3d6c529caa2d6efd54d1"},{"sha":"e7d3b9b047f381c3db29ea8082d86fd307d143a6","author":{"email":"dff29269d615e741311e71680bebe9be48e31c9d@MacBook-Pro-2.local","name":"semillkasz"},"message":"Merge branch 'master' into InitialGUI\n\n# Conflicts:\n#\tKPSmart/bin/main/CustomerPrice.class\n#\tKPSmart/bin/main/Location.class\n#\tKPSmart/bin/main/Main.class\n#\tKPSmart/bin/main/Route.class\n#\tKPSmart/src/main/CustomerPrice.java\n#\tKPSmart/src/main/Location.java\n#\tKPSmart/src/main/Route.java","distinct":false,"url":"https://api.github.com/repos/tangyfruits/SWEN301Project2/commits/e7d3b9b047f381c3db29ea8082d86fd307d143a6"},{"sha":"842acc7b3bf56a85f1e9ed1786d15a0640920486","author":{"email":"ada4aaf2d16bb4921bd9f25ced95f9f7423b3d28@gmail.com","name":"Shelley O'Neill"},"message":"Initial branch commit and minor comment changes to main for logging and\nreports","distinct":false,"url":"https://api.github.com/repos/tangyfruits/SWEN301Project2/commits/842acc7b3bf56a85f1e9ed1786d15a0640920486"},{"sha":"eaa22737e3f90d650c0b9d7f5ecb585401ea5db6","author":{"email":"ada4aaf2d16bb4921bd9f25ced95f9f7423b3d28@gmail.com","name":"Shelley O'Neill"},"message":"Set up initial framework for logging Delivery Requests","distinct":false,"url":"https://api.github.com/repos/tangyfruits/SWEN301Project2/commits/eaa22737e3f90d650c0b9d7f5ecb585401ea5db6"},{"sha":"b435aa3de509494f5644a0978f2a185c1b1faa1e","author":{"email":"9047c86b9ab9e613048351dc275282fcecbde61b@gmail.com","name":"Peter Scriven"},"message":"More LogWriter progress. Still incomplete.","distinct":false,"url":"https://api.github.com/repos/tangyfruits/SWEN301Project2/commits/b435aa3de509494f5644a0978f2a185c1b1faa1e"}]}
{"actor":{"display_login":"JustaBitDope"}}