3494 Commits (cb29769a224104882ed7572087f8cd2db48475ef)

Author	SHA1	Message	Date
Alex Gleason	9ddc292ca8	TwitterAPI: test pending approval user email	4 years ago
Mark Felder	cddca85c84	Merge branch 'develop' into revert/rich-media-censorship	4 years ago
rinpatch	2698bbc9f6	Merge branch 'filtering-following' into 'develop' ... ActivityPub: Return Announces when filtering by `following`. See merge request pleroma/pleroma!3022	4 years ago
Mark Felder	346cc3ac24	Merge branch 'develop' into feature/1893-remote-emoji-packs-pagination	4 years ago
Alexander Strizhakov	cbdaabad34	web push http_client fix	4 years ago
lain	2a11068a11	Merge branch 'ffmpeg-imagemagick-dependencies-documentation' into 'develop' ... `ffmpeg` / `ImageMagick` handling as optional dependencies See merge request pleroma/pleroma!3031	4 years ago
Mark Felder	ba7f9459b4	Revert Rich Media censorship for sensitive statuses ... The #NSFW hashtag test was broken anyway.	4 years ago
Maksim Pechnikov	de993b856b	added `force` option to the unfollow operation	4 years ago
Ivan Tashkinov	4e4f771082	Adjusted MediaProxyControllerTest to gracefully fail on missing dependencies. Installation docs update. ... Added ffmpeg/imagemagick checks to launch checks (if media preview proxy is enabled). Added documentation on installing optional media / graphics packages (imagemagick, ffmpeg, exiftool).	4 years ago
Mark Felder	93b674b66d	Fix test failures for NoOpPolicy describe/0	4 years ago
rinpatch	f67c967c4a	Merge branch 'features/incoming-create-exists' into 'develop' ... transmogrifier: Drop incoming create early if it already exists See merge request pleroma/pleroma!3026	4 years ago
lain	47cd59342f	Merge branch 'smol-test' into 'develop' ... CommonAPI test: Add test for polls See merge request pleroma/pleroma!3028	4 years ago
lain	35d62a4a56	CommonAPI test: Add test for polls	4 years ago
Alexander Strizhakov	5d7ec00bed	fixes after rebase	4 years ago
Alexander Strizhakov	8c6ec4c111	pack routes change	4 years ago
Alexander Strizhakov	dbbc801667	pagination for remote emoji packs	4 years ago
Alexander Strizhakov	9b6d89ff8c	support for special chars in pack name	4 years ago
lain	436d1a3c41	Merge branch 'develop' into 'issue/2115' ... # Conflicts: # CHANGELOG.md	4 years ago
Haelwenn (lanodan) Monnier	5e86a2809e	transmogrifier: Drop incoming create early if it already exists	4 years ago
lain	a6c14041c4	Merge branch 'develop' into 'issue/1975' ... # Conflicts: # CHANGELOG.md	4 years ago
Maksim Pechnikov	8e4f043ac7	finland-emojis.zip -> emojis.zip	4 years ago
Maksim Pechnikov	72d2b34d3b	Merge branch 'develop' into issue/1975	4 years ago
Alex Gleason	3104367931	Merge remote-tracking branch 'upstream/develop' into email-fix-develop	4 years ago
lain	c95859e45b	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2115	4 years ago
lain	ee3052a2d8	ActivityPub: Return Announces when filtering by `following`.	4 years ago
Alex Gleason	bf181ca968	Fix MastoAPI.AuthControllerTest, json_response(:no_content) --> empty_json_response()	4 years ago
Alex Gleason	0b728ccc44	Pass hackney tls config into email tests, #2101	4 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	4 years ago
lain	b36b6259d8	Merge branch 'issue/2099' into 'develop' ... [#2099] Import/export mutes [BE] See merge request pleroma/pleroma!2965	4 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.	4 years ago
Ivan Tashkinov	60b025b782	[#2074] OAuth scope checking in Streaming API.	4 years ago
Maksim Pechnikov	ed3bc53fa1	Merge branch 'develop' into issue/2099	4 years ago
feld	6c052bd5b6	Merge branch 'media-preview-proxy-nostream' into 'develop' ... Media preview proxy See merge request pleroma/pleroma!3001	4 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	4 years ago
Steven Fuchs	f2ef9735c5	Federate data through persistent websocket connections	4 years ago
Maksim Pechnikov	2ec0dcf001	Merge branch 'develop' into issue/2099	4 years ago
Sergey Suprunenko	226fa3e486	Make WebPushEncryption use Pleroma.HTTP as an HTTP adapter	4 years ago
Ivan Tashkinov	a428800405	Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream ... # Conflicts: # CHANGELOG.md	4 years ago
Haelwenn (lanodan) Monnier	7bf269fe83	Fix MRF reject for ChatMessage	4 years ago
Haelwenn (lanodan) Monnier	abf25e5d52	Create MRF.filter_pipeline to inject :object_data when present	4 years ago
Haelwenn	beefc022dd	Merge branch 'omit-nondiscoverable-from-search' into 'develop' ... User search should respect discoverable flag See merge request pleroma/pleroma!2997	4 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	4 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	4 years ago
rinpatch	22d49993d9	Merge branch 'bugfix/mrf-ingestion' into 'develop' ... Bugfix: MRF and Pipeline Ingestion See merge request pleroma/secteam/pleroma!15	4 years ago
stwf	9d77f4abf8	adapt to new user factory behavior	4 years ago
stwf	41939e3175	User search respect discoverable flag	4 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	4 years ago
Ivan Tashkinov	d9fb5bc08a	Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream	4 years ago
Ivan Tashkinov	7cdbd91d83	[#2497] Configurability of :min_content_length (preview proxy). Refactoring, documentation, tests.	4 years ago
lain	7c60789ba5	Merge branch 'develop' into 'nondiscoverable-user-metadata' ... # Conflicts: # CHANGELOG.md	4 years ago