11838 Commits (4e4f77108207157a49a627edb03951e2f15b62f1)

 

All Branches   

Search

Author	SHA1	Message	Date
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
Ivan Tashkinov	7cd662f18c	Added documentation on installation of `ffmpeg` and `ImageMagick` dependencies.	4 years ago
rinpatch	151df9fc17	Merge branch 'fix/test-fix' into 'develop' ... Fix for test on mac See merge request pleroma/pleroma!3027	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	165961f56d	don't run in async mode	4 years ago
Alexander Strizhakov	aa1f97a5b6	fix for test on mac	4 years ago
lain	e02101e15c	Merge branch 'issue/2115' into 'develop' ... [#2115] added paginate links to headers for /chats/:id/messages See merge request pleroma/pleroma!2981	4 years ago
lain	4dadb7c433	Merge branch 'user-query/filter-out-internal' into 'develop' ... Filter out internal users by default Closes #2147 See merge request pleroma/pleroma!3024	4 years ago
lain	436d1a3c41	Merge branch 'develop' into 'issue/2115' ... # Conflicts: # CHANGELOG.md	4 years ago
lain	a5e1c400e4	Merge branch 'issue/1975' into 'develop' ... [#1975] import emoji from a zip archive Closes admin-fe#130 See merge request pleroma/pleroma!2911	4 years ago
lain	a6c14041c4	Merge branch 'develop' into 'issue/1975' ... # Conflicts: # CHANGELOG.md	4 years ago
lain	34235bc02a	Merge branch 'email-fix-develop' into 'develop' ... Allow emails to be sent again (develop) Closes #2172 See merge request pleroma/pleroma!3025	4 years ago
lain	518c0f2962	Changelog: Add info about emoji zip import feature	4 years ago
lain	9d6415de15	Changelog: Info about email fix.	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	df1eb5cf7e	Changelog: Add info about chat pagination fix.	4 years ago
lain	c95859e45b	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2115	4 years ago
Egor Kislitsyn	0e0ece251a	Filter out internal users by default	4 years ago
feld	02f12ec625	Merge branch 'chore/missing-link' into 'develop' ... Add FreeBSD and alpha sort See merge request pleroma/pleroma!3023	4 years ago
Mark Felder	3174804f3c	Add FreeBSD and alpha sort	4 years ago
feld	d65e6e152a	Merge branch 'docs/nginx-config-fedsockets' into 'develop' ... Docs/nginx config fedsockets See merge request pleroma/pleroma!3020	4 years ago
Mark Felder	8906f30ba1	Use an upstream for reverse proxy so future modifications are simplified	4 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	4 years ago
Mark Felder	ade7fede71	Most proxy settings can be global	4 years ago
Mark Felder	2b553b8f8e	Remove duplicate setting	4 years ago
Mark Felder	75f6e5e8b7	Add FedSockets config	4 years ago
feld	a5c34e3123	Merge branch 'fix/fedsocket-useragent' into 'develop' ... Minor Fedsocket improvements See merge request pleroma/pleroma!3012	4 years ago
Alex Gleason	bf181ca968	Fix MastoAPI.AuthControllerTest, json_response(:no_content) --> empty_json_response()	4 years ago
Mark Felder	7b2bf381e9	Chase the Autolinker rename from !2677	4 years ago
Alex Gleason	0b728ccc44	Pass hackney tls config into email tests, #2101	4 years ago
Alex Gleason	23d5d7cf59	Fix #2172 HTTP error on password reset	4 years ago
Alex Gleason	8b6ac45f3c	Allow emails to be sent again, #2101 #2172 ... https://github.com/swoosh/swoosh/issues/478#issuecomment-642393707	4 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	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
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	4 years ago
Mark Felder	8afdbcdb1c	Force HTTP for fedsockets	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
lain	882c1fc6bd	Merge branch 'weblate-pleroma-pleroma' into 'develop' ... Translations update from Weblate See merge request pleroma/pleroma!3014	4 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/	4 years ago
Kana	d72970a1fc	Added translation using Weblate (Chinese (Simplified))	4 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	4 years ago
Ivan Tashkinov	60b025b782	[#2074] OAuth scope checking in Streaming API.	4 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	4 years ago
rinpatch	51116b5392	OpenAPI: fix various errors pointed out by editor.swagger.io	4 years ago
Mark Felder	26859c549c	Add user agent to fedsocket requests	4 years ago
Maksim Pechnikov	ed3bc53fa1	Merge branch 'develop' into issue/2099	4 years ago