WIP: post editing #103

Closed
nbsp wants to merge 48 commits from nbsp/akkoma:feat/editing into develop
Contributor

closes #10
related to AkkomaGang/pleroma-fe#57
taken from https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3678

hasn't been merged on pleroma yet, but all threads have been solved and there hasn't been any activity in a week

seems to work, mostly trusting tusooa on this one again, but i don't particularly trust my merge conflict solving skills. worth taking a look.

closes #10 related to AkkomaGang/pleroma-fe#57 taken from https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3678 hasn't been merged on pleroma yet, but all threads have been solved and there hasn't been any activity in a week *seems* to work, mostly trusting tusooa on this one again, but i don't particularly trust my merge conflict solving skills. worth taking a look.
Author
Contributor

1 failure

gdi

>1 failure gdi

oh that test is somewhat erratic, i'll rerun it

oh that test is somewhat erratic, i'll rerun it
nbsp force-pushed feat/editing from 4a06d6f6cc to f21b912ca5 2022-07-23 18:07:46 +00:00 Compare
nbsp force-pushed feat/editing from f21b912ca5 to 27abc58aa0 2022-07-23 19:06:36 +00:00 Compare
nbsp changed title from post editing to WIP: post editing 2022-07-25 09:56:45 +00:00
Author
Contributor

it seems this is still in bugfixing upstream

it seems this is still in bugfixing upstream
nbsp force-pushed feat/editing from 95e67aec25 to 1dfbf9edb6 2022-07-27 12:05:29 +00:00 Compare
Author
Contributor

need help cherry-picking commit 82c8fc1ede
the merge conflicts seem too drastic, something big changed and i don't know enough elixir to figure it out

need help cherry-picking commit https://git.pleroma.social/tusooa/pleroma/-/commit/82c8fc1ede26837d024ecc2fd1231c6d2a3c2c3e the merge conflicts seem too drastic, something big changed and i don't know enough elixir to figure it out
nbsp added 1 commit 2022-07-27 12:52:12 +00:00
Make NoEmptyPolicy work with Update
Some checks are pending
ci/woodpecker/push/docs Pipeline is pending
ci/woodpecker/push/release Pipeline is pending
ci/woodpecker/push/test Pipeline is pending
ci/woodpecker/pr/docs Pipeline is pending
ci/woodpecker/pr/release Pipeline is pending
ci/woodpecker/pr/test Pipeline is pending
32baa9b9f0
Author
Contributor

need help cherry-picking commit 82c8fc1ede
the merge conflicts seem too drastic, something big changed and i don't know enough elixir to figure it out

cc @floatingghost i added the rebased commit, but as mentioned on IRC this reverts one of your commits
if you wanna have another crack at this, or if this is fine to merge for now, lmk

> need help cherry-picking commit https://git.pleroma.social/tusooa/pleroma/-/commit/82c8fc1ede26837d024ecc2fd1231c6d2a3c2c3e > the merge conflicts seem too drastic, something big changed and i don't know enough elixir to figure it out cc @floatingghost i added the rebased commit, but as mentioned on IRC this reverts one of your commits if you wanna have another crack at this, or if this is fine to merge for now, lmk
First-time contributor

with mastodon rolling this out now, we should probably finish up this pr and merge

with mastodon rolling this out now, we should probably finish up this pr and merge

superseded by #202

superseded by #202
floatingghost closed this pull request 2022-09-06 19:12:22 +00:00
floatingghost referenced this pull request from a commit 2022-09-06 19:24:04 +00:00
Some checks are pending
ci/woodpecker/push/docs Pipeline is pending
ci/woodpecker/push/release Pipeline is pending
ci/woodpecker/push/test Pipeline is pending
ci/woodpecker/pr/docs Pipeline is pending
ci/woodpecker/pr/release Pipeline is pending
ci/woodpecker/pr/test Pipeline is pending

Pull request closed

Sign in to join this conversation.
No description provided.