moon
/
honkoma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,289 Commits 2 Branches 0 Tags 201 MiB
Commit Graph

10289 Commits

Author SHA1 Message Date
Mark Felder bf8310f380 Add missing default config value for :instance, instance_thumbnail 
Follows up on b7fc61e17b
 2020-06-22 17:35:02 -05:00
lain 46f7e51b27 Merge branch 'add-muted-to-notifications' into 'develop' 
Add `pleroma.is_muted` property to notifications

Closes #1812

See merge request pleroma/pleroma!2670
 2020-06-22 15:40:09 +00:00
Egor Kislitsyn b3a549e916
Update NotificationOperation spec 2020-06-22 19:18:33 +04:00
Egor Kislitsyn 7e6f43c0d7
Add `is_muted` to notifications 2020-06-22 19:03:04 +04:00
lain 59bdef0c33 Merge branch 'feature/1739-account-endpoints' into 'develop' 
account visibility in masto api

Closes #1739

See merge request pleroma/pleroma!2488
 2020-06-22 12:37:10 +00:00
lain 31489bc864 Merge branch 'docs_use_include_for_install_further_reading' into 'develop' 
Add include for the "Further reading" section

See merge request pleroma/pleroma!2667
 2020-06-22 12:35:00 +00:00
lain 8b5bdd164e Merge branch 'fix/1825-admin-api-error-codes' into 'develop' 
Proper error codes for error in adminFE

Closes #1825

See merge request pleroma/pleroma!2665
 2020-06-22 12:25:12 +00:00
lain a0762fd5ea Merge branch 'weblate-pleroma-pleroma' into 'develop' 
Translations update from Weblate

See merge request pleroma/pleroma!2661
 2020-06-22 12:23:45 +00:00
Ben Is 68c812eb2e Translated using Weblate (Italian) 
Currently translated at 0.9% (1 of 106 strings)

Translation: Pleroma/Pleroma backend
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/it/
 2020-06-22 11:34:18 +00:00
Ben Is 4f5af68b3e Added translation using Weblate (Italian) 2020-06-22 11:34:18 +00:00
rinpatch c75ba63bef Merge branch '1865-media-only' into 'develop' 
Resolve "/api/v1/accounts/:id/statuses?only_media=true returns media that is not owned"

Closes #1865

See merge request pleroma/pleroma!2650
 2020-06-22 11:34:07 +00:00
rinpatch 282f492cd5 Merge branch '1883-mrf-chat' into 'develop' 
HellthreadPolicy: Restrict to Notes and Articles.

Closes #1883

See merge request pleroma/pleroma!2666
 2020-06-22 10:00:13 +00:00
Ilja 9f7ee5dfa2 Add include for the "Further reading" section 
* I added an include and use this include for the installation guides that already had this section
* I added the "Further reading" section as well as te "Questions" section to the English guides that didn't have it yet
* I added a first point "How Federation Works/Why is my Federated Timeline empty?" to link to lains blogpost about this because we still get this question a lot in the #pleroma support channel
* I reordered the list a bit
 2020-06-22 11:41:22 +02:00
lain 93ae1c8bd3 Merge branch 'feature/1854-emoji-pagination' into 'develop' 
Emoji and packs pagination

Closes #1854

See merge request pleroma/pleroma!2658
 2020-06-22 08:41:09 +00:00
lain 35e9282ffd HellthreadPolicy: Restrict to Notes and Articles. 2020-06-22 10:35:11 +02:00
lain 6efd3730c3 Merge branch 'bugfix/mix.exs-version-dot-git-less' into 'develop' 
mix.exs: version git-less (part 2, MacOS-compat)

See merge request pleroma/pleroma!2420
 2020-06-20 16:22:01 +00:00
Alexander Strizhakov b5f13af7ba Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_emoji_pack_operation.ex 2020-06-20 10:59:08 +00:00
Alexander Strizhakov c5863438ba
proper error codes for error in adminFE 2020-06-20 13:53:57 +03:00
lain 31761340fe Merge branch 'feature/support-bot-field-in-update-credentials' into 'develop' 
Support 'bot' field in account update_credentials

Closes #1600 and #1467

See merge request pleroma/pleroma!2662
 2020-06-20 09:57:12 +00:00
lain 50d0c58003 Merge branch 'docs/attachment_links' into 'develop' 
cheatsheet.md: no_attachment_links → attachment_links

See merge request pleroma/pleroma!2664
 2020-06-20 09:56:04 +00:00
lain 6f6ccfccca Merge branch 'cleanup/object-conversation' into 'develop' 
Stop filling conversation field on incoming objects (legacy, unused)

