Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge to Staging from dev #343

Merged
merged 624 commits into from
Jul 22, 2024
Merged

Merge to Staging from dev #343

merged 624 commits into from
Jul 22, 2024

Conversation

shalomtaiwo
Copy link
Contributor

@shalomtaiwo shalomtaiwo commented Jul 22, 2024 •
edited
Loading

Description

Closes #issue_number_here

Changes proposed

What were you told to do?

What did you do?

Check List (Check all the applicable boxes)

🚨Please review the contribution guideline for this repository.

  • My code follows the code style of this project.
  • This PR does not contain plagiarized content.
  • The title and description of the PR is clear and explains the approach.
  • I am making a pull request against the dev branch (left side).
  • My commit messages styles matches our requested structure.
  • My code additions will fail neither code linting checks nor unit test.
  • I am only making changes to files I was requested to.

Screenshots/Videos

ikennarichard and others added 30 commits July 21, 2024 15:56
@ikennarichard
Merge branch 'master' of https://github.com/ikennarichard/hng_boilerp…
b789665 
…late_remix into feat/HNG-5-create-mobile-side-navigation-bar
@SAGHEDEV
Email template to activate account 4
06508b3
@Kalebb12
Merge branch 'feat/HNG-119-create-privacy-page' of https://github.com…
96f42a1 
…/Kalebb12/hng_boilerplate_remix into feat/HNG-119-create-privacy-page
@Kalebb12
fix route
16e447a
@Justjoseph0
fix:i create a page folder and added about.tsx then i added the image…
d7320be 
…s i need into the public/images folder i also imported nav and footer components
@chumex412
Merge pull request #257 from monyasau/feat/HNG-8-implement-delete-mem…
7a2361a 
…ber-modal

feat: delete member modal
@Justjoseph0
Merge branch 'hngprojects:dev' into feat/HNG-35-about-page
e0a8308
@JO-YE
Merge branch 'hngprojects:dev' into feat/13-organization-settings-rol…
9615387 
…es-and-permission-page-implement-create-role-modal
@toonami2907
remove
3c7f069
@abel-otegbola
feat: move the roles page to match sidebar link
a9ef98b
@abel-otegbola
Merge branch 'dev' of https://github.com/hngprojects/hng_boilerplate_…
6a5e717 
…remix into 12-feat-organization-settings-Roles-and-permission-page-Implement-active-permissions-component
@SAGHEDEV
Email template to activate account - SOLVING PNPM LINT
fc278e9
@toonami2907
accept all styles
1bd5fb2
@oyin-systems
Merge branch 'dev' of https://github.com/hngprojects/hng_boilerplate_…
b49df89 
…remix into feat/HNG-17-success-page-for-magic-link
@oyin-systems
follow routing file
27505a9
@fee-sah-yor
create email template skeleton
32c492e
@fee-sah-yor
create-payment-receipt-template
72c281a
@Adelosoye-dev
Merge branch 'hngprojects:dev' into feat/49-create-dialog-box-component
856d45e
@oyin-systems
remove link from home page
38a5505
@owoadehabeeb04
feat: HNG #65 email-templates-subscription-renewal-disabled
8f07644
@owoadehabeeb04
fix conflicts
7cdfedd
@shalomtaiwo
Merge pull request #228 from atonya-bravin/deactivation_email_template
2a68975 
feat/HNG-71-account-deactivation-by-user-email-template
@oluwakoredee
fix: mobile responsiveness
61f3323
@psalm987
chore: add neutral colors
c0ae695
@chiefEbube
fixed lint issue and file name
99c4154
@psalm987
chore: remove package-lock file
9cf01f1
@shalomtaiwo
Merge pull request #285 from oyin-systems/feat/HNG-17-success-page-fo…
2219bed 
…r-magic-link

feat/HNG-17-success-page-for-magic-link
@shalomtaiwo
Merge pull request #259 from abel-otegbola/12-feat-organization-setti…
280d89d 
…ngs-Roles-and-permission-page-Implement-active-permissions-component

feat: create roles and permissions page permission
@Maryjanechukelu
prettier reset
86fce89
@owoadehabeeb04
fix git conflicts
dac2927
OWK50GA and others added 26 commits July 22, 2024 05:46
@OWK50GA
Merge remote-tracking branch 'upstream/dev'
79d4c9d
@abdulmalikyusuf
Merge branch 'dev' of https://github.com/hngprojects/hng_boilerplate_…
a03205d 
…remix into feat/50-create-FAQ-page
@OWK50GA
trying to resolve conflict still
6606c07
@OWK50GA
pnpm test keeps failing because of vitest
f74a5c3
@Samdevtechnology
Merge branch 'dev' into feat/HNG-37-create-landing-page
561b342
@Samdevtechnology
chore: fix lint error
b1d0cec
@Samdevtechnology
chore: fix lint error
8578ecd
@shalomtaiwo
Merge pull request #336 from Samdevtechnology/feat/HNG-37-create-land…
1ca4dda 
…ing-page

Feat/hng 37 create landing page
@shalomtaiwo
Merge pull request #337 from codeBigInt/feat-#39-password-setting
baca3f4 
Feat #39 password setting
@shalomtaiwo
Merge pull request #330 from OWK50GA/master
ea4adc6 
Pricing Payment Page
@shalomtaiwo
Merge pull request #329 from seshto13/feat/HNG-16-Implement-login-page
83c2be7 
Feat/hng 16 implement login page
@shalomtaiwo
Merge pull request #306 from abdulmalikyusuf/feat/50-create-FAQ-page
f8b3374 
feat: created the FAQ page and integrated question form component
@shalomtaiwo
Merge pull request #291 from olanrewajuyusuf/feature/HNG-146-create-h…
2f4c9ea 
…elp-center-page

feature: Create and Implement the Help Center Page
@shalomtaiwo
fix lint issue
cd10a90
@Samadeen
Merge pull request #339 from hngprojects/fix-lint-issue
6b1d384 
fix lint issue
@shalomtaiwo
fix page not found
5562867
@Samadeen
Merge pull request #340 from hngprojects/fix-lint-issue
5d14e73 
fix page not found
@shalomtaiwo
Merge pull request #292 from ChibuzoEkwue/feat/159-create-hero-sectio…
ccf0ab0 
…n-waitlist-page

hero section for the waitlist page
@Samdevtechnology
fix: landing page layout
a072e15
@Samdevtechnology
Merge branch 'hngprojects:dev' into feat/HNG-37-create-landing-page
c6f88cd
@shalomtaiwo
Merge pull request #341 from Samdevtechnology/feat/HNG-37-create-land…
61d13ca 
…ing-page

Feat/hng 37 create landing page
@Samdevtechnology
fix: landing page slider
00c7644
@Samdevtechnology
Merge branch 'feat/HNG-37-create-landing-page' of https://github.com/…
73720f1 
…Samdevtechnology/hng_boilerplate_remix into feat/HNG-37-create-landing-page
@Samdevtechnology
Merge branch 'hngprojects:dev' into feat/HNG-37-create-landing-page
4b324a9
@Victor752-byte
feat: notification-card-component
352f08c
@shalomtaiwo
Merge pull request #342 from Samdevtechnology/feat/HNG-37-create-land…
9abe1d4 
…ing-page

Feat/hng 37 create landing page
@shalomtaiwo shalomtaiwo merged commit 9ade68c into staging Jul 22, 2024
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.