15384 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
FloatingGhost	d2d2bbe213	bump docker alpine	2023-07-20 17:32:02 +01:00
FloatingGhost	6fe7bdba46	bump alpine version	2023-07-20 17:31:55 +01:00
FloatingGhost	0fa0f60520	fix deps	2023-07-20 17:29:23 +01:00
FloatingGhost	f44babd130	restructure CI	2023-07-20 17:27:58 +01:00
FloatingGhost	827c6b3344	release	2023-07-20 17:13:14 +01:00
FloatingGhost	a91a3f6e60	test on push	2023-07-20 17:02:54 +01:00
FloatingGhost	f7a4147788	split by architecture	2023-07-20 17:02:41 +01:00
FloatingGhost	de1e487695	add potential arm setup	2023-07-20 17:01:29 +01:00
FloatingGhost	33e7ae7637	Allow nil attachments	2023-07-17 20:03:31 +01:00
floatingghost	fa40db6b5a	Merge pull request 'fix ImageMagick typo in media_graphics_packages.md' (#593) from norm/akkoma:media-graphics-typo into develop ... Reviewed-on: #593	2023-07-17 18:49:44 +00:00
floatingghost	ccd8cd6c59	Merge pull request 'Exclude deactivated users from emoji reaction lists' (#592) from active-emoji-reactions into develop ... Reviewed-on: #592	2023-07-17 18:49:15 +00:00
FloatingGhost	900b9b0124	Merge branch 'develop' into active-emoji-reactions	2023-07-17 19:45:43 +01:00
Norm	43aef8b5b1	fix ImageMagick typo in media_graphics_packages.md	2023-07-17 14:44:39 -04:00
FloatingGhost	f1611b6292	Update changelog	2023-07-17 19:19:03 +01:00
FloatingGhost	c63ae73bc0	Add embed controller tests	2023-07-17 19:18:21 +01:00
FloatingGhost	16d2bfef80	Ensure embeds will not be served if unauthenticated users could not see it	2023-07-17 18:24:53 +01:00
FloatingGhost	c8904f15a2	Correct behaviour of mediaproxy blocklist	2023-07-17 18:17:04 +01:00
FloatingGhost	8fe29bf5d2	Exclude deactivated users from emoji reaction lists	2023-07-17 17:53:03 +01:00
floatingghost	452f9e14fb	Merge pull request 'docs: Update Pleroma references to Akkoma in optional packages guide' (#550) from norm/akkoma:docs/media_graphics_packages into develop ... Reviewed-on: #550	2023-07-17 16:47:32 +00:00
floatingghost	5fa1cfc513	Merge pull request 'docs: Add Kaiteki to list of clients' (#548) from norm/akkoma:add-kaiteki into develop ... Reviewed-on: #548	2023-07-17 16:32:38 +00:00
floatingghost	2aac70d690	Merge pull request 'Add config for media subdomain for Caddy' (#555) from norm/akkoma:media-subdomain-caddyfile into develop ... Reviewed-on: #555	2023-07-17 16:30:42 +00:00
floatingghost	3fa65a5c53	Merge pull request 'docs: Update Pleroma-FE references to Akkoma-FE' (#551) from norm/akkoma:docs/akkoma-fe into develop ... Reviewed-on: #551	2023-07-17 16:28:41 +00:00
floatingghost	210df6fe92	Merge pull request 'Fix the /embed endpoint' (#540) from mikihau/akkoma:develop into develop ... Reviewed-on: #540	2023-07-15 20:48:30 +00:00
Norm	8c956bc671	Add OnlyMedia upload filter change to changelog	2023-06-28 01:56:34 +01:00
Mark Felder	5144d6f4ba	Add OnlyMedia Upload Filter to simplify restricting uploads to audio, image, and video types ... Original: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3897	2023-06-28 01:56:14 +01:00
floatingghost	3e4a279a1b	Merge pull request 'Implement blocklists for MediaProxy' (#574) from XxXCertifiedForkliftDriverXxX/akkoma:feature/mediaproxy-blocklist into develop ... Reviewed-on: #574	2023-06-28 00:54:25 +00:00
floatingghost	fc87baf1cf	Merge pull request 'Use OS CA store for Mint HTTP connections' (#573) from XxXCertifiedForkliftDriverXxX/akkoma:fix/use-os-certs into develop ... Reviewed-on: #573	2023-06-28 00:52:26 +00:00
XxXCertifiedForkliftDriverXxX	767e1272b3	Use OS CA store for Mint HTTP connections	2023-06-26 15:50:49 +02:00
XxXCertifiedForkliftDriverXxX	07b478dc49	Implement blocklists for MediaProxy	2023-06-26 15:18:31 +02:00
floatingghost	67cae52b08	Merge pull request 'Add asdf install guide for debian/ubuntu' (#559) from norm/akkoma:asdf into develop ... Reviewed-on: #559	2023-06-26 12:58:01 +00:00
floatingghost	4db42f5ab5	Merge pull request 'Adapt some migrations so they can be rolled back' (#565) from ilja/akkoma:fix_some_migrations_for_rollback into develop ... Reviewed-on: #565	2023-06-26 12:52:22 +00:00
floatingghost	145191ef26	Merge pull request 'Update docker compose commands to Compose V2' (#570) from norm/akkoma:docker-compose into develop ... Reviewed-on: #570	2023-06-26 12:37:38 +00:00
Norm	6674b33d75	update docs with new docker compose commands	2023-06-18 01:44:25 -04:00
Norm	2dfce40117	Update docker compose commands to Compose V2 ... This just replaces all instances of `docker-compose` with `docker compose` in the docker scripts. The old Compose V1 program is unsupported since 2021: https://docs.docker.com/compose/migrate/#will-i-still-be-able-to-use-compose-v1-if-i-really-want-to	2023-06-18 01:37:40 -04:00
tusooa	c0a01e73cf	Enforce unauth restrictions for public streaming endpoints	2023-06-14 22:45:19 +00:00
tusooa	fee6e2aac4	Fix deleting banned users' statuses	2023-06-14 22:45:19 +00:00
Haelwenn (lanodan) Monnier	8669a0abcb	UploadedMedia: Increase readability via ~s sigil	2023-06-14 22:45:19 +00:00
Haelwenn (lanodan) Monnier	37b0d774fa	UploadedMedia: Add missing disposition_type to Content-Disposition ... Set it to `inline` because the vast majority of what's sent is multimedia content while `attachment` would have the side-effect of triggering a download dialog. Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/3114	2023-06-14 22:45:19 +00:00
tusooa	1def80c2e7	Fix existing tests	2023-06-14 22:45:19 +00:00
tusooa	3095251e6c	Dedupe poll options	2023-06-14 22:45:19 +00:00
tusooa	79a18f761b	Allow with_relationships param for blocks	2023-06-14 22:45:19 +00:00
kPherox	8fb235e71b	fix: append field values to bio before parsing	2023-06-14 19:44:07 +00:00
kPherox	d6271e7613	feat: build rel me tags with profile fields	2023-06-14 19:44:07 +00:00
Alexander Tumin	5adce547d0	Require related object for notifications to filter on content	2023-06-14 19:41:48 +00:00
tusooa	05e80d1879	Fix block_from_stranger setting	2023-06-14 19:41:44 +00:00
tusooa	1268dbc562	Fix type of admin_account.is_confirmed	2023-06-14 19:38:22 +00:00
tusooa	651979217a	Fix failure when registering a user with no email when approval required	2023-06-14 19:33:58 +00:00
Mark Felder	997551bac9	Fix TwitterCard meta tags ... TwitterCard meta tags are supposed to use the attributes "name" and "content". OpenGraph tags use the attributes "property" and "content". Twitter itself is smart enough to detect broken meta tags and discover the TwitterCard using "property" and "content", but other platforms that only implement parsing of TwitterCards and not OpenGraph may fail to correctly detect the tags as they're under the wrong attributes. > "Open Graph protocol also specifies the use of property and content attributes for markup while > Twitter cards use name and content. Twitter’s parser will fall back to using property and content, > so there is no need to modify existing Open Graph protocol markup if it already exists." [0] [0] https://developer.twitter.com/en/docs/twitter-for-websites/cards/guides/getting-started	2023-06-14 19:30:19 +00:00
Tusooa Zhu	2a290cb331	Lint	2023-06-14 17:20:55 +00:00
Tusooa Zhu	dfd6c96808	Fix SideEffectsTest	2023-06-14 17:20:55 +00:00