Merge remote-tracking branch 'origin/master' into fixNullErrors
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/models/ChatRequest.java 0 → 100644 |
---|
src/main/java/org/ntlab/tampoposerver/repositories/ActivityRepository.java |
---|
src/main/java/org/ntlab/tampoposerver/repositories/ChatRequestRepository.java 0 → 100644 |
---|
src/main/java/org/ntlab/tampoposerver/repositories/UserRepository.java |
---|
src/main/java/org/ntlab/tampoposerver/resources/ActivitiesResource.java |
---|
src/main/java/org/ntlab/tampoposerver/resources/ChatRequestsResource.java 0 → 100644 |
---|
src/main/java/org/ntlab/tampoposerver/resources/FriendRequestsResource.java |
---|
src/main/java/org/ntlab/tampoposerver/resources/FriendsResource.java |
---|
src/test/java/org/ntlab/tampoposerver/repositories/ActivityRepositoryTest.java |
---|
src/test/java/org/ntlab/tampoposerver/repositories/UserRepositoryTest.java |
---|