fa40db6b5a
Merge pull request 'fix ImageMagick typo in media_graphics_packages.md' ( #593 ) from norm/akkoma:media-graphics-typo into develop
...
ci/woodpecker/push/woodpecker Pipeline is pending
Reviewed-on: #593
2023-07-17 18:49:44 +00:00
ccd8cd6c59
Merge pull request 'Exclude deactivated users from emoji reaction lists' ( #592 ) from active-emoji-reactions into develop
...
ci/woodpecker/push/woodpecker Pipeline is pending
Reviewed-on: #592
2023-07-17 18:49:15 +00:00
900b9b0124
Merge branch 'develop' into active-emoji-reactions
ci/woodpecker/push/woodpecker Pipeline is pending
ci/woodpecker/pr/woodpecker Pipeline is pending
2023-07-17 19:45:43 +01:00
43aef8b5b1
fix ImageMagick typo in media_graphics_packages.md
ci/woodpecker/pr/woodpecker Pipeline is pending
2023-07-17 14:44:39 -04:00
f1611b6292
Update changelog
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/pr/woodpecker Pipeline failed
2023-07-17 19:19:03 +01:00
c63ae73bc0
Add embed controller tests
2023-07-17 19:18:21 +01:00
16d2bfef80
Ensure embeds will not be served if unauthenticated users could not see it
2023-07-17 18:24:53 +01:00
c8904f15a2
Correct behaviour of mediaproxy blocklist
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/pr/woodpecker Pipeline was successful
2023-07-17 18:17:04 +01:00
8fe29bf5d2
Exclude deactivated users from emoji reaction lists
ci/woodpecker/push/woodpecker Pipeline is pending
ci/woodpecker/pr/woodpecker Pipeline failed
2023-07-17 17:53:03 +01:00
452f9e14fb
Merge pull request 'docs: Update Pleroma references to Akkoma in optional packages guide' ( #550 ) from norm/akkoma:docs/media_graphics_packages into develop
...
ci/woodpecker/push/woodpecker Pipeline is pending
Reviewed-on: #550
2023-07-17 16:47:32 +00:00
5fa1cfc513
Merge pull request 'docs: Add Kaiteki to list of clients' ( #548 ) from norm/akkoma:add-kaiteki into develop
...
ci/woodpecker/push/woodpecker Pipeline is pending
Reviewed-on: #548
2023-07-17 16:32:38 +00:00
2aac70d690
Merge pull request 'Add config for media subdomain for Caddy' ( #555 ) from norm/akkoma:media-subdomain-caddyfile into develop
...
ci/woodpecker/push/woodpecker Pipeline is pending
Reviewed-on: #555
2023-07-17 16:30:42 +00:00
3fa65a5c53
Merge pull request 'docs: Update Pleroma-FE references to Akkoma-FE' ( #551 ) from norm/akkoma:docs/akkoma-fe into develop
...
ci/woodpecker/push/woodpecker Pipeline is pending
Reviewed-on: #551
2023-07-17 16:28:41 +00:00
210df6fe92
Merge pull request 'Fix the /embed endpoint' ( #540 ) from mikihau/akkoma:develop into develop
...
ci/woodpecker/push/woodpecker Pipeline is pending
Reviewed-on: #540
2023-07-15 20:48:30 +00:00
8c956bc671
Add OnlyMedia upload filter change to changelog
ci/woodpecker/push/woodpecker Pipeline is pending
2023-06-28 01:56:34 +01:00
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
3e4a279a1b
Merge pull request 'Implement blocklists for MediaProxy' ( #574 ) from XxXCertifiedForkliftDriverXxX/akkoma:feature/mediaproxy-blocklist into develop
...
ci/woodpecker/push/woodpecker Pipeline is pending
Reviewed-on: #574
2023-06-28 00:54:25 +00:00
fc87baf1cf
Merge pull request 'Use OS CA store for Mint HTTP connections' ( #573 ) from XxXCertifiedForkliftDriverXxX/akkoma:fix/use-os-certs into develop
...
ci/woodpecker/push/woodpecker Pipeline is pending
Reviewed-on: #573
2023-06-28 00:52:26 +00:00
XxXCertifiedForkliftDriverXxX
767e1272b3
Use OS CA store for Mint HTTP connections
ci/woodpecker/pr/woodpecker Pipeline was successful
2023-06-26 15:50:49 +02:00
XxXCertifiedForkliftDriverXxX
07b478dc49
Implement blocklists for MediaProxy
ci/woodpecker/pr/woodpecker Pipeline is pending
2023-06-26 15:18:31 +02:00
67cae52b08
Merge pull request 'Add asdf install guide for debian/ubuntu' ( #559 ) from norm/akkoma:asdf into develop
...
ci/woodpecker/push/woodpecker Pipeline is pending
Reviewed-on: #559
2023-06-26 12:58:01 +00:00
4db42f5ab5
Merge pull request 'Adapt some migrations so they can be rolled back' ( #565 ) from ilja/akkoma:fix_some_migrations_for_rollback into develop
...
ci/woodpecker/push/woodpecker Pipeline is pending
Reviewed-on: #565
2023-06-26 12:52:22 +00:00
145191ef26
Merge pull request 'Update docker compose commands to Compose V2' ( #570 ) from norm/akkoma:docker-compose into develop
...
ci/woodpecker/push/woodpecker Pipeline is pending
Reviewed-on: #570
2023-06-26 12:37:38 +00:00
6674b33d75
update docs with new docker compose commands
ci/woodpecker/pr/woodpecker Pipeline is pending
2023-06-18 01:44:25 -04:00
2dfce40117
Update docker compose commands to Compose V2
...
ci/woodpecker/pr/woodpecker Pipeline is pending
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
5e3ca133f2
reword to not mention specific elixir version
ci/woodpecker/pr/woodpecker Pipeline is pending
2023-06-11 08:46:56 -04:00
ilja
3a13f91fff
Adapt some migrations so they can be rolled back
...
ci/woodpecker/pr/woodpecker Pipeline is pending
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
593ddbd796
fix the /embed endpoint
ci/woodpecker/pr/woodpecker Pipeline is pending
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
5fe41df8aa
docs: Add Kaiteki to list of clients
ci/woodpecker/pr/woodpecker Pipeline is pending
2023-05-31 18:19:06 -04:00
5ce38591e5
fix typo
ci/woodpecker/pr/woodpecker Pipeline is pending
2023-05-31 09:03:25 -04:00
2482d96782
remove one more java dep
2023-05-31 08:59:03 -04:00
f68b047bf7
remove java and gui dependencies
ci/woodpecker/pr/woodpecker Pipeline is pending
2023-05-31 08:46:05 -04:00
48a0145736
add command to restart shell
2023-05-30 21:21:44 -04:00
d956dc2f09
Add asdf install guide for debian/ubuntu
...
ci/woodpecker/pr/woodpecker Pipeline is pending
Closes #557
2023-05-30 21:17:26 -04:00
40627a94d4
Add config for media subdomain for Caddy
...
ci/woodpecker/pr/woodpecker Pipeline is pending
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
fb8081e1a3
Merge pull request 'Stop exposing if a user blocks you over the API.' ( #553 ) from XxXCertifiedForkliftDriverXxX/akkoma:feature/hide-blocked_by into develop
...
ci/woodpecker/push/woodpecker Pipeline is pending
Reviewed-on: #553
2023-05-28 22:02:33 +00:00
XxXCertifiedForkliftDriverXxX
1b560d547a
Stop exposing if a user blocks you over the API.
ci/woodpecker/pr/woodpecker Pipeline is pending
2023-05-28 23:42:27 +02:00
0e5f55deea
more references being updated
2023-05-26 22:54:12 -04:00
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
b3fc098b83
docs: Update Pleroma references to Akkoma in optional packages guide
...
ci/woodpecker/pr/woodpecker Pipeline is pending
This apparently slipped past though all of the doc updates from a while
back.
2023-05-26 22:26:14 -04:00
39b3d92cd8
Bump version
ci/woodpecker/tag/woodpecker Pipeline is pending
ci/woodpecker/push/woodpecker Pipeline was successful
2023-05-26 20:46:38 +01:00
Haelwenn (lanodan) Monnier
70b0f93865
Apply oembed patch
ci/woodpecker/push/woodpecker Pipeline is pending
2023-05-26 20:45:57 +01:00
a388d2503e
revert uploaded-media
ci/woodpecker/tag/woodpecker Pipeline is pending
ci/woodpecker/push/woodpecker Pipeline was successful
2023-05-26 12:06:41 +01:00
7fb9960ccd
Add CSP to mediaproxy links
ci/woodpecker/push/woodpecker Pipeline is pending
ci/woodpecker/tag/woodpecker Pipeline is pending
2023-05-26 11:46:18 +01:00
9d83a1e23f
Add csp
ci/woodpecker/push/woodpecker Pipeline is pending
2023-05-26 11:41:22 +01:00
82ca7a6470
bump version
ci/woodpecker/tag/woodpecker Pipeline is pending
2023-05-23 14:10:01 +01:00
9e9cf58fdf
or not
ci/woodpecker/push/woodpecker Pipeline is pending
ci/woodpecker/tag/woodpecker Pipeline is pending
2023-05-23 13:54:22 +01:00
2fc26609f6
ensure we depend on poison
ci/woodpecker/push/woodpecker Pipeline is pending
2023-05-23 13:53:54 +01:00
8c208f751d
Fix filtering out incorrect addresses
ci/woodpecker/push/woodpecker Pipeline is pending
2023-05-23 13:46:25 +01:00
