animationの詳細画面に複数の作成者での対応 #282

Closed r-takeuchi wants to merge 15 commits into nitta-lab-2021:master from nitta-lab-2021:animationDetail

2021-11-04	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
	2022145 Browse files » animationの詳細画面に複数の作成者での対応 h-fuji committed on 4 Nov 2021
	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
	e5b8527 Browse files » Merge pull request #279 from nitta-lab-2021/ViewPager2 ... 確認しました。 michishita shouma 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
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
	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
	2f09629 Browse files » [update]一時退避 k-fujii committed on 2 Nov 2021