fedward
/
distraction.party
forked from AkkomaGang/akkoma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sync changes from upstream on develop branch #1

Merged
fedward merged 21 commits from AkkomaGang/akkoma:develop into develop 2022-11-15 15:32:17 +00:00
Conversation 0 Commits 21 Files Changed 29 +463 -71
fedward commented 2022-11-15 15:31:57 +00:00
Owner
Copy Link

Sync changes from upstream

Sync changes from upstream
fedward added 21 commits 2022-11-15 15:31:58 +00:00
cc6a076202 Include requested_by in relationship (#260) 
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: AkkomaGang/akkoma#260
f7c1e15d08 Translated using Weblate (Spanish) 
Currently translated at 21.6% (23 of 106 strings)

Co-authored-by: mint <they@mint.lgbt>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/akkoma-backend-errors/es/
Translation: Pleroma fe/Akkoma Backend (Errors)
f2c6749b57 Update translation files 
Updated by "Squash Git commits" hook in Weblate.

Translation: Pleroma fe/Akkoma Backend (Errors)
Translate-URL: http://translate.akkoma.dev/projects/akkoma/akkoma-backend-errors/
c1127e321b Add configurable timeline per oban job (#273) 
Heavily inspired by https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3777

Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: AkkomaGang/akkoma#273
2a1f17e3ed and i yoink (#275) 
Co-authored-by: Mark Felder <feld@feld.me>
Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk>
Reviewed-on: AkkomaGang/akkoma#275
fedward merged commit b7c6746380 into develop 2022-11-15 15:32:17 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
1 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: fedward/distraction.party#1
No description provided.
Delete Branch "AkkomaGang/akkoma:develop"

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?