nitta-lab-2023/NemophilaClient

Fork: 0

nitta-lab-2023 / NemophilaClient

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
	d5c3488 Browse files » Merge pull request #250 from nitta-lab-2023/accountViewModel_hiroki ... AccountViewModelにchangeIconの通信を加えました。 (未テスト) 和田暖哉 committed on 3 Oct 2023
	596cb4b Browse files » AccountViewModelにchangeIconの通信を加えました。 ... (未テスト) t-nagao committed on 3 Oct 2023
	881e17a Browse files » Merge pull request #249 from nitta-lab-2023/ShopActivity ... ShopActivity Maehara Hiroki committed on 3 Oct 2023
	7112337 Browse files » Merge remote-tracking branch 'origin/testFrendsViewModel' into ShopActivity k-fujii committed on 3 Oct 2023
	f53e313 Browse files » Merge branch 'master' into ShopActivity k-fujii committed on 3 Oct 2023
	b3cffba Browse files » FriendActivityの申請を送るところで、同じ人に申請を送ったときに重複する問題を修正 k-fujii 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
	af70221 Browse files » Merge branch 'master' into requesting k-fujii committed on 28 Sep 2023
	c93e564 Browse files » FriendActivityでフレンド申請を送れるように k-fujii committed on 28 Sep 2023
	2216cd3 Browse files » ジャンル　フィルター設定・ピンの表示非表示の切り換え t-nagao committed on 28 Sep 2023
	02cbe04 Browse files » Merge pull request #242 from nitta-lab-2023/not_friend_pin ... Not friend pin Katsumasa Watanabe committed on 28 Sep 2023
	952be10 Browse files » Merge branch 'master' into requesting ... # Conflicts: # app/src/main/java/com/example/nemophila/RequestingActivity.java k-fujii committed on 28 Sep 2023
	f1ede40 Browse files » RequestingActivityをFriendActivityへの移植 k-fujii committed on 28 Sep 2023
	b38761c Browse files » Merge pull request #241 from nitta-lab-2023/requesting ... Requesting Katsumasa Watanabe committed on 28 Sep 2023
	4cfee23 Browse files » Merge branch 'master' into not_friend_pin t-nagao committed on 28 Sep 2023
	e0b81f5 Browse files » Merge pull request #240 from nitta-lab-2023/Cahnge_ ... Shopのモデルを修正 Maehara Hiroki committed on 28 Sep 2023
	a4bde0e Browse files » Shopのモデルを修正 m-mifune committed on 28 Sep 2023
	0332d31 Browse files » Merge pull request #239 from nitta-lab-2023/Sample ... 新規投稿時のテキストを変更 Maehara Hiroki committed on 28 Sep 2023
	736ff8a Browse files » 新規投稿時のテキストを変更 m-mifune committed on 28 Sep 2023
	7b8ff92 Browse files » Merge pull request #238 from nitta-lab-2023/activity ... Activity Katsumasa Watanabe committed on 28 Sep 2023
	d85c62e Browse files » Merge branch 'master' into activity t-nagao 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
	b23d6a6 Browse files » FriendActivityとRequestingActivityを合併 t-nagao committed on 28 Sep 2023
2023-09-26	5ab3143 Browse files » フィルター設定でnemophilaのselectFriendにSetされるように t-nagao committed on 26 Sep 2023
2023-09-26	272aae7 Browse files » フィルターのフレンドリストを実際のフレンドが表示されるように変更 t-nagao committed on 26 Sep 2023