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 from dev branch #611

Merged
merged 92 commits into from
Aug 25, 2024
Merged

Merge from dev branch #611

merged 92 commits into from
Aug 25, 2024

Conversation

Olat-nji
Copy link
Contributor

​

Description

​

Related Issue (Link to Github issue)

​

Motivation and Context

​

How Has This Been Tested?

​

Screenshots (if appropriate - Postman, etc):

​

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)
    ​

Checklist:

  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • All new and existing tests passed.

RaphAlemoh and others added 30 commits August 15, 2024 07:20
@RaphAlemoh
fix: checking sending email template
73d3073
@RaphAlemoh
Merge branch 'dev' of https://github.com/hngprojects/hng_boilerplate_…
8e2a7c2 
…php_laravel_web into feat/list-all-faqs
@RaphAlemoh
Merge branch 'dev' of https://github.com/hngprojects/hng_boilerplate_…
bcaaf4c 
…php_laravel_web into feat/list-all-faqs
@RaphAlemoh
fix: resolve conflit in api.php
5a47aa8
@RaphAlemoh
fix: resolve conflict in api file
1d70ee0
@RaphAlemoh
Merge branch 'dev' of https://github.com/hngprojects/hng_boilerplate_…
ef6bf14 
…php_laravel_web into feat/list-all-faqs
@sparkybug
fix:refactoring-blog-creation-endpoint-to-meet-c#-standard
f23f842
@Olat-nji
added test script
5a422b5
@Olat-nji
fix:Fixed workflow for postman api tests
7a159e2
@Olat-nji
Merge branch 'hngprojects:dev' into dev
3fbab9c
@tulbadex
Merge pull request #552 from sparkybug/fix/refactoring-blog-creation-…
caa2033 
…endpoint-to-meet-c#-standard

fix: refactoring blog creation endpoint to meet C# standard
@timiajayi
Merge pull request #553 from Olat-nji/dev
2973bae 
fix: added script parsing post man tests
@abdielbytes
fix: update user profile
e91586b
@abdielbytes
fix: notification route to match fe
0e55ec1
@abdielbytes
fix
33aba37
@sparkybug
fix:refactoring-user-deletion-endpoint-to-meet-c#-standard
ffd57df
@Muhammad235
Merge https://github.com/Muhammad235/hng_boilerplate_php_laravel_web …
28d21bd 
…into update/api-status-post-command
@Muhammad235
update: get user notifucation payload
871480f
@ezeanyimhenry
fix: Roles and Permissions migrations
871a99d
@ezeanyimhenry
fix: Roles and permissions relationship
3d73421
@ezeanyimhenry
fix: roles and permissions controllers and tests
4dc1df9
@abdielbytes
Merge branch 'hngprojects:dev' into newsletter
42344e1
@ezeanyimhenry
Merge branch 'dev' of https://github.com/ezeanyimhenry/hng_boilerplat…
779fcb7 
…e_php_laravel_web into fix/roles-and-permissions
@abdielbytes
refactor: clear all notifications
b33328c
@ezeanyimhenry
fix: roles test
ec29a00
@ezeanyimhenry
fix: BlogController Image Path
1cf2abe
@Dev-Tonia
Merge pull request #559 from ezeanyimhenry/fix/roles-and-permissions
0ad7145 
Fix/: roles and permissions
@sparkybug
Merge branch 'dev' of https://github.com/hngprojects/hng_boilerplate_…
f52edf5 
…php_laravel_web into feat/fetch-a-role-in-an-organisation-endpoint
@Dev-Tonia
Merge pull request #554 from abdielbytes/abdiel
6769adf 
fix: update user profile
@sparkybug
Merge branch 'dev' of https://github.com/hngprojects/hng_boilerplate_…
eecbe24 
…php_laravel_web into fix/refactoring-user-deletion-endpoint-to-meet-c#-standard
bamo100 and others added 29 commits August 24, 2024 20:40
@bamo100
Merge branch 'dev' of https://github.com/hngprojects/hng_boilerplate_…
d93064a 
…php_laravel_web into storejob
@tulbadex
fix: added product search to use product name
14fac9a
@amowogbaje
fix: PRODUCT delete endpoint
ddafeda
@timiajayi
Merge pull request #583 from tulbadex/fix/search-product-by-names
b5f7251 
fix: added product search to use product name
@amowogbaje
Merge branch 'dev' of https://github.com/hngprojects/hng_boilerplate_…
f79e351 
…php_laravel_web into fix/product-delete-endpoint
@Cytochrome123
fix: added comment to blog details
24465c4
@timiajayi
Merge pull request #582 from bamo100/deleteplan
a9abcae 
[FIX](PHP) Refactoring Billing Plan API Endpoint for  Deleting a Billing Plan
@timiajayi
Merge pull request #585 from Goldengide/fix/product-delete-endpoint
4384119 
fix: PRODUCT delete endpoint
@tulbadex
feat: added update of subscription plan
1f59b67
@timiajayi
Merge pull request #591 from Cytochrome123/fix/show-blog
ab622f2 
fix: added comment to blog details
@tulbadex
feat: added update of subscription plan
eef9949
@tulbadex
feat: added update of subscription plan
ee8d754
@Cytochrome123
fix: included comment with blogs data on retrieval
45d6ec4
@tulbadex
fix: fix remove user from organization endpoint
bf1ec3c
@timiajayi
Merge pull request #594 from tulbadex/feat/update-billing-plan
d6f2a45 
Feat: update billing plan
@timiajayi
Merge pull request #597 from tulbadex/fix/remove-user-from-org
7dbcff8 
fix: fix remove user from organization endpoint
@timiajayi
Merge pull request #595 from Cytochrome123/fix/get-blogs-with-comment
abfb116 
fix: included comment with blogs data on retrieval
@RaphAlemoh
Merge branch 'dev' of https://github.com/hngprojects/hng_boilerplate_…
27cc0af 
…php_laravel_web into fix/payment-plans-retrieval
@Olat-nji
Merge remote-tracking branch 'origin/staging' into dev
578c2da
@tulbadex
Merge pull request #605 from hngprojects/fix/ApiStatusMergeConlict
3762dad 
Fix/api status merge conlict
@Olat-nji
fix: fixed file name issue
9d789e7
@Olat-nji
fix: fixed artisan for postman test
f6f0c24
@RaphAlemoh
Merge branch 'dev' of https://github.com/hngprojects/hng_boilerplate_…
e18da50 
…php_laravel_web into fix/return-correct-id-for-article
@RaphAlemoh
fix: return correct article id after creation
19027f4
@RaphAlemoh
fix: modify get all articles response same as c# docs get all articles
e290a74
@tulbadex
Merge pull request #601 from RaphAlemoh/fix/return-correct-response-f…
36dfd47 
…or-all-articles

fix:return correct response for all articles
@tulbadex
Merge pull request #606 from Olat-nji/dev
c3e7eab 
fix: fixed file name issue
@Muhammad235
fix/api-status-update
04cef2c
@tulbadex
Merge pull request #612 from Muhammad235/feat/api-status-update
d1af577 
fix: api-status-update
@timiajayi timiajayi merged commit c101a19 into staging Aug 25, 2024
3 of 4 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.