pleroma

Commit Graph

Author	SHA1	Message	Date
kaniini	677df5ceb3	Merge branch 'security/remote-follow-commonapi' into 'develop' twitter api: utils: rework do_remote_follow() to use CommonAPI Closes #1138 See merge request pleroma/pleroma!1506	4 years ago
Ariadne Conill	3850812503	twitter api: utils: rework do_remote_follow() to use CommonAPI Closes #1138	4 years ago
kaniini	6657506185	Merge branch 'revert-83508418' into 'develop' Revert "Merge branch 'bugfix/clean-up-markdown-rendering' into 'develop'" See merge request pleroma/pleroma!1505	4 years ago
kaniini	5835069215	Revert "Merge branch 'bugfix/clean-up-markdown-rendering' into 'develop'" This reverts merge request !1504	4 years ago
Haelwenn	83508418fb	Merge branch 'bugfix/clean-up-markdown-rendering' into 'develop' markdown: clean up html generated by earmark See merge request pleroma/pleroma!1504	4 years ago
Ariadne Conill	5795a890e9	markdown: clean up html generated by earmark	4 years ago
lain	1dfde4151c	Merge branch 'refactor/use-constants' into 'develop' refactoring: begin to use constants See merge request pleroma/pleroma!1500	4 years ago
kaniini	3b8cd27b05	Merge branch 'mailer-enabled-nodeinfo' into 'develop' Add `mailerEnabled` to the NodeInfo metadata See merge request pleroma/pleroma!1502	4 years ago
Eugenij	0bee2131ce	Add `mailerEnabled` to the NodeInfo metadata	4 years ago
kaniini	8be0154094	Merge branch 'fix/access-mastofe-auth-on-private-instances' into 'develop' Redirect not logged-in users to the MastoFE login page on private instances Closes #1045 See merge request pleroma/pleroma!1503	4 years ago
Sergey Suprunenko	c0e258cf21	Redirect not logged-in users to the MastoFE login page on private instances	4 years ago
kaniini	1f7c8d9615	Merge branch 'tests/ostatus_controller' into 'develop' added tests for OstatusController See merge request pleroma/pleroma!1501	5 years ago
Maksim	159bbec570	added tests for OstatusController	5 years ago
Ariadne Conill	b93498eb52	constants: add as_public constant and use it everywhere	5 years ago
Ariadne Conill	9d78b3b281	mix: add ex_const dependency	5 years ago
kaniini	b38d21060e	Merge branch 'bugfix/transmogrifier-fix-delete' into 'develop' transmogrifier: use User.delete() instead of handrolled user deletion code for remote users Closes #1104 See merge request pleroma/pleroma!1498	5 years ago
Ariadne Conill	492d854e7a	transmogrifier: use User.delete() instead of handrolled user deletion code for remote users Closes #1104	5 years ago
kaniini	44bfff22a7	Merge branch 'confirmation-resend' into 'develop' add account confirmation email resend in mastodon api See merge request pleroma/pleroma!1492	5 years ago
Sachin Joshi	242f5c585e	add account confirmation email resend in mastodon api	5 years ago
kaniini	0d05ec3855	Merge branch 'fix/user_update_and_set_cache' into 'develop' fixed User.update_and_set_cache for stale user See merge request pleroma/pleroma!1493	5 years ago
Maksim	6a4b8b2681	fixed User.update_and_set_cache for stale user	5 years ago
kaniini	488c06b6f5	Merge branch 'develop' into 'develop' Fix HTTP sig tweak on KeyId See merge request pleroma/pleroma!1496	5 years ago
kaniini	f78390ffdf	Merge branch 'feature/hackney-303-redirect' into 'develop' Handle 303 redirects Closes #1127 See merge request pleroma/pleroma!1497	5 years ago
Sergey Suprunenko	02dc651828	Handle 303 redirects	5 years ago
Thomas Sileo	961e778531	Fix HTTP sig tweak on KeyId	5 years ago
rinpatch	08960d5016	Merge branch 'issue/1097' into 'develop' [#1097] added redirect: /pleroma/admin -> /pleroma/admin/ See merge request pleroma/pleroma!1495	5 years ago
Maksim	6b77a88365	[#1097 ] added redirect: /pleroma/admin -> /pleroma/admin/	5 years ago
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
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
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
lain	53fad36b57	Merge branch 'develop' into 'develop' Honour domain blocks on streamed notifications/statuses See merge request pleroma/pleroma!1482	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

1 2 3 4 5 ...

6079 Commits (677df5ceb370a22fa8df44e6ce5f6fa47d91f9b8) All Branches Search

6079 Commits (677df5ceb370a22fa8df44e6ce5f6fa47d91f9b8)

All Branches