feld [Thu, 25 Jun 2020 21:35:39 +0000 (21:35 +0000)]
Merge branch 'preload-data' into 'develop'
Preload data into index.html
Closes #1660
See merge request pleroma/pleroma!2381
feld [Thu, 25 Jun 2020 21:25:02 +0000 (21:25 +0000)]
Merge branch 'mastoapi-omitted' into 'develop'
MastoAPI differences: Document not implemented features
See merge request pleroma/pleroma!2687
feld [Thu, 25 Jun 2020 20:09:19 +0000 (20:09 +0000)]
Merge branch 'update/admin-fe-
20200625' into 'develop'
Update AdminFE build
See merge request pleroma/pleroma!2688
Mark Felder [Thu, 25 Jun 2020 19:55:00 +0000 (14:55 -0500)]
Update AdminFE build
Alex Gleason [Thu, 25 Jun 2020 17:32:06 +0000 (12:32 -0500)]
MastoAPI differences: Document not implemented features
lain [Thu, 25 Jun 2020 10:42:57 +0000 (10:42 +0000)]
Merge branch 'chore/remove-reference-to-distsn' into 'develop'
Remove reference to defunct distsn.org
See merge request pleroma/pleroma!2675
lain [Thu, 25 Jun 2020 10:17:16 +0000 (10:17 +0000)]
Apply suggestion to config/description.exs
lain [Thu, 25 Jun 2020 10:14:19 +0000 (10:14 +0000)]
Merge branch 'issue/1872-ex_aws' into 'develop'
[#1872] use Pleroma.HTTP for ExAws.S3
See merge request pleroma/pleroma!2683
lain [Thu, 25 Jun 2020 06:50:44 +0000 (06:50 +0000)]
Merge branch 'fix/following-request-from-deactivated' into 'develop'
Filter outstanding follower requests from deactivated accounts
Closes #1771
See merge request pleroma/pleroma!2682
Maksim Pechnikov [Thu, 25 Jun 2020 04:12:29 +0000 (07:12 +0300)]
added wrapper Pleroma.HTTP for ExAws.S3
Mark Felder [Wed, 24 Jun 2020 22:18:53 +0000 (17:18 -0500)]
Filter outstanding follower requests from deactivated accounts
lain [Wed, 24 Jun 2020 15:23:20 +0000 (15:23 +0000)]
Merge branch 'fix-emoji-pagination' into 'develop'
Fix for emoji pagination in pack show
See merge request pleroma/pleroma!2681
Alexander Strizhakov [Wed, 24 Jun 2020 15:06:30 +0000 (18:06 +0300)]
fix for emoji pagination in pack show
lain [Wed, 24 Jun 2020 10:42:07 +0000 (10:42 +0000)]
Merge branch 'feature/admin-api-status-count-per-instance' into 'develop'
admin api status count per instance
See merge request pleroma/pleroma!2500
lain [Wed, 24 Jun 2020 09:00:17 +0000 (09:00 +0000)]
Merge branch 'issue/1872-updated-tzdata' into 'develop'
[#1872] use Pleroma.HTTP for Tzdata
See merge request pleroma/pleroma!2678
lain [Wed, 24 Jun 2020 08:50:33 +0000 (08:50 +0000)]
Apply suggestion to test/http/tzdata_test.exs
Maksim Pechnikov [Wed, 24 Jun 2020 06:12:32 +0000 (09:12 +0300)]
added wrapper Pleroma.HTTP for Tzdata.HTTPClient
feld [Tue, 23 Jun 2020 18:51:37 +0000 (18:51 +0000)]
Merge branch 'moving-mrf-namespace-migration-fix' into 'develop'
Moving to mrf namespace migration fix
See merge request pleroma/pleroma!2676
lain [Tue, 23 Jun 2020 18:10:33 +0000 (18:10 +0000)]
Merge branch 'update-validator' into 'develop'
Update validator
See merge request pleroma/pleroma!2668
Roman Chvanikov [Tue, 23 Jun 2020 17:56:55 +0000 (20:56 +0300)]
Merge develop
Alexander Strizhakov [Tue, 23 Jun 2020 17:18:27 +0000 (20:18 +0300)]
moving to mrf namespace migration fix
Haelwenn [Tue, 23 Jun 2020 16:38:27 +0000 (16:38 +0000)]
Merge branch 'feature/1631-redesign-mrf-configuration' into 'develop'
Moving mrf settings from instance to separate mrf group
Closes #1631
See merge request pleroma/pleroma!2320
Mark Felder [Tue, 23 Jun 2020 16:17:26 +0000 (11:17 -0500)]
Remove reference to defunct distsn.org
lain [Tue, 23 Jun 2020 10:54:15 +0000 (10:54 +0000)]
Merge branch 'issue/1798' into 'develop'
[#1798] fixed migration the settings to DB
See merge request pleroma/pleroma!2655
lain [Tue, 23 Jun 2020 10:37:05 +0000 (12:37 +0200)]
ObjectValidator: Clarify type of object.
lain [Tue, 23 Jun 2020 10:06:47 +0000 (10:06 +0000)]
Merge branch 'fix_1586_provide_index_md' into 'develop'
Fix 1586 provide index md
See merge request pleroma/pleroma!2669
lain [Tue, 23 Jun 2020 10:04:51 +0000 (12:04 +0200)]
ActivityPubControllerTest: Capture error log
lain [Tue, 23 Jun 2020 09:43:20 +0000 (11:43 +0200)]
ActivityPubControllerTest: Testing changes.
lain [Tue, 23 Jun 2020 09:03:32 +0000 (11:03 +0200)]
An act of desperation.
lain [Tue, 23 Jun 2020 08:17:12 +0000 (10:17 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-validator
Maksim Pechnikov [Tue, 23 Jun 2020 06:08:24 +0000 (09:08 +0300)]
fix tests
Maksim Pechnikov [Tue, 23 Jun 2020 03:56:17 +0000 (06:56 +0300)]
added tests
Haelwenn [Tue, 23 Jun 2020 03:04:27 +0000 (03:04 +0000)]
Merge branch '@doc/apc2s-upload-media' into 'develop'
ActivityPubController: Update upload_media @doc
See merge request pleroma/pleroma!2673
Haelwenn (lanodan) Monnier [Tue, 23 Jun 2020 02:42:44 +0000 (04:42 +0200)]
ActivityPubController: Update upload_media @doc
Small cherry-pick from https://git.pleroma.social/pleroma/pleroma/-/merge_requests/1810
Haelwenn [Tue, 23 Jun 2020 01:55:33 +0000 (01:55 +0000)]
Merge branch 'fix/missing-default-instance_thumbnail_config' into 'develop'
Add missing default config value for :instance, instance_thumbnail
See merge request pleroma/pleroma!2672
Mark Felder [Mon, 22 Jun 2020 22:39:02 +0000 (17:39 -0500)]
Do not need a function to provide fallback value with default defined in config.exs
Mark Felder [Mon, 22 Jun 2020 22:35:02 +0000 (17:35 -0500)]
Add missing default config value for :instance, instance_thumbnail
Follows up on
b7fc61e17b
Haelwenn [Mon, 22 Jun 2020 21:59:21 +0000 (21:59 +0000)]
Merge branch 'warning/mastofe-settings-blob' into 'develop'
Add warning against parsing/reusing MastoFE settings blob
See merge request pleroma/pleroma!2671
Haelwenn (lanodan) Monnier [Mon, 22 Jun 2020 21:45:29 +0000 (23:45 +0200)]
Add warning against parsing/reusing MastoFE settings blob
lain [Mon, 22 Jun 2020 15:40:09 +0000 (15:40 +0000)]
Merge branch 'add-muted-to-notifications' into 'develop'
Add `pleroma.is_muted` property to notifications
Closes #1812
See merge request pleroma/pleroma!2670
Egor Kislitsyn [Mon, 22 Jun 2020 15:18:33 +0000 (19:18 +0400)]
Update NotificationOperation spec
Egor Kislitsyn [Mon, 22 Jun 2020 15:03:04 +0000 (19:03 +0400)]
Add `is_muted` to notifications
Maksim Pechnikov [Mon, 22 Jun 2020 14:27:49 +0000 (17:27 +0300)]
added verify RUM settings before start app
lain [Mon, 22 Jun 2020 12:37:10 +0000 (12:37 +0000)]
Merge branch 'feature/1739-account-endpoints' into 'develop'
account visibility in masto api
Closes #1739
See merge request pleroma/pleroma!2488
lain [Mon, 22 Jun 2020 12:35:00 +0000 (12:35 +0000)]
Merge branch 'docs_use_include_for_install_further_reading' into 'develop'
Add include for the "Further reading" section
See merge request pleroma/pleroma!2667
lain [Mon, 22 Jun 2020 12:25:12 +0000 (12:25 +0000)]
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
lain [Mon, 22 Jun 2020 12:23:45 +0000 (12:23 +0000)]
Merge branch 'weblate-pleroma-pleroma' into 'develop'
Translations update from Weblate
See merge request pleroma/pleroma!2661
Ilja [Mon, 22 Jun 2020 12:22:23 +0000 (14:22 +0200)]
Removed a space that was too much
Ilja [Mon, 22 Jun 2020 12:18:55 +0000 (14:18 +0200)]
I forgot to git add some files, oops (should be squashed with MR)
Ilja [Mon, 22 Jun 2020 12:13:30 +0000 (14:13 +0200)]
Fix 1586 Docs: provide a index.md
* I renamed the introduction.md to index.md
* I moved over the FE parts to an index file in the FE repo (will do an MR in the FE repo to actually add it)
* While I was at it, I also fixed some broken links
lain [Mon, 22 Jun 2020 12:02:29 +0000 (14:02 +0200)]
Credo fixes
lain [Mon, 22 Jun 2020 11:59:45 +0000 (13:59 +0200)]
ActivityPub: Remove `update` and switch to pipeline.
Ben Is [Fri, 19 Jun 2020 14:35:01 +0000 (14:35 +0000)]
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/
Ben Is [Fri, 19 Jun 2020 14:33:58 +0000 (14:33 +0000)]
Added translation using Weblate (Italian)
rinpatch [Mon, 22 Jun 2020 11:34:07 +0000 (11:34 +0000)]
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
lain [Mon, 22 Jun 2020 11:23:21 +0000 (13:23 +0200)]
Update Handling Test: Fix for re-used update ids.
lain [Mon, 22 Jun 2020 11:16:05 +0000 (13:16 +0200)]
Transmogrifier: Handle `Update` with the pipeline.
lain [Mon, 22 Jun 2020 11:15:37 +0000 (13:15 +0200)]
SideEffects: Handle user updating.
rinpatch [Mon, 22 Jun 2020 10:00:13 +0000 (10:00 +0000)]
Merge branch '1883-mrf-chat' into 'develop'
HellthreadPolicy: Restrict to Notes and Articles.
Closes #1883
See merge request pleroma/pleroma!2666
Ilja [Mon, 22 Jun 2020 09:41:22 +0000 (11:41 +0200)]
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
lain [Mon, 22 Jun 2020 08:41:09 +0000 (08:41 +0000)]
Merge branch 'feature/1854-emoji-pagination' into 'develop'
Emoji and packs pagination
Closes #1854
See merge request pleroma/pleroma!2658
lain [Mon, 22 Jun 2020 08:35:11 +0000 (10:35 +0200)]
HellthreadPolicy: Restrict to Notes and Articles.
lain [Sat, 20 Jun 2020 16:22:01 +0000 (16:22 +0000)]
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
Alexander Strizhakov [Sat, 20 Jun 2020 10:59:08 +0000 (10:59 +0000)]
Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_emoji_pack_operation.ex
Alexander Strizhakov [Sat, 20 Jun 2020 10:53:57 +0000 (13:53 +0300)]
proper error codes for error in adminFE
lain [Sat, 20 Jun 2020 09:57:12 +0000 (09:57 +0000)]
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
lain [Sat, 20 Jun 2020 09:56:04 +0000 (09:56 +0000)]
Merge branch 'docs/attachment_links' into 'develop'
cheatsheet.md: no_attachment_links → attachment_links
See merge request pleroma/pleroma!2664
lain [Sat, 20 Jun 2020 09:45:01 +0000 (09:45 +0000)]
Merge branch 'cleanup/object-conversation' into 'develop'
Stop filling conversation field on incoming objects (legacy, unused)
See merge request pleroma/pleroma!2663
lain [Sat, 20 Jun 2020 09:39:50 +0000 (09:39 +0000)]
Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_emoji_pack_operation.ex
Haelwenn (lanodan) Monnier [Sat, 20 Jun 2020 09:39:06 +0000 (11:39 +0200)]
cheatsheet.md: no_attachment_links → attachment_links
lain [Sat, 20 Jun 2020 09:34:34 +0000 (09:34 +0000)]
Apply suggestion to lib/mix/tasks/pleroma/config.ex
lain [Sat, 20 Jun 2020 09:33:18 +0000 (09:33 +0000)]
Merge branch 'develop' into '1865-media-only'
# Conflicts:
# CHANGELOG.md
Alexander Strizhakov [Sat, 20 Jun 2020 07:56:28 +0000 (10:56 +0300)]
fix for packs pagination
Haelwenn (lanodan) Monnier [Thu, 18 Jun 2020 17:32:03 +0000 (19:32 +0200)]
Stop filling conversation field on incoming objects (legacy, unused)
conversation field is still set for outgoing federation for compatibility.
feld [Fri, 19 Jun 2020 20:38:22 +0000 (20:38 +0000)]
Merge branch 'issue/1855' into 'develop'
#1855 MediaProxy cache invalidation via Admin API
See merge request pleroma/pleroma!2648
Sergey Suprunenko [Fri, 19 Jun 2020 19:19:00 +0000 (21:19 +0200)]
Only accounts with Service actor_type are considered as bots
Sergey Suprunenko [Fri, 19 Jun 2020 19:18:07 +0000 (21:18 +0200)]
Add support for bot field in update_credentials
lain [Fri, 19 Jun 2020 14:38:57 +0000 (16:38 +0200)]
UpdateValidator: Only allow updates from the user themselves.
lain [Fri, 19 Jun 2020 14:26:43 +0000 (14:26 +0000)]
Merge branch 'add-troubleshooting-info' into 'develop'
README: Add some troubleshooting info for compilation issues.
See merge request pleroma/pleroma!2660
lain [Fri, 19 Jun 2020 13:49:34 +0000 (15:49 +0200)]
README: Add some troubleshooting info for compilation issues.
lain [Fri, 19 Jun 2020 13:42:57 +0000 (13:42 +0000)]
Merge branch '1873-pagination-fixes' into 'develop'
[#1873] :offset pagination param support, hashtags pagination
Closes #1873
See merge request pleroma/pleroma!2659
lain [Fri, 19 Jun 2020 13:40:34 +0000 (13:40 +0000)]
Merge branch 'dry-up-follower-update' into 'develop'
User: update_follower_count refactor.
See merge request pleroma/pleroma!2649
lain [Fri, 19 Jun 2020 13:30:30 +0000 (15:30 +0200)]
ObjectValidators: Add basic UpdateValidator.
Ivan Tashkinov [Fri, 19 Jun 2020 13:14:06 +0000 (16:14 +0300)]
[#1873] Fixes missing :offset pagination param support. Added pagination support for hashtags search.
lain [Fri, 19 Jun 2020 12:56:50 +0000 (14:56 +0200)]
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-validator
Alexander Strizhakov [Fri, 19 Jun 2020 11:46:38 +0000 (14:46 +0300)]
default page size for files
Alexander Strizhakov [Fri, 19 Jun 2020 09:31:55 +0000 (12:31 +0300)]
changelog entry
Alexander Strizhakov [Fri, 19 Jun 2020 07:17:24 +0000 (10:17 +0300)]
adding overall count for packs and files
Alexander Strizhakov [Thu, 18 Jun 2020 15:50:03 +0000 (18:50 +0300)]
emoji pagination for pack show action
Alexander Strizhakov [Thu, 18 Jun 2020 11:32:21 +0000 (14:32 +0300)]
emoji packs pagination
Maksim Pechnikov [Thu, 18 Jun 2020 02:45:15 +0000 (05:45 +0300)]
added test
Maksim Pechnikov [Thu, 18 Jun 2020 02:29:31 +0000 (05:29 +0300)]
revert 'database' option to rejected keys
Maksim Pechnikov [Thu, 18 Jun 2020 02:02:33 +0000 (05:02 +0300)]
fix test
Mark Felder [Wed, 17 Jun 2020 18:13:55 +0000 (13:13 -0500)]
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
Mark Felder [Wed, 17 Jun 2020 18:02:01 +0000 (13:02 -0500)]
Remove misleading is_ prefix from boolean function
Mark Felder [Wed, 17 Jun 2020 17:54:02 +0000 (12:54 -0500)]
Empty list as default
Mark Felder [Wed, 17 Jun 2020 17:50:06 +0000 (12:50 -0500)]
Merge branch 'develop' into issue/1855
lain [Wed, 17 Jun 2020 15:53:24 +0000 (15:53 +0000)]
Merge branch 'fix/1787-mogrify-args' into 'develop'
Moving custom ecto types in context folders
See merge request pleroma/pleroma!2652
rinpatch [Wed, 17 Jun 2020 15:21:42 +0000 (15:21 +0000)]
Merge branch 'fix/notification-type' into 'develop'
Remove `poll` from `notification_type` OpenAPI spec
Closes #1867
See merge request pleroma/pleroma!2657
Egor Kislitsyn [Wed, 17 Jun 2020 14:47:59 +0000 (18:47 +0400)]
Remove `poll` from `notification_type` OpenAPI spec
projects / akkoma / log