pleroma

Commit Graph

Author	SHA1	Message	Date
lain	4655407451	Apply suggestion to config/description.exs	4 years ago
Egor Kislitsyn	d44843e677	Restrict ActivityExpirationPolicy to Notes only	4 years ago
Egor Kislitsyn	da22119c2f	Merge branch 'develop' into global-status-expiration	4 years ago
lain	d192492658	Merge branch 'openapi/admin/relay' into 'develop' Add OpenAPI spec for AdminAPI.RelayController See merge request pleroma/pleroma!2579	4 years ago
lain	c450b248cc	Merge branch 'feature/delete-follow-requests-on-user-deletion' into 'develop' Delete outgoing pending follow requests on user deletion See merge request pleroma/pleroma!2631	4 years ago
lain	a1aa9fa913	Merge branch 'activity-pub-use-atoms-as-keys' into 'develop' Use atoms as keys in `ActivityPub.fetch_*` options See merge request pleroma/pleroma!2629	4 years ago
Sergey Suprunenko	8d9e586887	Delete pending follow requests on user deletion	4 years ago
Egor Kislitsyn	167812a3f2	Fix pagination	4 years ago
Egor Kislitsyn	b02df1803e	Merge remote-tracking branch 'origin/develop' into activity-pub-use-atoms-as-keys	4 years ago
Haelwenn	d74985af23	Merge branch 'features/apc2s-pagination' into 'develop' Fix AP C2S pagination Closes #866 and #751 See merge request pleroma/pleroma!2491	4 years ago
Haelwenn	657e1583f8	Merge branch 'features/put_if_present' into 'develop' Create Pleroma.Maps.put_if_present(map, key, value, value_function // &{:ok, &1}) :: map See merge request pleroma/pleroma!2436	4 years ago
Haelwenn	54bae06b4f	Create Pleroma.Maps.put_if_present(map, key, value, value_fun // &{:ok, &1}) Unifies all the similar functions to one and simplify some blocks with it.	4 years ago
Egor Kislitsyn	317e2b8d61	Use atoms as keys in `ActivityPub.fetch_*` functions options	4 years ago
minibikini	b57e4ad1ab	Merge branch 'develop' into 'openapi/admin/relay' # Conflicts: # lib/pleroma/web/admin_api/controllers/admin_api_controller.ex	4 years ago
lain	f5cb1f3616	Merge branch 'openapi/admin/config' into 'develop' Add OpenAPI spec to AdminAPI.ConfigController See merge request pleroma/pleroma!2606	4 years ago
Egor Kislitsyn	a8132690bd	Fix credo	4 years ago
Egor Kislitsyn	70f054b083	Merge branch 'develop' into openapi/admin/relay	4 years ago
Egor Kislitsyn	b4d5bdd6f1	Merge branch 'develop' into openapi/admin/config	4 years ago
lain	d6693a9102	Merge branch 'openapi/admin/reports' into 'develop' Add OpenAPI spec for AdminAPI.ReportController See merge request pleroma/pleroma!2628	4 years ago
Egor Kislitsyn	c16315d055	Add OpenAPI spec for AdminAPI.ReportController	4 years ago
Egor Kislitsyn	9d572f2f66	Move report actions to AdminAPI.ReportController	4 years ago
Haelwenn	18b050dfd1	Merge branch 'openapi/update-admin-api/status' into 'develop' Update OpenAPI spec for AdminAPI.StatusController See merge request pleroma/pleroma!2624	4 years ago
lain	d28d88766b	Merge branch 'admin-api/account-view' into 'develop' Use AdminAPI.StatusView in api/admin/users Closes #1836 See merge request pleroma/pleroma!2627	4 years ago
Egor Kislitsyn	8a43611e01	Use AdminAPI.StatusView in api/admin/users	4 years ago
lain	12c2b3b831	Merge branch 'patch-3' into 'develop' docs: clients.md: Add Husky See merge request pleroma/pleroma!2626	4 years ago
Alibek Omarov	030240ee8f	docs: clients.md: Add Husky	4 years ago
feld	6c1c2cddec	Merge branch 'fix/1794-hashtag-search-results' into 'develop' [#1794] Improvements to hashtags extraction from search query Closes #1794 See merge request pleroma/pleroma!2611	4 years ago
Egor Kislitsyn	7922e63825	Update OpenAPI spec for AdminAPI.StatusController	4 years ago
Egor Kislitsyn	68cb152a08	Merge branch 'develop' into openapi/admin/relay	4 years ago
lain	879304dcd9	Merge branch 'replies-domain-block' into 'develop' Replies domain block Closes #1650 See merge request pleroma/pleroma!2622	4 years ago
lain	5da38c15cd	Merge branch 'openapi/admin/oauth-apps' into 'develop' Add OpenAPI spec for AdminAPI.OAuthAppContoller See merge request pleroma/pleroma!2582	4 years ago
lain	6977500ef7	Merge branch 'tagline' into 'develop' Update default instance description See merge request pleroma/pleroma!2600	4 years ago
lain	022d975a39	Merge branch 'openapi/admin/invites' into 'develop' Add OpenAPI spec for AdminAPI.InviteController See merge request pleroma/pleroma!2585	4 years ago
lain	2860c66e88	Merge branch 'feature/embeddable-posts' into 'develop' Add embeddable posts Closes #1288 See merge request pleroma/pleroma!2319	4 years ago
lain	cd2abcc0e3	Merge branch 'fix/invisible-repeats' into 'develop' Do not include activities of invisible users unless explicitly requested Closes #1833 See merge request pleroma/pleroma!2620	4 years ago
rinpatch	165a4b2a69	Do not include activities of invisible users unless explicitly requested Closes #1833	4 years ago
lain	2db7a0d6b6	Merge branch 'weblate-pleroma-pleroma' into 'develop' Translations update from Weblate See merge request pleroma/pleroma!2623	4 years ago
Fristi	81fb45a71b	Translated using Weblate (Dutch) Currently translated at 29.2% (31 of 106 strings) Translation: Pleroma/Pleroma backend Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/nl/	4 years ago
lain	d111eae798	Merge branch 'feature/status-by-id-account-view' into 'develop' another view for account in admin-fe status_show Closes #1783 See merge request pleroma/pleroma!2543	4 years ago
Alexander Strizhakov	19f468c5bc	replies filtering for blocked domains	4 years ago
rinpatch	6fb900a496	Merge branch 'user-updates' into 'develop' AccountController: Federate user account changes. Closes pleroma-support#33 and #1801 See merge request pleroma/pleroma!2617	4 years ago
rinpatch	d67b8a96c7	Merge branch 'only-creates-in-public-tl' into 'develop' TimelineController: Only return `Create` in public timelines. Closes #1833 and #1821 See merge request pleroma/pleroma!2618	4 years ago
Alexander Strizhakov	7e6ec778d9	exclude replies on blocked domains	4 years ago
Egor Kislitsyn	6b84c62d4a	Merge remote-tracking branch 'origin/develop' into feature/embeddable-posts	4 years ago
lain	fa37bfff99	Merge branch 'default-to-hackney-again' into 'develop' Config: Default to Hackney again See merge request pleroma/pleroma!2619	4 years ago
Egor Kislitsyn	a7627bdc7a	Merge remote-tracking branch 'origin/develop' into global-status-expiration	4 years ago
lain	ac31f687c0	Config: Default to Hackney again Gun needs some server setting changes (files) and has problems with OTP 23 (wildcards), so use Hackney as a default again for now.	4 years ago
lain	d4d4b92f75	TimelineController: Only return `Create` in public timelines.	4 years ago
lain	9460983032	AccountController: Federate user account changes. Hotfixy commit, will be moved to the pipeline.	4 years ago
Haelwenn	e96765df6b	Merge branch 'chore/bump-hackney' into 'develop' mix.lock: update hackney to 1.16.0 Closes #1612 See merge request pleroma/pleroma!2614	4 years ago

1 2 3 4 5 ...

9947 Commits (4655407451c8dd05b6024f607e598359047efce2) All Branches Search

9947 Commits (4655407451c8dd05b6024f607e598359047efce2)

All Branches