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

Fork: 0

nitta-lab-2019 / CosmosClient

Browse code Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2019/CosmosClient into RequestListActivity # Conflicts: # app/src/main/java/com/example/cosmosclient/entities/Request.java # app/src/main/res/layout/content_request_list.xml AchieveRequests AreaInformation AreaInformationUpdate CompareStoreLocation CreateIntentService DisplayTitleRep GPSgetInService GroupListActivity JouinGroupLayoutRepair LineInvite MemberList NotificationClass RequestList RequestListActivity StoreLocationClass UpdateRequestList areaInfo master searchNotificationsFix20191114 sendNotification updateAreaInformation
commit 337da693c4c6e5101e9a9930cd2ebbfd0915a599 2 parents 2af6486 + f366973 a-hongo authored on 25 Jul 2019

Browse code

# Conflicts:
#	app/src/main/java/com/example/cosmosclient/entities/Request.java
#	app/src/main/res/layout/content_request_list.xml

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

commit 337da693c4c6e5101e9a9930cd2ebbfd0915a599

2 parents 2af6486 + f366973

a-hongo authored on 25 Jul 2019

Patch

Unified Split

Showing 24 changed files

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

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/CreateGroupResponse.java 0 → 100644

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/SignupResponse.java

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/entities/User.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/views/AddRequestActivity.java

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

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

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

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/views/GroupListActivity.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/views/SigninActivity.java

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/views/SignupActivity.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_make_group.xml

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

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

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

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

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

Ignore Space Show notes View app/src/main/res/values/ids.xml 0 → 100644

Show line notes below