nitta-lab-2018/Cactus

Fork: 0

nitta-lab-2018 / Cactus

History for Cactus / app / src / main / res

2018-06-19	40e55d0 Browse files » SampleGameActivityのFragment版作成 ... タッチイベントも動いた。全部動いた。 n-konishi committed on 19 Jun 2018
	6b352f9 Browse files » Merge branch 'master' into changeFragment ... # Conflicts: # .idea/caches/build_file_checksums.ser # app/src/main/AndroidManifest.xml # app/src/main/res/layout/activity_main.xml # app/src/main/res/layout/activity_sample.xml 加えてちょっと変更 n-konishi committed on 19 Jun 2018
	befe3eb Browse files » 単なる微調整 n-konishi committed on 19 Jun 2018
	0a98374 Browse files » Fragment上で画面遷移できた n-konishi committed on 19 Jun 2018
2018-06-14	9b75577 Browse files » 戻れるようにした a-matsumoto committed on 14 Jun 2018
	a6a9682 Browse files » instances画面への遷移 h-matsumoto committed on 14 Jun 2018
	47f2f46 Browse files » インタンスのフラグメント作って見たけど動かんぜよ a-matsumoto committed on 14 Jun 2018
	ae3b3b3 Browse files » Merge remote-tracking branch 'origin/master' ... # Conflicts: # app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/SignUpFragment.java a-matsumoto committed on 14 Jun 2018
	e84ee9c Browse files » Merge branch 'master' of /Users/matsumotoayaju/AndroidStudioProjects/Cactus２ with conflicts. a-matsumoto committed on 14 Jun 2018
	3d996da Browse files » 通信できた ... あと、ID入力欄をデファルトで文字を設定から、 hint文に変更してます a-matsumoto committed on 14 Jun 2018
2018-06-12	740caf7 Browse files » Merge branch 'master' into ログインの通信 ... # Conflicts: # app/build.gradle まーじしました a-matsumoto committed on 12 Jun 2018
2018-06-12	f43355b Browse files » ログイン画面です a-matsumoto committed on 12 Jun 2018
2018-06-08	d20d9cb Browse files » Merge branch 'master' into addcontent ... # Conflicts: # app/src/main/AndroidManifest.xml n-konishi committed on 8 Jun 2018
2018-06-07	3282929 Browse files » Merge pull request #6 from nitta-lab-2018/通信します ... やりますねえ！ Hiromu Matsumoto committed on 7 Jun 2018
	73630c0 Browse files » button上下左右に増やしてみた n-konishi committed on 7 Jun 2018
	6fe5b1f Browse files » ボタン配置移動 n-konishi committed on 7 Jun 2018
2018-05-31	e43f035 Browse files » text追加とLayout追加 n-konishi committed on 31 May 2018
2018-05-31	8e3031c Browse files » Sampleにボタン配置できた n-konishi committed on 31 May 2018
2018-05-24	a90ecf5 Browse files » あえdふぁkj a-matsumoto committed on 24 May 2018
2018-05-22	2c1e929 Browse files » あえdふぁkj a-matsumoto committed on 22 May 2018
2018-05-18	3116f7d Browse files » Fragment動作確認用 n-konishi committed on 18 May 2018
2018-05-18	3e8ad22 Browse files » とりあえずFragment動いたけど変な感じ n-konishi committed on 18 May 2018
2018-05-17	3ded0ea Browse files » 簡易Fragment画面遷移の作成(修正版) n-konishi committed on 17 May 2018
	eebd377 Browse files » 簡易Fragment画面遷移の作成 n-konishi committed on 17 May 2018
	66363fa Browse files » Fragmentの追加 n-konishi committed on 17 May 2018
	9725bcc Browse files » SampleActivityの追加 n-konishi committed on 17 May 2018
2018-05-15	face947 Browse files » MainActivityのTextView追加 n-konishi committed on 15 May 2018
	6aeedee Browse files » MainActivityの作成 n-konishi committed on 15 May 2018
	b5adbff Browse files » 残りcommit n-konishi committed on 15 May 2018