See merge request pleroma/pleroma!2663
 2020-06-20 09:45:01 +00:00
lain 0e789bc55f Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_emoji_pack_operation.ex 2020-06-20 09:39:50 +00:00
Haelwenn (lanodan) Monnier 15ba539258
cheatsheet.md: no_attachment_links → attachment_links 2020-06-20 11:39:06 +02:00
lain 7d542450b1 Merge branch 'develop' into '1865-media-only' 
# Conflicts:
#   CHANGELOG.md
 2020-06-20 09:33:18 +00:00
Alexander Strizhakov 1a704e1f1e
fix for packs pagination 2020-06-20 10:56:28 +03:00
Haelwenn (lanodan) Monnier 3d4cfc9c5f
Stop filling conversation field on incoming objects (legacy, unused) 
conversation field is still set for outgoing federation for compatibility.
 2020-06-20 00:08:26 +02:00
feld f928267773 Merge branch 'issue/1855' into 'develop' 
#1855 MediaProxy cache invalidation via Admin API

See merge request pleroma/pleroma!2648
 2020-06-19 20:38:22 +00:00
Sergey Suprunenko ac0344dd24
Only accounts with Service actor_type are considered as bots 2020-06-19 21:19:00 +02:00
Sergey Suprunenko b63646169d
Add support for bot field in update_credentials 2020-06-19 21:18:07 +02:00
lain 436bb0cd12 Merge branch 'add-troubleshooting-info' into 'develop' 
README: Add some troubleshooting info for compilation issues.

See merge request pleroma/pleroma!2660
 2020-06-19 14:26:43 +00:00
lain d54b0432ea README: Add some troubleshooting info for compilation issues. 2020-06-19 15:49:34 +02:00
lain cafdf18408 Merge branch '1873-pagination-fixes' into 'develop' 
[#1873] :offset pagination param support, hashtags pagination

Closes #1873

See merge request pleroma/pleroma!2659
 2020-06-19 13:42:57 +00:00
lain 372533b7c3 Merge branch 'dry-up-follower-update' into 'develop' 
User: update_follower_count refactor.

See merge request pleroma/pleroma!2649
 2020-06-19 13:40:34 +00:00
Ivan Tashkinov 5237a2df9f [#1873] Fixes missing :offset pagination param support. Added pagination support for hashtags search. 2020-06-19 16:14:06 +03:00
Alexander Strizhakov 02ca8a363f
default page size for files 2020-06-19 14:46:38 +03:00
Alexander Strizhakov 0c739b423a
changelog entry 2020-06-19 12:31:55 +03:00
Alexander Strizhakov 3e3f9253e6
adding overall count for packs and files 2020-06-19 10:17:24 +03:00
Alexander Strizhakov 4975ed86bc
emoji pagination for pack show action 2020-06-18 18:50:03 +03:00
Alexander Strizhakov 3becdafd33
emoji packs pagination 2020-06-18 14:32:21 +03:00
Maksim Pechnikov 4044f24e2e fix test 2020-06-18 05:06:28 +03:00
Mark Felder 2731ea1334 Change references from "deleted_urls" to "banned_urls" as nothing is handled via media deletions anymore; all actions are manual operations by an admin to ban the url 2020-06-17 13:13:55 -05:00
Mark Felder c08c9db0c1 Remove misleading is_ prefix from boolean function 2020-06-17 13:02:01 -05:00
Mark Felder 71a5d9bffb Empty list as default 2020-06-17 12:54:02 -05:00
Mark Felder 3462d4b995 Merge branch 'develop' into issue/1855 2020-06-17 12:50:06 -05:00
lain d772361e62 Merge branch 'fix/1787-mogrify-args' into 'develop' 
Moving custom ecto types in context folders

See merge request pleroma/pleroma!2652
 2020-06-17 15:53:24 +00:00
rinpatch 43a47bf5cc Merge branch 'fix/notification-type' into 'develop' 
Remove `poll` from `notification_type` OpenAPI spec

Closes #1867

See merge request pleroma/pleroma!2657
 2020-06-17 15:21:42 +00:00
Egor Kislitsyn d4b5a9730e
Remove `poll` from `notification_type` OpenAPI spec 2020-06-17 18:47:59 +04:00
Maksim 96493da7bd Apply suggestion to test/web/media_proxy/invalidation_test.exs 2020-06-17 13:14:01 +00:00
Maksim 9a371bf5f6 Apply suggestion to lib/pleroma/web/media_proxy/invalidations/script.ex 2020-06-17 13:12:38 +00:00
Maksim 44ce97a9c9 Apply suggestion to lib/pleroma/web/media_proxy/invalidations/script.ex 2020-06-17 13:12:32 +00:00