nitta-lab-2023/NemophilaClient

Fork: 0

nitta-lab-2023 / NemophilaClient

History for NemophilaClient / app / src / main / res / layout

2023-10-03	dde2c71 Browse files » Merge branch 'master' into MyPageEditor_Icon ... # Conflicts: # .idea/misc.xml # app/src/main/java/com/example/nemophila/resources/AccountsRest.java k-suzuki committed on 3 Oct 2023
	084bf95 Browse files » 仮 k-suzuki committed on 3 Oct 2023
	7a817de Browse files » Merge pull request #246 from nitta-lab-2023/not_friend_pin ... ジャンルとフレンド　フィルター設定・ピンの表示非表示の切り換え常盤　凌 committed on 3 Oct 2023
2023-09-28	bff7356 Browse files » ジャンルとフレンド　フィルター設定・ピンの表示非表示の切り換え t-nagao committed on 28 Sep 2023
	06bc7b6 Browse files » icon k-suzuki committed on 28 Sep 2023
	8e8de26 Browse files » Merge pull request #244 from nitta-lab-2023/requesting ... Requesting Maehara Hiroki committed on 28 Sep 2023
	bf2fec0 Browse files » Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2023/NemophilaClient ... Conflicts: .idea/deploymentTargetDropDown.xml app/src/main/java/com/example/nemophila/RequestingActivity.java t-nagao committed on 28 Sep 2023
2023-09-26	02ca49d Browse files » Merge pull request #235 from nitta-lab-2023/PostAct ... PostAct Shinnosuke Iyonaga committed on 26 Sep 2023
2023-09-21	c82ed35 Browse files » Merge branch 'activity' ... # Conflicts: # .idea/deploymentTargetDropDown.xml t-nagao committed on 21 Sep 2023
	9c781a1 Browse files » FriendActivityとRequestingActivityを統一して表示できるように変更しました。 t-nagao committed on 21 Sep 2023
	58d388c Browse files » 途中経過 ... 使うかどうか未定。 t-nagao committed on 21 Sep 2023
2023-07-25	b763bd4 Browse files » Merge pull request #224 from nitta-lab-2023/MPA ... MyPageActivity、完成まであと数歩！！6 常盤　凌 committed on 25 Jul 2023
	bcc695f Browse files » MyPageActivity、完成まであと数歩！！6 d-matsuura committed on 25 Jul 2023
	df0b371 Browse files » Merge pull request #219 from nitta-lab-2023/postAct_genre ... PostAct genre 常盤　凌 committed on 25 Jul 2023
	b73f010 Browse files » PostActivityでジャンルのプルダウンに変更 k-kimoto committed on 25 Jul 2023
	8eafa70 Browse files » Merge branch 'master' into friendFragment ... # Conflicts: # .idea/deploymentTargetDropDown.xml t-nagao committed on 25 Jul 2023
	f44e72c Browse files » DialogFragmentで良い感じのデザインにしたい t-nagao committed on 25 Jul 2023
	df8437c Browse files » PostActivityで写真の送信 ... TestActivityで写真の受信テスト k-kimoto committed on 25 Jul 2023
	4d5b396 Browse files » ShopActivityの更新 k-fujii committed on 25 Jul 2023
	ff9da6b Browse files » ShopActivityの更新 k-fujii committed on 25 Jul 2023
	62f64e7 Browse files » Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2023/NemophilaClient into PostAct k-kimoto committed on 25 Jul 2023
2023-07-20	0b345bb Browse files » FriendViewModelを作った k-suzuki committed on 20 Jul 2023
	3f6cb9c Browse files » Merge branch 'master' into friendLayout ... # Conflicts: # .idea/deploymentTargetDropDown.xml t-nagao committed on 20 Jul 2023
	72b3129 Browse files » レイアウトを少しいじりました t-nagao committed on 20 Jul 2023
	4830983 Browse files » Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2023/NemophilaClient into PostAct k-kimoto committed on 20 Jul 2023
	7a42108 Browse files » Merge pull request #198 from nitta-lab-2023/MPA ... MPA 松居都央佳 committed on 20 Jul 2023
	e04cc35 Browse files » Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2023/NemophilaClient into PostAct k-kimoto committed on 20 Jul 2023
2023-07-18	3db2202 Browse files » PostActivityで写真選択が出来るようになりました k-kimoto committed on 18 Jul 2023
	2e1960a Browse files » Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2023/NemophilaClient into MPA d-matsuura committed on 18 Jul 2023
	d881ced Browse files » Merge remote-tracking branch 'origin/master' into fillter ... # Conflicts: # .idea/deploymentTargetDropDown.xml r-nishimura committed on 18 Jul 2023