Merge branches 'SignUpInBranch' and 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2019/CosmosClient into SignUpInBranch
AchieveRequests
AddGroupByGroupID2
AreaInformation
AreaInformationUpdate
CompareStoreLocation
CreateIntentService
DG_gitignore
DisplayGroupIDToInvite
DisplayGroupIDToInviteSecond
DisplayTitleRep
GPSgetInService
GroupListActivity
JouinGroupLayoutRepair
LineInvite
MemberList
NotificationClass
RequestList
RequestListActivity
SearchResultDisplay
StoreLocationClass
UpdateRequestList
areaInfo
master
removeDGBuild
searchNotificationsFix20191114
sendNotification
updateAreaInformation
|
---|
.idea/gradle.xml |
---|
app/src/main/AndroidManifest.xml |
---|
app/src/main/java/com/example/cosmosclient/views/AddRequestActivity.java |
---|
app/src/main/java/com/example/cosmosclient/views/RequestListActivity.java |
---|
app/src/main/java/com/example/cosmosclient/yolp/Category.java 0 → 100644 |
---|
app/src/main/java/com/example/cosmosclient/yolp/SubCategory.java 0 → 100644 |
---|
app/src/main/java/com/example/cosmosclient/yolp/Yolp.java 0 → 100644 |
---|
app/src/main/res/layout/activity_add_request.xml |
---|
app/src/main/res/layout/app_bar_request_list.xml |
---|
app/src/main/res/layout/content_request_list.xml |
---|
app/src/main/res/values/strings.xml |
---|
dynamicgrid/.gitignore 0 → 100644 |
---|
dynamicgrid/build/intermediates/compile_only_not_namespaced_r_class_jar/debug/generateDebugRFile/R.jar |
---|
Not supported
|
dynamicgrid/build/intermediates/full_jar/debug/createFullJarDebug/full.jar 0 → 100644 |
---|
Not supported
|
dynamicgrid/build/intermediates/incremental/debug-mergeJniLibs/merge-state |
---|
Not supported
|
dynamicgrid/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml |
---|
dynamicgrid/build/intermediates/incremental/mergeDebugShaders/merger.xml |
---|
dynamicgrid/build/intermediates/incremental/packageDebugAssets/merger.xml |
---|
dynamicgrid/build/intermediates/incremental/packageDebugResources/compile-file-map.properties |
---|
dynamicgrid/build/intermediates/incremental/packageDebugResources/merger.xml |
---|
dynamicgrid/build/outputs/logs/manifest-merger-debug-report.txt |
---|