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

weekly promotion of develop to main #399

Merged
merged 16 commits into from Oct 12, 2023
Merged

weekly promotion of develop to main #399

merged 16 commits into from Oct 12, 2023

Conversation

github-actions[bot]
Copy link
Contributor

calebjacob and others added 16 commits October 4, 2023 12:21
* #517 Report a post and first pass of new moderation page.

* #517 Moderate comment

* Update src/Moderation/Moderator.jsx

Co-authored-by: Dmitriy <34593263+shelegdmitriy@users.noreply.github.com>

* PR comments updates

* Formatting

---------

Co-authored-by: Dmitriy <34593263+shelegdmitriy@users.noreply.github.com>
chore: new component to display our cookie policy
* Add note about minimal required iOS version for notifications

* Add missing styles

* Add link to post about notifications
…159)

* Add confirmation modal on flagging account for moderation

* Add onConfirm logic

* Replace modal with DIG.Dialog

* Apply formatting

* Fix modal actions

* Change structure for flag account

* Change report structure

* Simplify `Social.set`

* Cleanup and resolving comments

* Apply formatting

* Add close modal button

* Cleanup

* Fix commited data

* Moderation index format

---------

Co-authored-by: Gabe Hamilton <gabe@near.org>
Copy link
Collaborator

@calebjacob calebjacob left a comment

Choose a reason for hiding this comment

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

Everything should be good to go here. The new home page changes won't affect production yet since our gateway is still using the hardcoded React pages. I'll defer to you @charleslavon if you want to merge or not.

@charleslavon charleslavon merged commit c193d8a into main Oct 12, 2023
3 checks passed
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