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

Fork: 0

nitta-lab-2019 / CosmosClient

Browse code Merge branch 'RequestList' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2019/CosmosClient into RequestList # Conflicts: # app/src/main/java/com/example/cosmosclient/app/Cosmos.java # app/src/main/java/com/example/cosmosclient/resources/GroupsRest.java AchieveRequests AreaInformation AreaInformationUpdate CompareStoreLocation CreateIntentService GPSgetInService GroupListActivity NotificationClass RequestList RequestListActivity StoreLocationClass UpdateRequestList areaInfo master searchNotificationsFix20191114 sendNotification updateAreaInformation
commit ac1b997fcf0fe408ed30fa56bbeda4628a8f6eea 2 parents 40bd6f5 + 49f0081 a-hongo authored on 15 Oct 2019

Browse code

# Conflicts:
#	app/src/main/java/com/example/cosmosclient/app/Cosmos.java
#	app/src/main/java/com/example/cosmosclient/resources/GroupsRest.java

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

commit ac1b997fcf0fe408ed30fa56bbeda4628a8f6eea

2 parents 40bd6f5 + 49f0081

a-hongo authored on 15 Oct 2019

Patch

Unified Split

Showing 17 changed files

Ignore Space Show notes View app/src/main/AndroidManifest.xml

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

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

Ignore Space Show notes View app/src/main/java/com/example/cosmosclient/entities/jsons/GroupJson.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/UsersRest.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/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/GroupListActivity.java

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

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

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

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

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

Show line notes below