Browse code Merge remote-tracking branch 'remotes/origin/master' into DisplayGroupIDToInvite # Conflicts: # app/src/main/AndroidManifest.xml 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

commit f8e60ce3512577fcfe01789403ac8b6f1c9158cc 2 parents fc6e62f + d5e1e70 t-tai authored on 11 Jul 2019

Showing 16 changed files

• .idea/gradle.xml
• app/build.gradle
• app/src/main/AndroidManifest.xml
• app/src/main/java/com/example/cosmosclient/views/AddRequestActivity.java
• app/src/main/java/com/example/cosmosclient/views/CreateGroupActivity.java
• app/src/main/java/com/example/cosmosclient/views/RequestListActivity.java
• app/src/main/java/com/example/cosmosclient/views/SigninActivity.java
• app/src/main/java/com/example/cosmosclient/views/SignupActivity.java
• app/src/main/java/com/example/cosmosclient/yolp/Category.java
• app/src/main/java/com/example/cosmosclient/yolp/SubCategory.java
• app/src/main/java/com/example/cosmosclient/yolp/Yolp.java
• 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

Ignore Space Show notes View .idea/gradle.xml

Ignore Space Show notes View app/build.gradle

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

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

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

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

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

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

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

Ignore Space Show notes View app/src/main/res/values/strings.xml

Ignore Space Show notes View dynamicgrid/.gitignore 0 → 100644

Show line notes below