Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2025/tampopo-server into activities-resource2
ActivityRepository0729-1
Chatrooms
Friendrequests_resource11
FriendsResource2
Hiroki111
activities-resource4
activities-resource5
fix-friend-service
fix-icon-url
fix-icon-url2
fixUserClassName
fixUserFriendsMethods
friendrequest_Resource10
friendrequestsresource111
hiroki3
master
resolveActivitiesTypes
restore-icon-url
|
---|
src/main/java/org/ntlab/tampoposerver/repositories/ActivityRepository.java |
---|
src/main/java/org/ntlab/tampoposerver/repositories/NotificationRepository.java |
---|
src/main/java/org/ntlab/tampoposerver/resources/FriendRequestsResource.java |
---|
src/main/java/org/ntlab/tampoposerver/resources/FriendsResource.java |
---|
src/main/java/org/ntlab/tampoposerver/resources/NotificationsResource.java |
---|
src/main/java/org/ntlab/tampoposerver/resources/UsersResource.java |
---|
src/test/java/org/ntlab/tampoposerver/repositories/ActivityRepositoryTest.java |
---|
src/test/java/org/ntlab/tampoposerver/repositories/NotificationRepositoryTest.java |
---|