nitta-lab-2021/org.ntlab.acanthus

Fork: 0

nitta-lab-2021 / org.ntlab.acanthus_client

History for org.ntlab.acanthus_client / app / src / main

2021-11-04	2b20484 Browse files » Merge remote-tracking branch 'origin/master' h-fuji committed on 4 Nov 2021
	51b73e6 Browse files » Merge pull request #285 from nitta-lab-2021/User&MyPageEdit ... 確認しました。 Ryo Takeuchi committed on 4 Nov 2021
	6cc7628 Browse files » Follow,FollowerのFragment化によるMyPageとUserPageの機能修正 s-michishita committed on 4 Nov 2021
	caf8dea Browse files » Merge remote-tracking branch 'origin/master' into animationDetail ... # Conflicts: # app/src/main/java/org/ntlab/acanthus_client/views/animation_detail/AnimationDetailActivity.java h-fuji committed on 4 Nov 2021
	12bd1f1 Browse files » animationの詳細画面に複数の作成者での対応 h-fuji committed on 4 Nov 2021
	9396938 Browse files » Merge branch 'animationDetail' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2021/org.ntlab.acanthus_client ... Conflicts: app/src/main/java/org/ntlab/acanthus_client/views/animation_detail/AnimationDetailActivity.java h-fuji committed on 4 Nov 2021
	2022145 Browse files » animationの詳細画面に複数の作成者での対応 h-fuji committed on 4 Nov 2021
2021-11-05	d5280b7 Browse files » Merge pull request #277 from nitta-lab-2021/LoginEdit ... LoginEdit 鈴木健太 committed on 5 Nov 2021
2021-11-04	6f66f89 Browse files » Merge pull request #281 from nitta-lab-2021/feature/get_pre_canvas ... LGTM DaisukeMatsuura committed on 4 Nov 2021
	14fb78d Browse files » [update]edited page thumbnail k-fujii committed on 4 Nov 2021
	7552883 Browse files » コンフリクトを修正 d-matsuura committed on 4 Nov 2021
	9049304 Browse files » Merge branch 'master' into ViewPager2 ... # Conflicts: # app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/MyPageFragment.java # app/src/main/java/org/ntlab/acanthus_client/views/userpage/UserPageActivity.java # app/src/main/java/org/ntlab/acanthus_client/views/userpage/followFollower/followList/FollowListFragment.java # app/src/main/java/org/ntlab/acanthus_client/views/userpage/followFollower/followerList/FollowerListFragment.java # app/src/main/res/layout/activity_follow_list.xml # app/src/main/res/layout/activity_follower_list.xml d-matsuura committed on 4 Nov 2021
	e8338d9 Browse files » 夢の横スワイプ d-matsuura committed on 4 Nov 2021
	2d42560 Browse files » UserPage及びMyPage関係の画面表示内容修正とフォロー、フォロワー人数の可視化(作品数追加) s-michishita committed on 4 Nov 2021
2021-11-03	39a1b5e Browse files » 一時保存 parsecmonkey committed on 3 Nov 2021
2021-11-03	ffdcea6 Browse files » ViewPager2を導入（フォローフォロワーをスワイプで移動したい） parsecmonkey committed on 3 Nov 2021
2021-11-02	ec15399 Browse files » [update]一応前のキャンバスを薄く表示できるように。サーバーに置かれた画像のバグを修正 k-fujii committed on 2 Nov 2021
2021-11-02	a8c5b92 Browse files » UserPage及びMyPage関係の画面表示内容修正とフォロー、フォロワー人数の可視化 s-michishita committed on 2 Nov 2021
2021-11-03	8d257ec Browse files » Merge pull request #276 from nitta-lab-2021/LoginEdit ... 確認しました fujii kouta committed on 3 Nov 2021
	434545b Browse files » Merge pull request #275 from nitta-lab-2021/fix_update ... updateGallery関係を修正,あとログイン画面も mifunesyunya committed on 3 Nov 2021
	3b48967 Browse files » Merge pull request #274 from nitta-lab-2021/MyPageEdit ... MyPageFragment内の機能の追加及び不必要なテキスト削除 mifunesyunya committed on 3 Nov 2021
2021-11-02	a97a9dc Browse files » fix edit d-matsuura committed on 2 Nov 2021
	f0a975b Browse files » [update]マスターを吸ってます k-fujii committed on 2 Nov 2021
	98d1ba7 Browse files » Merge branch 'master' into feature/get_pre_canvas ... # Conflicts: # app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintActivity.java k-fujii committed on 2 Nov 2021
	a7f47f6 Browse files » Login関係の機能修正 s-michishita committed on 2 Nov 2021
	2f09629 Browse files » [update]一時退避 k-fujii committed on 2 Nov 2021
	f4fe0b5 Browse files » Merge branch 'master' into fix_update ... # Conflicts: # app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/home/HomeFragment.java d-matsuura committed on 2 Nov 2021
	ce5a22b Browse files » updateGallery関係を修正,あとログイン画面も d-matsuura committed on 2 Nov 2021
	a416ca7 Browse files » MyPageFragment内の機能の追加及び不必要なテキスト削除 s-michishita committed on 2 Nov 2021
	86c86f6 Browse files » editを修正 d-matsuura committed on 2 Nov 2021