15192 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
Norm	5e3ca133f2	reword to not mention specific elixir version	2023-06-11 08:46:56 -04:00
ilja	3a13f91fff	Adapt some migrations so they can be rolled back ... This is useful for people who want to migrate back to Pleroma. It's also added in the docs, but also noted that this is barely tested and to be used at their own risk.	2023-06-09 22:02:26 +02:00
Miki Hau	593ddbd796	fix the /embed endpoint	2023-05-31 23:42:08 +00:00
lain	1ae89bddcd	Merge branch 'feature/embeddable-posts' into 'develop' ... Add embeddable posts Closes #1288 See merge request pleroma/pleroma!2319	2023-05-31 23:40:16 +00:00
Norm	5fe41df8aa	docs: Add Kaiteki to list of clients	2023-05-31 18:19:06 -04:00
Norm	5ce38591e5	fix typo	2023-05-31 09:03:25 -04:00
Norm	2482d96782	remove one more java dep	2023-05-31 08:59:03 -04:00
Norm	f68b047bf7	remove java and gui dependencies	2023-05-31 08:46:05 -04:00
Norm	48a0145736	add command to restart shell	2023-05-30 21:21:44 -04:00
Norm	d956dc2f09	Add asdf install guide for debian/ubuntu ... Closes #557	2023-05-30 21:17:26 -04:00
Norm	40627a94d4	Add config for media subdomain for Caddy ... A recent group of vulnerabilities have been found in Pleroma (and inherited by Akkoma) that involve media files either uploaded by local users or proxied from remote instances (if media proxy is enabled). It is recommended that media files are served on a separate subdomain in order to mitigate this class of vulnerabilities. Based on https://meta.akkoma.dev/t/another-vector-for-the-injection-vulnerability-found/483/2	2023-05-29 14:04:00 -04:00
floatingghost	fb8081e1a3	Merge pull request 'Stop exposing if a user blocks you over the API.' (#553) from XxXCertifiedForkliftDriverXxX/akkoma:feature/hide-blocked_by into develop ... Reviewed-on: #553	2023-05-28 22:02:33 +00:00
XxXCertifiedForkliftDriverXxX	1b560d547a	Stop exposing if a user blocks you over the API.	2023-05-28 23:42:27 +02:00
Norm	0e5f55deea	more references being updated	2023-05-26 22:54:12 -04:00
Norm	f0f0c76805	docs: Update Pleroma-FE references to Akkoma-FE ... The frontend got renamed a while back, so the docs should be updated to reflect that.	2023-05-26 22:36:27 -04:00
FloatingGhost	39b3d92cd8	Bump version	2023-05-26 20:46:38 +01:00
Haelwenn (lanodan) Monnier	70b0f93865	Apply oembed patch	2023-05-26 20:45:57 +01:00
FloatingGhost	a388d2503e	revert uploaded-media	2023-05-26 12:06:41 +01:00
FloatingGhost	7fb9960ccd	Add CSP to mediaproxy links	2023-05-26 11:46:18 +01:00
FloatingGhost	9d83a1e23f	Add csp	2023-05-26 11:41:22 +01:00
FloatingGhost	82ca7a6470	bump version	2023-05-23 14:10:01 +01:00
FloatingGhost	9e9cf58fdf	or not	2023-05-23 13:54:22 +01:00
FloatingGhost	2fc26609f6	ensure we depend on poison	2023-05-23 13:53:54 +01:00
FloatingGhost	8c208f751d	Fix filtering out incorrect addresses	2023-05-23 13:46:25 +01:00
FloatingGhost	037f881187	Fix create processing in direct message disabled	2023-05-23 13:16:20 +01:00
FloatingGhost	ab34680554	switch to using an enum system for DM acceptance	2023-05-23 10:29:08 +01:00
FloatingGhost	d310f99d6a	Add MRFs for direct message manipulation	2023-05-22 23:53:44 +01:00
floatingghost	4e969758e5	Merge pull request 'fix remote interaction form style' (#542) from denys/akkoma:style-remote-interaction into develop ... Reviewed-on: #542	2023-05-22 21:35:51 +00:00
floatingghost	f72d773cc3	Merge pull request 'Make UserNote comment default to the empty string.' (#530) from provable_ascent/akkoma:provable_ascent-patch-1 into develop ... Reviewed-on: #530	2023-05-22 21:33:01 +00:00
floatingghost	3437e11cf7	Merge pull request 'Return empty string in the event of no detected language' (#535) from midnight/akkoma:fix-libretranslate into develop ... Reviewed-on: #535	2023-05-22 21:30:51 +00:00
floatingghost	6225f24f5f	Merge pull request 'Clean up bookmarks after prune_objects' (#544) from ilja/akkoma:clean_up_bookmarks_after_prune_objects into develop ... Reviewed-on: #544	2023-05-22 21:28:48 +00:00
ilja	f49e9e6d4c	Clean up bookmarks after prune_objects ... When doing prune_objects, it's possible that bookmarked objects are deleted. This gave problems when fetching the bookmark TL. Here we clean up the bookmarks during pruning in the case were it's possible that bookmarked objects are deleted.	2023-05-21 13:02:28 +02:00
ilja	c7fb78cc32	Move deadline and old_insert_date to setup ... Several tests for prune_objetcs need a date older than the deadline for pruning, so I moved that to the setup	2023-05-21 12:01:54 +02:00
Denys Nykula	ddf4d8026d	fix remote interaction form style	2023-05-18 22:53:40 +03:00
provable_ascent	3fef9d1b67	Merge branch 'develop' into provable_ascent-patch-1	2023-05-12 02:19:13 +00:00