nitta-lab-2023/NemophilaClient

Fork: 0

nitta-lab-2023 / NemophilaClient

History for NemophilaClient / app / src / main / res

2023-06-13	39e55d0 Browse files » Merge pull request #55 from nitta-lab-2023/mypage3 ... MyPageActivityを作った大下暉斗 committed on 13 Jun 2023
	c97f24c Browse files » Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2023/NemophilaClient into logon_sign_act ... Conflicts: .idea/misc.xml app/src/main/AndroidManifest.xml k-kimoto committed on 13 Jun 2023
	3a73f80 Browse files » Merge remote-tracking branch 'origin/master' into logon_sign_act ... # Conflicts: # .idea/misc.xml # app/src/main/AndroidManifest.xml k-kimoto committed on 13 Jun 2023
	da0e2b2 Browse files » ChangePwActivityの追加とlogin画面の修正 k-kimoto committed on 13 Jun 2023
	eb3eb1e Browse files » Merge branch 'master' into test_map4 ... # Conflicts: # .idea/misc.xml r-nishimura committed on 13 Jun 2023
	bd19ffc Browse files » 仮保存 r-nishimura committed on 13 Jun 2023
	3049886 Browse files » Merge pull request #45 from nitta-lab-2023/shipActivity ... ShipActivity Katsumasa Watanabe committed on 13 Jun 2023
	0ac9d98 Browse files » recycleViewのためアダプター、ビューホルダーのクラスを作成 k-fujii committed on 13 Jun 2023
	303d6d6 Browse files » recycleViewのためアダプター、ビューホルダーのクラスを作成 k-fujii committed on 13 Jun 2023
	03800e1 Browse files » Testアクティビティを改良しました g-shimokawa committed on 13 Jun 2023
2023-06-08	d6cafbf Browse files » Merge branch 'master' into LoginAct ... # Conflicts: # .idea/deploymentTargetDropDown.xml # .idea/misc.xml k-kimoto committed on 8 Jun 2023
	f138f5c Browse files » SignUpActivityとLoginの画面遷移と通信関係の作成 k-kimoto committed on 8 Jun 2023
	790d03d Browse files » 現在地アイコンがGPSで取得した座標に移動するようになりました r-nishimura committed on 8 Jun 2023
	eafda43 Browse files » Merge branch 'master' into Test ... # Conflicts: # .idea/misc.xml # app/src/main/AndroidManifest.xml # app/src/main/res/values/strings.xml t-nagao committed on 8 Jun 2023
	bc6a413 Browse files » ManifestのHTTPs通信を出来るようにしました。 ... ViewModelのテストが出来るようにTestActivityを作成しました。 t-nagao committed on 8 Jun 2023
	38e7ce3 Browse files » LoginActivityのuidとpwの通信 k-kimoto committed on 8 Jun 2023
2023-06-06	d5d35df Browse files » 現在地をGPSを使って取得できるようにしました r-nishimura committed on 6 Jun 2023
	2640719 Browse files » Merge branch 'master' into MyPage ... # Conflicts: # .idea/misc.xml # app/src/main/AndroidManifest.xml k-suzuki committed on 6 Jun 2023
	f13403a Browse files » MyPageActivityを作った k-suzuki committed on 6 Jun 2023
	67800a3 Browse files » ShopActivityの更新 k-fujii committed on 6 Jun 2023
2023-06-01	5aacb0a Browse files » 構築した k-suzuki committed on 1 Jun 2023
	aab3a09 Browse files » コンフリクト解消 k-kimoto committed on 1 Jun 2023
	fc1f1f9 Browse files » Merge remote-tracking branch 'origin/master' into LoginSignUpAct ... # Conflicts: # app/src/main/AndroidManifest.xml # app/src/main/res/values/strings.xml k-kimoto committed on 1 Jun 2023
	906b699 Browse files » ShopActivityを作成 k-fujii committed on 1 Jun 2023
2023-05-30	b770bae Browse files » SignUpActivity ... LoginActivity 作成 yugo-asano committed on 30 May 2023
	1e4fd07 Browse files » 軽くviewを触った k-suzuki committed on 30 May 2023
	172c2cd Browse files » Merge branch 'master' into MyPage ... # Conflicts: # app/src/main/res/values/strings.xml k-suzuki committed on 30 May 2023
	fcad29a Browse files » mypageアクティヴィティーを作成した k-suzuki committed on 30 May 2023
	e196b80 Browse files » masterからマージ k-fujii committed on 30 May 2023
	bbd4dd1 Browse files » Merge branch 'master' into post ... # Conflicts: # .idea/misc.xml # app/src/main/res/values/strings.xml k-fujii committed on 30 May 2023