pleroma

Commit Graph

Author	SHA1	Message	Date
Egor Kislitsyn	0e0ece251a	Filter out internal users by default	3 years ago
feld	02f12ec625	Merge branch 'chore/missing-link' into 'develop' Add FreeBSD and alpha sort See merge request pleroma/pleroma!3023	3 years ago
Mark Felder	3174804f3c	Add FreeBSD and alpha sort	3 years ago
feld	d65e6e152a	Merge branch 'docs/nginx-config-fedsockets' into 'develop' Docs/nginx config fedsockets See merge request pleroma/pleroma!3020	3 years ago
Mark Felder	8906f30ba1	Use an upstream for reverse proxy so future modifications are simplified	3 years ago
feld	637ce939d9	Merge branch 'chore/autolinker-rename' into 'develop' Chase the Autolinker rename from !2677 Closes #2155 See merge request pleroma/pleroma!3019	3 years ago
Mark Felder	ade7fede71	Most proxy settings can be global	3 years ago
Mark Felder	2b553b8f8e	Remove duplicate setting	3 years ago
Mark Felder	75f6e5e8b7	Add FedSockets config	3 years ago
feld	a5c34e3123	Merge branch 'fix/fedsocket-useragent' into 'develop' Minor Fedsocket improvements See merge request pleroma/pleroma!3012	3 years ago
Mark Felder	7b2bf381e9	Chase the Autolinker rename from !2677	3 years ago
lain	59680f27ff	Merge branch 'bugfix/federator-actor-error' into 'develop' federator: normalize only actor, catch actor error See merge request pleroma/pleroma!2986	3 years ago
lain	9108e27c2f	Merge branch '2074-streaming-api-oauth-scopes-validation' into 'develop' [#2074] OAuth scope checking in Streaming API Closes #2074 See merge request pleroma/pleroma!3013	3 years ago
lain	b36b6259d8	Merge branch 'issue/2099' into 'develop' [#2099] Import/export mutes [BE] See merge request pleroma/pleroma!2965	3 years ago
Haelwenn	994ce250c2	Merge branch '2161-block-changes' into 'develop' ActivityPub: Don't block-filter your own posts Closes #2161 See merge request pleroma/pleroma!3017	3 years ago
Mark Felder	8afdbcdb1c	Force HTTP for fedsockets	3 years ago
lain	f2f0a0260f	ActivityPub: Don't block-filter your own posts We are filtering out replies to people you block, but that should not include your own posts.	3 years ago
lain	882c1fc6bd	Merge branch 'weblate-pleroma-pleroma' into 'develop' Translations update from Weblate See merge request pleroma/pleroma!3014	3 years ago
Kana	f3c62b246d	Translated using Weblate (Chinese (Simplified)) Currently translated at 24.5% (26 of 106 strings) Translation: Pleroma/Pleroma backend Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma/zh_Hans/	3 years ago
Kana	d72970a1fc	Added translation using Weblate (Chinese (Simplified))	3 years ago
rinpatch	402acce525	Merge branch 'fix/openapi-errors' into 'develop' OpenAPI: fix various errors pointed out by editor.swagger.io See merge request pleroma/pleroma!3011	3 years ago
Ivan Tashkinov	60b025b782	[#2074 ] OAuth scope checking in Streaming API.	3 years ago
rinpatch	4b12e071ac	OpenAPI: make it possible to generate a spec without starting the app Needed for api docs generation on pleroma.social that will come later	3 years ago
rinpatch	51116b5392	OpenAPI: fix various errors pointed out by editor.swagger.io	3 years ago
Mark Felder	26859c549c	Add user agent to fedsocket requests	3 years ago
Maksim Pechnikov	ed3bc53fa1	Merge branch 'develop' into issue/2099	3 years ago
feld	6c052bd5b6	Merge branch 'media-preview-proxy-nostream' into 'develop' Media preview proxy See merge request pleroma/pleroma!3001	3 years ago
lain	91ddd47e51	Merge branch 'fix/fedsocket-log-spam' into 'develop' FedSockets: fix log spam on cached rejects See merge request pleroma/pleroma!3009	3 years ago
rinpatch	26c571df33	FedSockets: fix log spam on cached rejects	3 years ago
lain	7e02f4ed3b	Merge branch 'feature/2118-web-push-encryption-http' into 'develop' Make WebPushEncryption use Pleroma.HTTP as an HTTP adapter Closes #2118 See merge request pleroma/pleroma!3008	3 years ago
lain	875b6654ec	Merge branch 'websocket-data-fed' into 'develop' Federate data through persistent websocket connections See merge request pleroma/pleroma!2408	3 years ago
Steven Fuchs	f2ef9735c5	Federate data through persistent websocket connections	3 years ago
Maksim Pechnikov	2159daa9af	update changelog	3 years ago
Maksim Pechnikov	2ec0dcf001	Merge branch 'develop' into issue/2099	3 years ago
Sergey Suprunenko	226fa3e486	Make WebPushEncryption use Pleroma.HTTP as an HTTP adapter	3 years ago
rinpatch	49584a9928	Merge branch 'stable-sync/2.1.2' into 'develop' Sync develop with 2.1.2 Closes #2133, #2131, and #2130 See merge request pleroma/pleroma!3007	3 years ago
Ivan Tashkinov	a428800405	Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream # Conflicts: # CHANGELOG.md	3 years ago
rinpatch	065a4dddfd	Merge branch 'stable' into stable-sync/2.1.2	3 years ago
rinpatch	a0f5e8b27e	Merge branch 'release/2.1.2' into 'stable' Release/2.1.2 See merge request pleroma/secteam/pleroma!17	3 years ago
Haelwenn (lanodan) Monnier	7bf269fe83	Fix MRF reject for ChatMessage	3 years ago
Haelwenn (lanodan) Monnier	abf25e5d52	Create MRF.filter_pipeline to inject :object_data when present	3 years ago
Haelwenn (lanodan) Monnier	3a0f99ed35	KeywordPolicy: Still match when fields are absent	3 years ago
rinpatch	34afc2b074	pleroma-fe bundle: bump to `b225c3578f`	3 years ago
rinpatch	b751c5babc	CHANGELOG.md: Add 2.1.2 entry	3 years ago
Haelwenn	beefc022dd	Merge branch 'omit-nondiscoverable-from-search' into 'develop' User search should respect discoverable flag See merge request pleroma/pleroma!2997	3 years ago
feld	608824b97e	Merge branch 'instance-docs' into 'develop' AdminAPI: Allow to modify Terms of Service and Instance Panel via Admin API Closes #1516 See merge request pleroma/pleroma!2931	3 years ago
rinpatch	a5d6c9aa8e	mix.exs: bump version to 2.1.2	3 years ago
rinpatch	6bbd65fb09	Merge branch '2130-mfa-users-oauth-login-fix' into 'develop' [#2130] Fixed OAuth OOB authentication for users with enabled MFA Closes #2130 See merge request pleroma/pleroma!2979	3 years ago
rinpatch	608017b7df	Merge branch 'fix/streaming-termination-errors' into 'develop' Fix two pseudo-errors in websocket handler Closes #2131 See merge request pleroma/pleroma!2982	3 years ago
Haelwenn	0465bdbd49	Merge branch 'fix/mrf-simple-welcome-chats' into 'develop' Ensure we only apply media_nsfw simple policy on parsable objects Closes #2133 See merge request pleroma/pleroma!2992	3 years ago

1 2 3 4 5 ...

11807 Commits (0e0ece251af9f85d80968df5b43fe49b85f35434) All Branches Search

11807 Commits (0e0ece251af9f85d80968df5b43fe49b85f35434)

All Branches