fedi/akkoma
1
0
Fork 0
mirror of https://akkoma.dev/AkkomaGang/akkoma.git synced 2024-10-31 22:04:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
10586 commits 26 branches 107 tags 316 MiB
Commit graph

10586 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Egor Kislitsyn 67d92ac7b7
Remove /statusnet/config 2020-06-29 17:00:37 +04: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
Egor Kislitsyn 8693e01799
Fix warning 2020-06-29 16:29:51 +04:00
Alexander Strizhakov 6512ef6879
excluding attachment links from RichMedia 2020-06-29 15:25:57 +03:00
Egor Kislitsyn 4a306720e8
Merge branch 'develop' into remove-twitter-api 2020-06-29 16:09:49 +04:00
lain 59540131c1 Credo fixes. 2020-06-29 14:09:03 +02:00
lain f308196b75 Token Response: Remove empty file. 2020-06-29 13:52:50 +02:00
lain e374872fe7 AccountOperation: Correctly describe create response. 2020-06-29 13:49:48 +02:00
lain bb168ed94a OAuth: Extract view-type functions to a view. 2020-06-29 13:39:09 +02: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
Alexander Strizhakov f89390110b
added tab & labels for mrf policies 2020-06-27 12:18:34 +03:00
Haelwenn (lanodan) Monnier 1566543bec
object/fetcher: Pass full Transmogrifier error 2020-06-26 20:10:47 +02:00
Haelwenn (lanodan) Monnier 244655e884
MastoAPI: Show source field when deleting 2020-06-26 19:52:20 +02:00
Haelwenn bf1c5e255a Merge branch 'block-handling' into 'develop' 
Handle blocks with the pipeline

See merge request pleroma/pleroma!2685
 2020-06-26 17:41:00 +00:00
Haelwenn 09478c9cf7 Merge branch '1258-anti-link-spam-exemption' into 'develop' 
AntiSpamLinkPolicy: Exempt local users.

Closes #1258

See merge request pleroma/pleroma!2686
 2020-06-26 16:59:46 +00:00
lain a5bbfa21a1 StaticFE: Prioritize json in requests. 2020-06-26 16:27:39 +02:00
lain f378e93bf4 AccountController: Return scope in proper format. 2020-06-26 16:15:27 +02:00
lain a2002ebb63 Preloading: Fix nodeinfo url. 2020-06-26 14:48:23 +02:00
lain 4a7a34ae8c Preloading: Return correct data for statusnet stuff. 2020-06-26 14:47:38 +02:00
Alexander Strizhakov e7bc0273e5
additional data to MRF policies in descriptions 2020-06-26 15:22:08 +03:00
lain 6db9f7cdb3 Merge branch 'fix-chats' into 'develop' 
Nodeinfo: Add chat information back in.

See merge request pleroma/pleroma!2691
 2020-06-26 11:09:37 +00:00
lain 7ed2296416 Nodeinfo: Add chat information back in. 2020-06-26 13:04:15 +02:00
lain 15a8b70318 User: Don't unfollow on block when the relevant setting is set. 2020-06-26 12:06:00 +02:00
lain c3383d4fab BlockValidator: Restore old behavior for incoming blocks. 2020-06-26 11:58:40 +02:00
Alexander Strizhakov 91cd023720
Pleroma.Upload.Filter.Mogrify args description 2020-06-26 09:03:07 +03:00
Haelwenn (lanodan) Monnier 27c33f216a
activity_draft: Add source field 2020-06-26 05:48:25 +02:00
Haelwenn 7c7a6509b9 Merge branch 'hotfix/preload-tests-nodeinfo' into 'develop' 
nodeinfo: Fix MRF transparency

See merge request pleroma/pleroma!2689
 2020-06-26 03:48:25 +00:00
Haelwenn (lanodan) Monnier d6c958b4c2
nodeinfo: Fix MRF transparency 2020-06-26 05:33:59 +02:00
feld 8288419686 Merge branch 'preload-data' into 'develop' 
Preload data into index.html

Closes #1660

See merge request pleroma/pleroma!2381
 2020-06-25 21:35:39 +00:00
feld 2e39fbe02e Merge branch 'mastoapi-omitted' into 'develop' 
MastoAPI differences: Document not implemented features

See merge request pleroma/pleroma!2687
 2020-06-25 21:25:02 +00:00
feld bb275c4985 Merge branch 'update/admin-fe-20200625' into 'develop' 
Update AdminFE build

See merge request pleroma/pleroma!2688
 2020-06-25 20:09:19 +00:00
Mark Felder d9e4623628 Update AdminFE build 2020-06-25 14:55:00 -05:00
Alex Gleason 28d4e60f66
MastoAPI differences: Document not implemented features 2020-06-25 12:32:06 -05:00
lain 1d0804b49f Merge branch 'chore/remove-reference-to-distsn' into 'develop' 
Remove reference to defunct distsn.org

See merge request pleroma/pleroma!2675
 2020-06-25 10:42:57 +00:00