Merge branch 'master' into Playerfragment2

Fork: 0

nitta-lab-2018 / Cactus

Browse code Merge branch 'master' into Playerfragment2 # Conflicts: # app/src/main/AndroidManifest.xml CleanArchitecture ForEasySignUp RemakeLoginFragment all-layout bullet correct_design logout_player master object_move test ui
commit 81048083aa99b730c9f0d52036719cd63ddffa92 2 parents 79b85fe + ba09fde n-konishi authored on 3 Jul 2018

Patch

Unified Split

Showing 13 changed files

Ignore Space Show notes View .idea/caches/build_file_checksums.ser
Not supported

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/org/ntlab/radishforandroidstudio/cactusClient/models/Account.java 0 → 100644

Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/AddressedEntity.java 100644 → 0

Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Entity.java 100644 → 0

Ignore Space Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/RandomStringGenerator.java 0 → 100644

Ignore Space Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/URIAddressedAccount.java 0 → 100644

Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/URIAddressedEntity.java 100644 → 0

Ignore Space Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/InstancesFragment.java

Ignore Space Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/LoginFragment.java

Ignore Space Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/SignUpFragment.java

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

Show line notes below