fedi/akkoma
1
0
Fork 0
mirror of https://akkoma.dev/AkkomaGang/akkoma.git synced 2024-11-23 23:11:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
10448 commits 26 branches 107 tags 316 MiB
Commit graph

10448 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Felder 8121e46f25 Merge branch 'develop' into activation-meta 2020-07-02 13:01:22 -05:00
Mark Felder 02d855b2b9 Document the new API extension of /api/v1/instance 2020-07-02 12:59:45 -05:00
Mark Felder d44ec2bf4c Remove camelCase from the keys 2020-07-02 12:55:08 -05:00
rinpatch 4c044f6225 Merge branch 'fetcher-fixes' into 'develop' 
Don't fail fetching when the user in a replied-to message can't be fetched.

See merge request pleroma/pleroma!2711
 2020-07-02 10:17:51 +00:00
rinpatch b0439df1b5 Merge branch '1907-fix-announce-streaming' into 'develop' 
Resolve "Streaming API: Repeats of your posts from random people are pushed to the timeline"

Closes #1907

See merge request pleroma/pleroma!2714
 2020-07-02 10:08:42 +00:00
lain d884b6f704 Merge branch 'feature/update-description' into 'develop' 
Update settings descriptions and labels

See merge request pleroma/pleroma!2709
 2020-07-02 08:43:32 +00:00
lain bad08f34ca Credo fixes. 2020-07-02 09:57:31 +02:00
lain ce9b7c0e0f Changelog: Update with stream changes. 2020-07-02 09:54:48 +02:00
lain 311b7c19d0 Streamer: Align announce streaming with polling. 2020-07-02 09:50:26 +02:00
lain 61fe94d698 SideEffects: Refactor. 2020-07-02 09:33:50 +02:00
rinpatch fa7a0be225 Merge branch '1716-handle-nickname-clashes' into 'develop' 
ActivityPub: Handle clashing nicknames for the same ap id

Closes #1716

See merge request pleroma/pleroma!2712
 2020-07-01 13:51:23 +00:00
lain fedfe8f7d6 ActivityPub: Handle clashing nicknames for the same ap id 
If we get a new user (identified by ap_id) that would have the same
nickname as an existing user, give the existing user a nickname that
is prepended with the user id, as this will never clash.

This can happen when a user switches server software and that soft-
ware generates ap ids in a different way.
 2020-07-01 12:26:07 +02:00
lain ce92e6e5ce Fetcher: Work when we can't get the OP. 2020-07-01 11:48:51 +02:00
lain 8ae572d5ae Fixtures: Pretty print. 2020-07-01 11:47:45 +02:00
lain d889c9ca70 Merge branch 'revert-651f2695' into 'develop' 
Revert "Merge branch 'avatar-removing' into 'develop'"

See merge request pleroma/pleroma!2710
 2020-07-01 09:18:02 +00:00
lain 691742e62d Revert "Merge branch 'avatar-removing' into 'develop'" 
This reverts merge request !2701
 2020-07-01 08:51:56 +00:00
Angelina Filippova df2d6564d5 Add labels, update descriptions and labels 2020-07-01 03:01:15 +03:00
Haelwenn 9cf4bfcd81 Merge branch 'chore/rename-user-settings-column' into 'develop' 
Rename user.settings column

See merge request pleroma/pleroma!2707
 2020-06-30 20:51:10 +00:00
Mark Felder 5a8e0208b1 Add fields limits to instance metadata, add tests 2020-06-30 15:25:10 -05:00
Mark Felder 0883a706dc Merge branch 'develop' into activation-meta 2020-06-30 15:09:03 -05:00
Mark Felder d69af7f742 Rename user.settings column 
This is used exclusively by MastoFE/GlitchFE now
 2020-06-30 11:50:53 -05:00
lain b9e6ad571a Merge branch 'preloadfixups' into 'develop' 
Some fixups for the preload.

See merge request pleroma/pleroma!2692
 2020-06-30 10:52:55 +00:00
lain 8b7055e25e Credo fixes 2020-06-30 11:55:58 +02:00
lain 0176b7bca2 Merge branch 'preload-fixups-2' into preloadfixups 2020-06-30 11:40:34 +02:00
lain 2382a2a151 Preload: Load the correct instance panel 2020-06-30 11:35:54 +02:00
lain 34c9446cb1 Merge branch 'patch-1' into 'develop' 
Use correct PostgreSQL version command in bug template

See merge request pleroma/pleroma!2706
 2020-06-30 08:42:45 +00:00
normandy 27542f19c6 Use correct PostgreSQL version command in bug template 2020-06-30 03:12:30 +00:00
rinpatch 7bb3618939 Merge branch 'fix-notification-filtering' into 'develop' 
Notifications: Never return `nil` in the notification list.

See merge request pleroma/pleroma!2705
 2020-06-29 18:06:25 +00:00
lain 09c5991f82 Apply suggestion to lib/pleroma/notification.ex 2020-06-29 16:04:14 +00:00
lain b2b332984c Merge branch 'fix/cast-and-validate' into 'develop' 
Fix CastAndValidate plug

Closes #1889

See merge request pleroma/pleroma!2704
 2020-06-29 15:59:40 +00:00
lain c01f4ca07f Notification: Remove TODO. 2020-06-29 17:52:56 +02:00
lain 90083a754d Notifications: Never return nil in the notification list. 2020-06-29 17:48:18 +02:00
Egor Kislitsyn 3aa04b81c4
Test default "content-type" for CastAndValidate 2020-06-29 19:47:04 +04:00
feld 344a9b28b3 Merge branch 'fix/swoosh-sendmail' into 'develop' 
updated swoosh

See merge request pleroma/pleroma!2703
 2020-06-29 15:24:39 +00:00
Egor Kislitsyn 979f02ec94
Fix CastAndValidate plug 2020-06-29 17:33:00 +04:00
Maksim Pechnikov dc60b1ee58 updated swoosh 2020-06-29 16:27:01 +03:00
lain 07ff2d62f4 Merge branch 'rich-media-parser-exclude-attachment-links' into 'develop' 
excluding attachment links from RichMedia

See merge request pleroma/pleroma!2702
 2020-06-29 12:44:58 +00:00
Alexander Strizhakov 6512ef6879
excluding attachment links from RichMedia 2020-06-29 15:25:57 +03:00
lain 651f269568 Merge branch 'avatar-removing' into 'develop' 
UpdateCredentialsTest: Add test for removing profile images.

See merge request pleroma/pleroma!2701
 2020-06-29 11:16:30 +00:00
lain e64d08439e UpdateCredentialsTest: Add test for removing profile images. 2020-06-29 12:40:23 +02:00
lain 8630a6c7f5 Preloaders: Use strings as keys. 2020-06-29 11:41:00 +02:00
lain a19f8778af User preloader: Put user info at correct key 2020-06-29 11:06:20 +02:00
lain 577da132da Merge branch '1031-parent-visible' into 'develop' 
Resolve "Add `pleroma.parent_visible` to the status view"

Closes #1031

See merge request pleroma/pleroma!2679
 2020-06-29 08:39:51 +00:00
lain e229640372 Merge branch 'openapi/schema-account-pleromafields' into 'develop' 
ApiSpec.Schemas.Account: import description from differences_in_mastoapi_responses

See merge request pleroma/pleroma!2700
 2020-06-29 08:32:56 +00:00
Haelwenn (lanodan) Monnier 9f51b03eed
ApiSpec.Schemas.Account: import description from differences_in_mastoapi_responses 2020-06-29 03:31:33 +02:00
Haelwenn cf1bd386c6 Merge branch 'docs/mastoapi-account-fields' into 'develop' 
differences_in_mastoapi_responses: Update account fields

See merge request pleroma/pleroma!2699
 2020-06-29 00:56:02 +00:00
Haelwenn (lanodan) Monnier efb5d64e50
differences_in_mastoapi_responses: Update account fields 2020-06-29 02:40:32 +02:00
lain 4b32bc80de Merge branch 'reduce-preloading-defaults' into 'develop' 
Config: Reduce default preloaders to configuration endpoints.

See merge request pleroma/pleroma!2697
 2020-06-27 10:40:29 +00:00
lain 0313520cd2 Config: Reduce default preloaders to configuration endpoints. 
Fetching the timeline is a bit heavy to do by default.
 2020-06-27 12:18:37 +02:00
lain dc31fbfe6c Merge branch 'fix/fetcher-transmogrifier-error' into 'develop' 
object/fetcher: Pass full Transmogrifier error

See merge request pleroma/pleroma!2696
 2020-06-27 09:41:35 +00:00