Skip to content

Conversation

maito1201
Copy link
Contributor

コンフリクト解消しつつmainブランチのコミットを取り込み

@maito1201 maito1201 requested a review from snaka February 23, 2023 03:25
@maito1201 maito1201 self-assigned this Feb 23, 2023
Copy link
Member

@snaka snaka left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ありがとうございmす!

@maito1201 maito1201 merged commit 3d3ff1f into develop Feb 23, 2023
maito1201 added a commit that referenced this pull request Apr 1, 2023
* [fix] Fix date for closing application from Sat to Tue (#65)

* feat: add GitHub template (#68)

* fix: template (#69)

* fix: file structure (#70)

* merge main into develop (#72)

* [fix] Fix date for closing application from Sat to Tue (#65) (#66)

* feat: community booth section (#67)

* feat: specified commercial transaction (#71)

* feat: specified commercial transaction

* fix typo

* fix: i18n locale

* fix: english explanation

---------

Co-authored-by: Taiga KIYOKAWA <[email protected]>

* Merge main into develop (#169)

* [fix] Fix date for closing application from Sat to Tue (#65) (#66)

* feat: community booth section (#67)

* feat: specified commercial transaction (#71)

* feat: specified commercial transaction

* fix typo

* fix: i18n locale

* fix: english explanation

* feat: add information about CfP result (#165)

---------

Co-authored-by: Taiga KIYOKAWA <[email protected]>

* feat: useSessionize (#171)

* feat: useSettionize

* add EOL

* スポンサー(パートナー)ページの実装 (#170)

* feat: partner page

* SAMPLE json / images

* fix: `desc` to `description`

* fix: simplify prop type name

* fix: `desc` to `description`

* fix: extract params from context

* feat: header with link (#172)

* chore: Remove CommunityBoothSection from PageTop (#174)

* chore: Temporarily change links of Header to the links to HTML pages build by Sessionize (#173)

* chore: Remove `next/link` temporary for forwarding to HTML pages build by Sessionize

* chore: Temporarily change links of Header to the links to HTML pages build by Sessionize

* fix(HeaderMenu): Use `next/link` when href is `/`

* Proposal feat: hide home label from header (#175)

* feat: hide home label from header

* fix header menu

* comment out unused import

---------

Co-authored-by: Taiga KIYOKAWA <[email protected]>
Co-authored-by: sivchari <[email protected]>
Co-authored-by: Shinji Nakamatsu <[email protected]>
maito1201 added a commit that referenced this pull request Apr 2, 2023
* [fix] Fix date for closing application from Sat to Tue (#65)

* feat: add GitHub template (#68)

* fix: template (#69)

* fix: file structure (#70)

* merge main into develop (#72)

* [fix] Fix date for closing application from Sat to Tue (#65) (#66)

* feat: community booth section (#67)

* feat: specified commercial transaction (#71)

* feat: specified commercial transaction

* fix typo

* fix: i18n locale

* fix: english explanation

---------

Co-authored-by: Taiga KIYOKAWA <[email protected]>

* Merge main into develop (#169)

* [fix] Fix date for closing application from Sat to Tue (#65) (#66)

* feat: community booth section (#67)

* feat: specified commercial transaction (#71)

* feat: specified commercial transaction

* fix typo

* fix: i18n locale

* fix: english explanation

* feat: add information about CfP result (#165)

---------

Co-authored-by: Taiga KIYOKAWA <[email protected]>

* feat: useSessionize (#171)

* feat: useSettionize

* add EOL

* スポンサー(パートナー)ページの実装 (#170)

* feat: partner page

* SAMPLE json / images

* fix: `desc` to `description`

* fix: simplify prop type name

* fix: `desc` to `description`

* fix: extract params from context

* feat: header with link (#172)

* chore: Remove CommunityBoothSection from PageTop (#174)

* chore: Temporarily change links of Header to the links to HTML pages build by Sessionize (#173)

* chore: Remove `next/link` temporary for forwarding to HTML pages build by Sessionize

* chore: Temporarily change links of Header to the links to HTML pages build by Sessionize

* fix(HeaderMenu): Use `next/link` when href is `/`

* Proposal feat: hide home label from header (#175)

* feat: hide home label from header

* fix header menu

* comment out unused import

* fix: remove community booth section (#177)

* feat: community booth section (#67)

* fix: remove community booth section

* chore: add eslint rule (#178)

* feat: community booth section (#67)

* fix: remove community booth section

* chore: add eslint rules

---------

Co-authored-by: Taiga KIYOKAWA <[email protected]>
Co-authored-by: sivchari <[email protected]>
Co-authored-by: Shinji Nakamatsu <[email protected]>
taigakiyokawa added a commit that referenced this pull request Apr 2, 2023
* [fix] Fix date for closing application from Sat to Tue (#65)

* feat: add GitHub template (#68)

* fix: template (#69)

* fix: file structure (#70)

* merge main into develop (#72)

* [fix] Fix date for closing application from Sat to Tue (#65) (#66)

* feat: community booth section (#67)

* feat: specified commercial transaction (#71)

* feat: specified commercial transaction

* fix typo

* fix: i18n locale

* fix: english explanation

---------

Co-authored-by: Taiga KIYOKAWA <[email protected]>

* Merge main into develop (#169)

* [fix] Fix date for closing application from Sat to Tue (#65) (#66)

* feat: community booth section (#67)

* feat: specified commercial transaction (#71)

* feat: specified commercial transaction

* fix typo

* fix: i18n locale

* fix: english explanation

* feat: add information about CfP result (#165)

---------

Co-authored-by: Taiga KIYOKAWA <[email protected]>

* feat: useSessionize (#171)

* feat: useSettionize

* add EOL

* スポンサー(パートナー)ページの実装 (#170)

* feat: partner page

* SAMPLE json / images

* fix: `desc` to `description`

* fix: simplify prop type name

* fix: `desc` to `description`

* fix: extract params from context

* feat: header with link (#172)

* chore: Remove CommunityBoothSection from PageTop (#174)

* chore: Temporarily change links of Header to the links to HTML pages build by Sessionize (#173)

* chore: Remove `next/link` temporary for forwarding to HTML pages build by Sessionize

* chore: Temporarily change links of Header to the links to HTML pages build by Sessionize

* fix(HeaderMenu): Use `next/link` when href is `/`

* Proposal feat: hide home label from header (#175)

* feat: hide home label from header

* fix header menu

* comment out unused import

* fix: remove community booth section (#177)

* feat: community booth section (#67)

* fix: remove community booth section

* chore: add eslint rule (#178)

* feat: community booth section (#67)

* fix: remove community booth section

* chore: add eslint rules

* chore: Close sponsors application (#180)

* chore: Remove the button for application to sponsors due to be already closed

* chore: Fix arrangement of Gophers due to remove the button

* chore: Change description to "Sponsors application has been closed.~"

---------

Co-authored-by: sivchari <[email protected]>
Co-authored-by: maito1201 <[email protected]>
Co-authored-by: Shinji Nakamatsu <[email protected]>
@taigakiyokawa taigakiyokawa deleted the merge_main_into_develop branch May 1, 2023 09:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants