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.

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

Backport hot fixes to develop branch #4684

Merged
merged 13 commits into from
Jan 8, 2024
Merged

Backport hot fixes to develop branch #4684

merged 13 commits into from
Jan 8, 2024

Conversation

tuxpiper
Copy link
Member

This pull request makes the following changes:

Test checklist:

  • [ ]

  • I certify that I ran my checklist

Fixes ushahidi/platform# .

Ping @ushahidi/platform

@tuxpiper
Copy link
Member Author

@ushahidlee could you please look into solving the merge conflict?

Copy link
Contributor

@ushahidlee ushahidlee left a comment

Choose a reason for hiding this comment

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

Looks fine to me. Tested the lock file and everything builds successfully.

@ushahidlee ushahidlee merged commit 92c485f into develop Jan 8, 2024
4 checks passed
tuxpiper added a commit that referenced this pull request Jan 15, 2024
* Update UpdatePostCommand.php (#4672)

* Update UpdatePostCommand.php

Since we're making an update, there's no reason to updating the created column.

* fix: ensure Timestamp is correct before updating entity

* chore: use laravel config to retrieve settings in V5 config handler

* refactor: update eloquent repo for category

* chore: work on the places we use the data source label

* chore: fix lint in EloquentPostRepository

* test: resolve failing test for V3 endpoints

* chore: update create post command to record post source

* fix lint

* fix: fallback to null when user attribute value is undefined

* fix config data permission

* fix the issue of returned fromated created value

* Update usersetting to accept config value as array

---------

Co-authored-by: Wisdom Ebong <30173059+webong@users.noreply.github.com>
Co-authored-by: Wisdom Ebong <wisdom@ushahidi.com>
Co-authored-by: Mh-Asmi <mnaasmi@gmail.com>
Co-authored-by: ushahidlee <152860706+ushahidlee@users.noreply.github.com>
@Mh-Asmi Mh-Asmi deleted the release/2023.46 branch May 28, 2024 06:38
@Mh-Asmi Mh-Asmi restored the release/2023.46 branch May 28, 2024 06:38
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.

None yet

4 participants