pleroma

Commit Graph

Author	SHA1	Message	Date
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
lain	bb70b231d0	Merge branch 'reply-visibility-user-guard' into 'develop' Mastodon API: fix the public timeline returning an error when the `reply_visibility` parameter is set to `self` for an unauthenticated user See merge request pleroma/pleroma!2999	3 years ago
rinpatch	22d49993d9	Merge branch 'bugfix/mrf-ingestion' into 'develop' Bugfix: MRF and Pipeline Ingestion See merge request pleroma/secteam/pleroma!15	3 years ago
stwf	9d77f4abf8	adapt to new user factory behavior	3 years ago
stwf	dfc621a529	add test and changelog entry	3 years ago
stwf	41939e3175	User search respect discoverable flag	3 years ago
rinpatch	eff7f9892d	Merge branch 'hotfix/rich-media-compile-error' into 'develop' RichMedia: fix a compilation error due to nonexistent variable See merge request pleroma/pleroma!2996	3 years ago
rinpatch	dee4639dbb	Merge branch 'feat/rich-media-head' into 'develop' RichMedia: Do a HEAD request to check content type/length See merge request pleroma/pleroma!2995	3 years ago
feld	6b9bfc9e86	Merge branch 'fix/configdb-migration-with-deprecated' into 'develop' Deny ConfigDB migration when deprecated settings found Closes #2148 See merge request pleroma/pleroma!3005	3 years ago
Mark Felder	f7e40f7ef1	Deny ConfigDB migration when deprecated settings found	3 years ago
lain	2a7c9ac147	Merge branch 'nondiscoverable-user-metadata' into 'develop' search indexing metadata should respect discoverable flag See merge request pleroma/pleroma!2998	3 years ago
Ivan Tashkinov	d9fb5bc08a	Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream	3 years ago
Ivan Tashkinov	7cdbd91d83	[#2497 ] Configurability of :min_content_length (preview proxy). Refactoring, documentation, tests.	3 years ago
rinpatch	cd93aa2aed	Merge branch 'fix/rich-media-log-spam-and-ttl-reset' into 'develop' RichMedia: Fix log spam on failures and resetting TTL on cached errors See merge request pleroma/pleroma!3006	3 years ago
lain	7c60789ba5	Merge branch 'develop' into 'nondiscoverable-user-metadata' # Conflicts: # CHANGELOG.md	3 years ago
rinpatch	db80b9d630	RichMedia: Fix log spam on failures and resetting TTL on cached errors	3 years ago
eugenijm	c711a2b157	Return the file content for `GET /api/pleroma/admin/instance_document/:document_name`	3 years ago
stwf	f58262c673	add description to changelog	3 years ago
eugenijm	582ad5d4e1	AdminAPI: Allow to modify Terms of Service and Instance Panel via Admin API	3 years ago
lain	5426eb5997	Merge branch 'chat-moderation' into 'develop' Chat moderation MVP See merge request pleroma/pleroma!2937	3 years ago
lain	5e3c70afa5	AdminAPI Chat tests: Remove factory. The factory system doesn't work too well with how the chats are done. Instead of tempting people to use it, let's rather use the CommonAPI system for now.	3 years ago
lain	e39ff2616b	Admin chat api tests: Small additions.	3 years ago
lain	7a73850928	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-chat-moderation	3 years ago
Maksim Pechnikov	5a8ea0a5b0	small refactoring	3 years ago
Maksim Pechnikov	b867f9d7ae	Merge branch 'develop' into issue/2099	3 years ago

1 2 3 4 5 ...

11840 Commits (a8c17ea25a79491328345f5834397eb6821a77f1) All Branches Search

11840 Commits (a8c17ea25a79491328345f5834397eb6821a77f1)

All Branches