6471 Commits (8c6cdff3cc48101711d0f09852866311780d97db)

 

All Branches   

Search

Author	SHA1	Message	Date
Haelwenn	46e8b68093	Merge branch 'changelog/1484-base_url-remove-media' into 'develop' ... Changelog: !1484 base_url removed /media/ See merge request pleroma/pleroma!1494	5 years ago
Haelwenn (lanodan) Monnier	7c8abbcb1c	CHANGELOG.md: Add entry for !1484 ... Related to: https://git.pleroma.social/pleroma/pleroma/merge_requests/1484 [ci skip]	5 years ago
rinpatch	41e0304757	Merge branch 'develop' into feature/hide-follows-remote	5 years ago
kaniini	d1e891062e	Merge branch 'tests/filter_dedupe' into 'develop' ... fixed test for elixir 1.7.4 See merge request pleroma/pleroma!1487	5 years ago
Maksim	03c386614f	fixed test for elixir 1.7.4	5 years ago
kaniini	19835be067	Merge branch 'fix-remote-follow-from-ostatus-subscribe' into 'develop' ... Fix remote follow from /ostatus_subscribe Closes #1103 See merge request pleroma/pleroma!1472	5 years ago
kaniini	931c4974ee	Merge branch 'fix/put-correct-activity-url' into 'develop' ... Show the url advertised in the Activity in the Status JSON response Closes #1077 See merge request pleroma/pleroma!1485	5 years ago
Sergey Suprunenko	b20020da16	Show the url advertised in the Activity in the Status JSON response	5 years ago
kPherox	8d9f43e1d1	Add WebFinger test for AP-only account	5 years ago
kaniini	acd20914ec	Merge branch 'fix/Upload_base_url' into 'develop' ... Fix/upload base url See merge request pleroma/pleroma!1484	5 years ago
feld	84fca14c3c	Do not prepend /media/ when using base_url ... This ensures admin has full control over the path where media resides.	5 years ago
Mike Verdone	0e2b5a3e6a	WIP	5 years ago
kPherox	ac27b94ffa	Change to not require `magic-public-key` on WebFinger	5 years ago
kaniini	7286cdff7a	Merge branch 'tests/web_finger' into 'develop' ... tests WebFinger See merge request pleroma/pleroma!1483	5 years ago
Maksim	55341ac717	tests WebFinger	5 years ago
kaniini	b7fae304d3	Merge branch 'domain-blocking-relationship-api' into 'develop' ... Add `domain_blocking` to the relationship API (GET /api/v1/accounts/relationships) See merge request pleroma/pleroma!1481	5 years ago
Eugenij	4504135894	Add `domain_blocking` to the relationship API (GET /api/v1/accounts/relationships)	5 years ago
Mike Verdone	2c83eb0b15	Revert "squash! Expose expires_at datetime in mastoAPI only for the activity actor" ... This reverts commit 2981821db8.	5 years ago
Mike Verdone	877575d0da	fixup! Update changelog	5 years ago
Mike Verdone	2981821db8	squash! Expose expires_at datetime in mastoAPI only for the activity actor ... NOTE: rewrite the commit msg	5 years ago
Mike Verdone	91d9fdc7de	Update changelog to document expiring posts feature	5 years ago
Roman Chvanikov	d2da3d30f3	Merge branch 'develop' into feature/digest-email	5 years ago
Mike Verdone	3cb471ec06	Expose expires_at datetime in mastoAPI only for the activity actor ... In the "pleroma" section of the MastoAPI for status activities you can see an expires_at item that states when the activity will expire, or nothing if the activity will not expire. The expires_at date is only visible to the person who posted the activity. This is the conservative approach in case some attacker decides to write a logger for expiring posts. However, in the future of OCAP, signed requests, and all that stuff, this attack might not be that likely. Some other pleroma dev should remove the restriction in the code at that time, if they're satisfied with the security implications of doing so.	5 years ago
Mike Verdone	36012ef6c1	Require that ephemeral posts live for at least one hour ... If we didn't put some kind of lifetime requirement on these, I guess you could annoy people by sending large numbers of ephemeral posts that provoke notifications but then disappear before anyone can read them.	5 years ago
Mike Verdone	704960b3c1	Add support for activity expiration to common and Masto API ... The "expires_at" parameter accepts an ISO8601-formatted date which defines when the activity will expire. At this point the API will not give you any feedback about if your post will expire or not.	5 years ago
lain	53fad36b57	Merge branch 'develop' into 'develop' ... Honour domain blocks on streamed notifications/statuses See merge request pleroma/pleroma!1482	5 years ago
Mike Verdone	378f5f0fbe	Add activity expiration worker ... This is a worker that runs every minute and deletes expired activities. It's based heavily on the scheduled activities worker.	5 years ago
Mike Verdone	666514194a	Add activity expirations table ... Add a table to store activity expirations. An activity can have zero or one expirations. The expiration has a scheduled_at field which stores the time at which the activity should expire and be deleted.	5 years ago
Mike Verdone	b729402774	Make test.exs read config in the same way as dev.exs ... This way, if your test.secret.exs has an error, you'll actually see it.	5 years ago
Mike Verdone	8ba7a151ad	Cleanup: fix a comment	5 years ago
sadposter	f5d574f4ed	check both item and parent domain blocks	5 years ago
Sadposter	48bd3be9cb	move domain block check to with block	5 years ago
Sadposter	4af4f6166b	honour domain blocks on streaming notifications	5 years ago
kaniini	0be548b90a	Merge branch 'Fix-static-dir-doc' into 'develop' ... Fix static_dir docs See merge request pleroma/pleroma!1465	5 years ago
aries	9638da43e9	Add text about gitignore	5 years ago
kaniini	9c6357324e	Merge branch 'feature/admin-api-user-statuses' into 'develop' ... Admin API: Endpoint for fetching latest user's statuses See merge request pleroma/pleroma!1413	5 years ago
kaniini	2ae510ee81	Merge branch 'bugfix/rich-media-splice-url' into 'develop' ... rich media: parser: splice the given URL into the result See merge request pleroma/pleroma!1480	5 years ago
Ariadne Conill	d3bdb8e704	rich media: parser: splice the given URL into the result	5 years ago
Maxim Filippov	f46805bb40	Merge branch 'develop' into feature/admin-api-user-statuses	5 years ago
Maxim Filippov	03471151d6	AdminAPI: Add "godmode" while fetching user statuses (i.e. admin can see private statuses)	5 years ago
kaniini	1a751529fb	Merge branch 'chore/update-mix-lock' into 'develop' ... update mix.lock See merge request pleroma/pleroma!1478	5 years ago
Ariadne Conill	0afaf96640	update mix.lock	5 years ago
kaniini	bd265acf91	Merge branch 'chore/adminapi-deprecated-endpoints' into 'develop' ... Router: Remove deprecated AdminAPI endpoints See merge request pleroma/pleroma!1466	5 years ago
Haelwenn (lanodan) Monnier	90be91b0e0	Router: Remove deprecated AdminAPI endpoints	5 years ago
kaniini	5230b9ef3d	Merge branch 'admin-config-fix' into 'develop' ... Admin config fix See merge request pleroma/pleroma!1471	5 years ago
Alexander Strizhakov	5e72554f3c	Admin config fix	5 years ago
kaniini	dd96be5c8b	Merge branch 'tests/activity_pub_publisher' into 'develop' ... tests for Pleroma.Web.ActivityPub.Publisher See merge request pleroma/pleroma!1473	5 years ago
Maksim	c49a09ed88	tests for Pleroma.Web.ActivityPub.Publisher	5 years ago
kaniini	8d3cf7e519	Merge branch 'bugfix/unauthed-liked-by' into 'develop' ... Bugfix: don't error out on unauthorized request to liked/favourited_by See merge request pleroma/pleroma!1474	5 years ago
kaniini	ad60837300	Merge branch 'patch-2' into 'develop' ... Update `prometheus_phoenix` to v1.3 in order to support `phoenix@1.4`. Closes #1050 See merge request pleroma/pleroma!1475	5 years ago