{"push_id":1072666517,"size":6,"distinct_size":6,"ref":"refs/heads/master","head":"a1d4536c0fa066b490d8bca4360f24921d54475e","before":"cca307190d030130f2628c225e4e2defe4fb041e","commits":[{"sha":"63082751ab88fcb46e8c44520602882ebf7b5f39","author":{"email":"ff0f0a8b656f0b44c26933acd2e367b6c1211290@III-EEIT","name":"fox"},"message":"4/18重新first commit,修正url與後台bug","distinct":true,"url":"https://api.github.com/repos/EEIT84-itravel/WebRemoteRepo3/commits/63082751ab88fcb46e8c44520602882ebf7b5f39"},{"sha":"d3a37165f63a20aa418efd19acf502172f7867e2","author":{"email":"ff0f0a8b656f0b44c26933acd2e367b6c1211290@III-EEIT","name":"fox"},"message":"Merge branch 'master' of\nhttps://github.com/EEIT84-itravel/WebRemoteRepo3.git\n\nConflicts:\n\tItravleWeb/src/main/java/_01_Sight/controller/SightIndexServlet.java\n\tItravleWeb/src/main/java/_01_Sight/controller/SightServlet.java\n\tItravleWeb/src/main/java/_01_Sight/model/SightService.java\n\tItravleWeb/src/main/java/_01_Sight/model/dao/SightDAOHibernate.java\n\tItravleWeb/src/main/java/_02_TripAndJournal/model/dao/MessageDAOHibernate.java\n\tItravleWeb/src/main/java/_05_Member/model/CollectionService.java\n\tItravleWeb/src/main/java/_06_BackEnd/controller/BackendSightServlet.java\n\tItravleWeb/src/main/webapp/_00_Misc/page1.file\n\tItravleWeb/src/main/webapp/_01_Sight/SightIndex.jsp\n\tItravleWeb/src/main/webapp/_01_Sight/SightInformation.jsp\n\tItravleWeb/src/main/webapp/_02_TripAndJournal/member/HotelSights.jsp\n\tItravleWeb/src/main/webapp/_02_TripAndJournal/member/WriteTrip.jsp\n\tItravleWeb/src/main/webapp/_06_BackEnd/backend/AllSight.jsp\n\tItravleWeb/src/main/webapp/_06_BackEnd/backend/NewSight.jsp\n\tItravleWeb/src/main/webapp/_06_BackEnd/backend/UpdateSight.jsp","distinct":true,"url":"https://api.github.com/repos/EEIT84-itravel/WebRemoteRepo3/commits/d3a37165f63a20aa418efd19acf502172f7867e2"},{"sha":"24e905bc10f0c2a9007f96677f971fcbba7ca99a","author":{"email":"ff0f0a8b656f0b44c26933acd2e367b6c1211290@III-EEIT","name":"fox"},"message":"修改會員權限相關功能,修正bug\n\nmodify JournalIndex.jsp,TripIndex.jsp,AllSight.jsp\nadd modifyAdminServlet.java,AllMember.jsp","distinct":true,"url":"https://api.github.com/repos/EEIT84-itravel/WebRemoteRepo3/commits/24e905bc10f0c2a9007f96677f971fcbba7ca99a"},{"sha":"f555796708782b5af1d704401843b8fa8373c3cc","author":{"email":"ff0f0a8b656f0b44c26933acd2e367b6c1211290@III-EEIT","name":"fox"},"message":"後台修改會員權限相關功能,新增活動相關功能,下拉選單動態Ajax,bug修正\n\nmodify NewEventServlet.java,AllSight.jsp\n              page1.file(移出衝突宣告參數),HotelSight.jsp,WriteTrip.jsp,NewEvent.jsp\nadd modifyAdminServlet.java,SightCountyServlet.java(提供Ajax動態顯示景點)\ndelete AllEvent.jsp,Allmember.jsp併入AllSight.jsp","distinct":true,"url":"https://api.github.com/repos/EEIT84-itravel/WebRemoteRepo3/commits/f555796708782b5af1d704401843b8fa8373c3cc"},{"sha":"f6971a3d512faad815bddb3d463167be57b2a499","author":{"email":"ff0f0a8b656f0b44c26933acd2e367b6c1211290@III-EEIT","name":"fox"},"message":"Merge branch 'master' of https://github.com/EEIT84-itravel/WebRemoteRepo3.git","distinct":true,"url":"https://api.github.com/repos/EEIT84-itravel/WebRemoteRepo3/commits/f6971a3d512faad815bddb3d463167be57b2a499"},{"sha":"a1d4536c0fa066b490d8bca4360f24921d54475e","author":{"email":"ff0f0a8b656f0b44c26933acd2e367b6c1211290@III-EEIT","name":"fox"},"message":"後台新增/修改活動相關功能完成,修正bug,刪除報廢檔案\n\ndelete AllForum.jsp,AllJournal.jsp,AllTrip.jsp\nmodify\n\tBackendSightServlet.java,NewEventServlet.java,modifyAdminServlet.java\n\tAllSight.jsp(新增活動div:tabs-3),NewEvent.jsp,NewSight.jsp,UpdateSight.jsp\nadd UpdatEvent.jsp","distinct":true,"url":"https://api.github.com/repos/EEIT84-itravel/WebRemoteRepo3/commits/a1d4536c0fa066b490d8bca4360f24921d54475e"}]}