{"push_id":876107946,"size":25,"distinct_size":1,"ref":"refs/heads/song","head":"569b019e8a4027f596195f2cad06d84081f3da7c","before":"7305eecb58c979a7ce3db89b9b351eb162585dde","commits":[{"sha":"fca0f7fc639baeb25b5fa8a60027028b420cc531","author":{"email":"b2891b806afaaeddab4dfb03b1bd1977dfb5f5e2@naver.com","name":"JungEunHye"},"message":"eh","distinct":false,"url":"https://api.github.com/repos/zxy826/SeminarRoomReservation/commits/fca0f7fc639baeb25b5fa8a60027028b420cc531"},{"sha":"3f3ef9032388e70dad58376cd61727183f0574ba","author":{"email":"6fd89d0dd557f7b47b7350a37172d6af0262c62a@gmail.com","name":"EunjiLim"},"message":"예약된 날짜, 시간과 현재 날짜, 시간을 비교하는 checkTime 함수 수정","distinct":false,"url":"https://api.github.com/repos/zxy826/SeminarRoomReservation/commits/3f3ef9032388e70dad58376cd61727183f0574ba"},{"sha":"f4ea538d84012125f81c0f347c54dc67da454132","author":{"email":"6fd89d0dd557f7b47b7350a37172d6af0262c62a@gmail.com","name":"EunjiLim"},"message":"Login과정에서 userList 같이 전송","distinct":false,"url":"https://api.github.com/repos/zxy826/SeminarRoomReservation/commits/f4ea538d84012125f81c0f347c54dc67da454132"},{"sha":"4c2a9830632eca6c7d0b7705a86e257e9e1c4de9","author":{"email":"b2891b806afaaeddab4dfb03b1bd1977dfb5f5e2@naver.com","name":"JungEunHye"},"message":"수정","distinct":false,"url":"https://api.github.com/repos/zxy826/SeminarRoomReservation/commits/4c2a9830632eca6c7d0b7705a86e257e9e1c4de9"},{"sha":"0c92632c25055e48aff25461d8ed5bd9d15ef9ed","author":{"email":"6fd89d0dd557f7b47b7350a37172d6af0262c62a@gmail.com","name":"EunjiLim"},"message":"MyHttpServlet","distinct":false,"url":"https://api.github.com/repos/zxy826/SeminarRoomReservation/commits/0c92632c25055e48aff25461d8ed5bd9d15ef9ed"},{"sha":"2b47f691d0975dfaac5a7e12eb91ac878e5dc44f","author":{"email":"6fd89d0dd557f7b47b7350a37172d6af0262c62a@gmail.com","name":"EunjiLim"},"message":"Merge branch 'develop' of https://github.com/zxy826/SeminarRoomReservation into feature/DateCompareFunction","distinct":false,"url":"https://api.github.com/repos/zxy826/SeminarRoomReservation/commits/2b47f691d0975dfaac5a7e12eb91ac878e5dc44f"},{"sha":"dc369e72efd646ebd50905a73a4bb287ce859325","author":{"email":"6fd89d0dd557f7b47b7350a37172d6af0262c62a@gmail.com","name":"EunjiLim"},"message":"Merge branch 'feature/DateCompareFunction' into develop","distinct":false,"url":"https://api.github.com/repos/zxy826/SeminarRoomReservation/commits/dc369e72efd646ebd50905a73a4bb287ce859325"},{"sha":"ca0328c6dd800176d2b785b4f681799fd83ea0da","author":{"email":"b2891b806afaaeddab4dfb03b1bd1977dfb5f5e2@naver.com","name":"JungEunHye"},"message":"reservationFrom 수정","distinct":false,"url":"https://api.github.com/repos/zxy826/SeminarRoomReservation/commits/ca0328c6dd800176d2b785b4f681799fd83ea0da"},{"sha":"fac07456876fab05c27279bf92ec51f8761d3710","author":{"email":"d7384f4cd5e9e90dc821b18b478cd449833bf1fb@naver.com","name":"SongMiLee"},"message":"Merge branch 'song' into develop","distinct":false,"url":"https://api.github.com/repos/zxy826/SeminarRoomReservation/commits/fac07456876fab05c27279bf92ec51f8761d3710"},{"sha":"3f279cf79309f89df24b72fd8c023e8a73060914","author":{"email":"b2891b806afaaeddab4dfb03b1bd1977dfb5f5e2@naver.com","name":"JungEunHye"},"message":"Merge branch 'eh' into develop\n\nConflicts:\n\tCapstone2_Project/SeminarRoomReservation/app/src/main/AndroidManifest.xml\n\tCapstone2_Project/SeminarRoomReservation/app/src/main/java/kr/ac/kookmin/cs/capstone2/seminarroomreservation/Network/RestRequestHelper.java","distinct":false,"url":"https://api.github.com/repos/zxy826/SeminarRoomReservation/commits/3f279cf79309f89df24b72fd8c023e8a73060914"},{"sha":"cad252ce4e8627a31898f18f6e074cdfeb13ad7e","author":{"email":"b2891b806afaaeddab4dfb03b1bd1977dfb5f5e2@naver.com","name":"JungEunHye"},"message":"git test","distinct":false,"url":"https://api.github.com/repos/zxy826/SeminarRoomReservation/commits/cad252ce4e8627a31898f18f6e074cdfeb13ad7e"},{"sha":"9b26a144be3e31c3ab59996ab674ff73ebd47d2d","author":{"email":"b2891b806afaaeddab4dfb03b1bd1977dfb5f5e2@naver.com","name":"JungEunHye"},"message":"Merge branch 'develop' of https://github.com/zxy826/SeminarRoomReservation into develop\n\nConflicts:\n\tCapstone2_Project/SeminarRoomReservation/app/src/main/AndroidManifest.xml\n\tCapstone2_Project/SeminarRoomReservation/app/src/main/java/kr/ac/kookmin/cs/capstone2/seminarroomreservation/Authentication/MainActivity.java\n\tCapstone2_Project/SeminarRoomReservation/app/src/main/java/kr/ac/kookmin/cs/capstone2/seminarroomreservation/Network/RestRequestHelper.java\n\tCapstone2_Project/SeminarRoomReservation/app/src/main/java/kr/ac/kookmin/cs/capstone2/seminarroomreservation/Reservation/CustomTimePickerDialog.java\n\tCapstone2_Project/SeminarRoomReservation/app/src/main/java/kr/ac/kookmin/cs/capstone2/seminarroomreservation/Reservation/ReservationCheckActivity.java\n\tCapstone2_Project/SeminarRoomReservation/app/src/main/java/kr/ac/kookmin/cs/capstone2/seminarroomreservation/Reservation/ReservationFormActivity.java\n\tCapstone2_Project/SeminarRoomReservation/app/src/main/java/kr/ac/kookmin/cs/capstone2/seminarroomreservation/Reservation/UserList.java\n\tCapstone2_Project/SeminarRoomReservation/app/src/main/java/kr/ac/kookmin/cs/capstone2/seminarroomreservation/Reservation/UserListActivity.java\n\tCapstone2_Project/SeminarRoomReservation/app/src/main/java/kr/ac/kookmin/cs/capstone2/seminarroomreservation/Reservation/UserListActivity_test.java\n\tCapstone2_Project/SeminarRoomReservation/app/src/main/res/layout/activity_reservationform.xml\n\tCapstone2_Project/SeminarRoomReservation/app/src/main/res/layout/activity_user_list.xml\n\tCapstone2_Project/SeminarRoomReservation/app/src/main/res/layout/list_item_user.xml\n\tCapstone2_Project/SeminarRoomReservation/app/src/main/res/values/strings.xml","distinct":false,"url":"https://api.github.com/repos/zxy826/SeminarRoomReservation/commits/9b26a144be3e31c3ab59996ab674ff73ebd47d2d"},{"sha":"1b7d1aceee204804fa5646ca4f66cde2ead4227d","author":{"email":"b2891b806afaaeddab4dfb03b1bd1977dfb5f5e2@naver.com","name":"JungEunHye"},"message":"Merge branch 'eh' into develop","distinct":false,"url":"https://api.github.com/repos/zxy826/SeminarRoomReservation/commits/1b7d1aceee204804fa5646ca4f66cde2ead4227d"},{"sha":"61a1b39574173bea374b67238e07ef2f0ca927f6","author":{"email":"b2891b806afaaeddab4dfb03b1bd1977dfb5f5e2@naver.com","name":"JungEunHye"},"message":"no message","distinct":false,"url":"https://api.github.com/repos/zxy826/SeminarRoomReservation/commits/61a1b39574173bea374b67238e07ef2f0ca927f6"},{"sha":"5014801baf24447048bfbaad19de92b20b24d4f2","author":{"email":"b2891b806afaaeddab4dfb03b1bd1977dfb5f5e2@naver.com","name":"JungEunHye"},"message":"Merge branch 'develop' of https://github.com/zxy826/SeminarRoomReservation into develop\n\nConflicts:\n\tCapstone2_Project/SeminarRoomReservation/app/src/main/AndroidManifest.xml\n\tCapstone2_Project/SeminarRoomReservation/app/src/main/java/kr/ac/kookmin/cs/capstone2/seminarroomreservation/Authentication/MainActivity.java\n\tCapstone2_Project/SeminarRoomReservation/app/src/main/java/kr/ac/kookmin/cs/capstone2/seminarroomreservation/Network/RestRequestHelper.java\n\tCapstone2_Project/SeminarRoomReservation/app/src/main/java/kr/ac/kookmin/cs/capstone2/seminarroomreservation/Reservation/CustomReservationLVAdapter.java\n\tCapstone2_Project/SeminarRoomReservation/app/src/main/java/kr/ac/kookmin/cs/capstone2/seminarroomreservation/Reservation/CustomTimePickerDialog.java\n\tCapstone2_Project/SeminarRoomReservation/app/src/main/java/kr/ac/kookmin/cs/capstone2/seminarroomreservation/Reservation/ReservationFormActivity.java\n\tCapstone2_Project/SeminarRoomReservation/app/src/main/java/kr/ac/kookmin/cs/capstone2/seminarroomreservation/Reservation/ReservationStatusFragment.java\n\tCapstone2_Project/SeminarRoomReservation/app/src/main/java/kr/ac/kookmin/cs/capstone2/seminarroomreservation/Reservation/UserList.java\n\tCapstone2_Project/SeminarRoomReservation/app/src/main/java/kr/ac/kookmin/cs/capstone2/seminarroomreservation/Reservation/UserListActivity.java\n\tCapstone2_Project/SeminarRoomReservation/app/src/main/java/kr/ac/kookmin/cs/capstone2/seminarroomreservation/Reservation/UserListActivity_test.java\n\tCapstone2_Project/SeminarRoomReservation/app/src/main/res/layout/activity_reservationform.xml\n\tCapstone2_Project/SeminarRoomReservation/app/src/main/res/layout/activity_user_list.xml\n\tCapstone2_Project/SeminarRoomReservation/app/src/main/res/layout/list_item_user.xml\n\tCapstone2_Project/SeminarRoomReservation/app/src/main/res/values/strings.xml","distinct":false,"url":"https://api.github.com/repos/zxy826/SeminarRoomReservation/commits/5014801baf24447048bfbaad19de92b20b24d4f2"},{"sha":"c14adddddcfccc51370fa6e71a1ea8db7ae6ce35","author":{"email":"b2891b806afaaeddab4dfb03b1bd1977dfb5f5e2@naver.com","name":"JungEunHye"},"message":"git 충돌 수정","distinct":false,"url":"https://api.github.com/repos/zxy826/SeminarRoomReservation/commits/c14adddddcfccc51370fa6e71a1ea8db7ae6ce35"},{"sha":"e82e07db26d982c294938822c9e546eaa5f1f470","author":{"email":"b2891b806afaaeddab4dfb03b1bd1977dfb5f5e2@naver.com","name":"JungEunHye"},"message":"git 충돌 수정","distinct":false,"url":"https://api.github.com/repos/zxy826/SeminarRoomReservation/commits/e82e07db26d982c294938822c9e546eaa5f1f470"},{"sha":"b0e0f9ce572b2c5fe086d6485d0b31254897fd82","author":{"email":"b2891b806afaaeddab4dfb03b1bd1977dfb5f5e2@naver.com","name":"JungEunHye"},"message":"버그 수정","distinct":false,"url":"https://api.github.com/repos/zxy826/SeminarRoomReservation/commits/b0e0f9ce572b2c5fe086d6485d0b31254897fd82"},{"sha":"3d29557f88aec759438c1468aac842d77553cc6f","author":{"email":"b2891b806afaaeddab4dfb03b1bd1977dfb5f5e2@naver.com","name":"JungEunHye"},"message":"버그 수정","distinct":false,"url":"https://api.github.com/repos/zxy826/SeminarRoomReservation/commits/3d29557f88aec759438c1468aac842d77553cc6f"},{"sha":"dca273786a9838635c9177a8bc43393d0389e749","author":{"email":"b2891b806afaaeddab4dfb03b1bd1977dfb5f5e2@naver.com","name":"JungEunHye"},"message":"버그 수정, reservation form 참여자 추가 부분 수정","distinct":false,"url":"https://api.github.com/repos/zxy826/SeminarRoomReservation/commits/dca273786a9838635c9177a8bc43393d0389e749"}]}