AkkomaGang/akkoma
AkkomaGang
/
akkoma
12
63
Fork 83
Code Issues 174 Pull Requests 15 Packages Projects 2 Releases 12 Wiki Activity

WIP: post editing #103

Closed
nbsp wants to merge 48 commits from nbsp/akkoma:feat/editing into develop
pull from: nbsp/akkoma:feat/editing
merge into: AkkomaGang:develop
Conversation 7 Commits 48 Files Changed 65 +3199 -129
nbsp commented 2022-07-23 17:07:10 +00:00
Contributor
Copy Link

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.
nbsp commented 2022-07-23 17:55:27 +00:00
Author
Contributor
Copy Link

1 failure

gdi

>1 failure gdi
floatingghost commented 2022-07-23 17:56:23 +00:00
Owner
Copy Link

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
nbsp commented 2022-07-25 09:57:01 +00:00
Author
Contributor
Copy Link

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
nbsp commented 2022-07-27 12:06:38 +00:00
Author
Contributor
Copy Link

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
ci/woodpecker/push/docs Pipeline is pending Details
ci/woodpecker/push/release Pipeline is pending Details
ci/woodpecker/push/test Pipeline is pending Details
ci/woodpecker/pr/docs Pipeline is pending Details
ci/woodpecker/pr/release Pipeline is pending Details
ci/woodpecker/pr/test Pipeline is pending Details
32baa9b9f0 Make NoEmptyPolicy work with Update
nbsp commented 2022-08-02 12:58:45 +00:00
Author
Contributor
Copy Link

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
Beefox commented 2022-09-05 00:20:21 +00:00
First-time contributor
Copy Link

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
floatingghost commented 2022-09-06 19:12:22 +00:00
Owner
Copy Link

superseded by #202

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

Pull request closed

Please reopen this pull request to perform a merge.
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
approved, awaiting change

   
bug

Something is not working

  
configuration

This requires config changes

  
documentation

This is about human-readable docs

  
duplicate

This issue or pull request already exists

  
enhancement

New feature

  
extremely low priority

   
feature request

Something new?

  
Fix it yourself

Support has been attempted

  
help wanted

Need some help

  
invalid

Something is wrong

  
mastodon_api

   
needs docs

   
needs tests

   
not a bug

   
planned

   
pleroma_api

   
privacy

   
question

More information is needed

  
static_fe

   
triage

   
wontfix

This won't be fixed

No Label
approved, awaiting change
bug
configuration
documentation
duplicate
enhancement
extremely low priority
feature request
Fix it yourself
help wanted
invalid
mastodon_api
needs docs
needs tests
not a bug
planned
pleroma_api
privacy
question
static_fe
triage
wontfix
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
3 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: AkkomaGang/akkoma#103
No description provided.
Delete Branch "nbsp/akkoma:feat/editing"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?