Merge branches 'login' and 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2019/CosmosClient into login

Fork: 0

nitta-lab-2019 / CosmosClient

Browse code Merge branches 'login' and 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2019/CosmosClient into login # Conflicts: # app/src/main/AndroidManifest.xml AchieveRequests AreaInformation AreaInformationUpdate CompareStoreLocation CreateIntentService DisplayTitleRep GPSgetInService GroupListActivity JouinGroupLayoutRepair LineInvite MemberList NotificationClass RequestList RequestListActivity StoreLocationClass UpdateRequestList areaInfo master searchNotificationsFix20191114 sendNotification updateAreaInformation
1 parent 7212b6f commit e82383aa32171d6ad035e5339b7c8edd8f866d20 k-morimoto authored on 1 Oct 2019

Browse code

# Conflicts:
#	app/src/main/AndroidManifest.xml

AchieveRequests AreaInformation AreaInformationUpdate CompareStoreLocation CreateIntentService DisplayTitleRep GPSgetInService GroupListActivity JouinGroupLayoutRepair LineInvite MemberList NotificationClass RequestList RequestListActivity StoreLocationClass UpdateRequestList areaInfo master searchNotificationsFix20191114 sendNotification updateAreaInformation

1 parent 7212b6f commit e82383aa32171d6ad035e5339b7c8edd8f866d20

k-morimoto authored on 1 Oct 2019

Patch

Unified Split

Showing 21 changed files

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/entities/AddRequestsResponse.java 0 → 100644

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/entities/JoinGroupResponse.java

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/entities/Request.java

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/entities/Requests.java 0 → 100644

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/entities/UserJsonforRequests.java 0 → 100644

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/resources/GroupsRest.java

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/resources/JoinGroupRest.java

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/views/AddMemberActivity.java

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/views/AddRequestActivity.java

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/views/DisplayGroupIDActivity.java 0 → 100644

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/views/DisplayQRActivity.java

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/views/JoinGroupByIDActivity.java

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/views/QRcodeReadingActivity.java

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/views/RequestListActivity.java

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/yolp/Yolp.java

Ignore Space Show notes View app/src/main/res/layout/activity_add_member.xml

Ignore Space Show notes View app/src/main/res/layout/activity_display_group_id.xml 0 → 100644

Ignore Space Show notes View app/src/main/res/layout/activity_join_group_actions.xml

Ignore Space Show notes View app/src/main/res/layout/activity_join_group_by_id.xml

Ignore Space Show notes View app/src/main/res/layout/activity_qrcode_reading.xml

Ignore Space Show notes View app/src/main/res/layout/content_request_list.xml

Show line notes below