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

Implement profile follow approvals #236

Merged

Conversation

markocic
Copy link
Collaborator

No description provided.

AleksandarIlic and others added 30 commits October 21, 2024 18:41
Co-authored-by: Aleksandar Ilic <[email protected]>
AleksandarIlic and others added 25 commits November 28, 2024 15:09
# Conflicts:
#	app/src/main/kotlin/net/primal/android/explore/home/people/ExplorePeopleViewModel.kt
* Implement MediaItemScreen to render given media_url
* Update advanceUntilIdleAndDelay to delay on current dispatcher
* Run PR workflow on "macos-latest"

---------

Co-authored-by: Aleksandar Ilic <[email protected]>
* Update PR workflow to use compile instead assemble;
* Add caching gradle to speed up builds in release and PR workflows;
* Update checkout and setup-java to v4 in PR workflow;
* Remove matrix strategy and run tests only on AOSP build in PR workflow;
# Conflicts:
#	app/src/main/kotlin/net/primal/android/explore/home/people/ExplorePeopleViewModel.kt
#	app/src/main/kotlin/net/primal/android/profile/details/ProfileDetailsContract.kt
#	app/src/main/kotlin/net/primal/android/profile/details/ProfileDetailsViewModel.kt
@AleksandarIlic AleksandarIlic changed the base branch from main to feature/follow-approvals November 28, 2024 15:11
@AleksandarIlic AleksandarIlic merged commit 8e1bae2 into feature/follow-approvals Nov 28, 2024
1 check passed
@markocic markocic deleted the feature/profile-follow-approvals branch December 12, 2024 14:00
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.

2 participants