fedi/akkoma
1
0
Fork 0
mirror of https://akkoma.dev/AkkomaGang/akkoma.git synced 2024-11-01 06:14:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
6483 commits 26 branches 107 tags 316 MiB
Commit graph

6483 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ariadne Conill 492d854e7a transmogrifier: use User.delete() instead of handrolled user deletion code for remote users 
Closes #1104
 2019-07-28 21:32:04 +00:00
kaniini 44bfff22a7 Merge branch 'confirmation-resend' into 'develop' 
add account confirmation email resend in mastodon api

See merge request pleroma/pleroma!1492
 2019-07-28 20:30:10 +00:00
Sachin Joshi 242f5c585e add account confirmation email resend in mastodon api 2019-07-28 20:30:10 +00:00
kaniini 0d05ec3855 Merge branch 'fix/user_update_and_set_cache' into 'develop' 
fixed User.update_and_set_cache for stale user

See merge request pleroma/pleroma!1493
 2019-07-28 20:29:27 +00:00
Maksim 6a4b8b2681 fixed User.update_and_set_cache for stale user 2019-07-28 20:29:26 +00:00
kaniini 488c06b6f5 Merge branch 'develop' into 'develop' 
Fix HTTP sig tweak on KeyId

See merge request pleroma/pleroma!1496
 2019-07-28 20:25:35 +00:00
kaniini f78390ffdf Merge branch 'feature/hackney-303-redirect' into 'develop' 
Handle 303 redirects

Closes #1127

See merge request pleroma/pleroma!1497
 2019-07-28 20:24:39 +00:00
Sergey Suprunenko 02dc651828 Handle 303 redirects 2019-07-28 20:24:39 +00:00
Thomas Sileo 961e778531 Fix HTTP sig tweak on KeyId 2019-07-28 14:17:56 +02:00
rinpatch 08960d5016 Merge branch 'issue/1097' into 'develop' 
[#1097] added redirect: /pleroma/admin -> /pleroma/admin/

See merge request pleroma/pleroma!1495
 2019-07-26 20:27:38 +00:00
Maksim 6b77a88365 [#1097] added redirect: /pleroma/admin -> /pleroma/admin/ 2019-07-26 20:27:38 +00:00
Haelwenn 46e8b68093 Merge branch 'changelog/1484-base_url-remove-media' into 'develop' 
Changelog: !1484 base_url removed /media/

See merge request pleroma/pleroma!1494
 2019-07-26 15:27:12 +00:00
Haelwenn (lanodan) Monnier 7c8abbcb1c
CHANGELOG.md: Add entry for !1484 
Related to: https://git.pleroma.social/pleroma/pleroma/merge_requests/1484

[ci skip]
 2019-07-26 17:26:37 +02:00
rinpatch 41e0304757 Merge branch 'develop' into feature/hide-follows-remote 2019-07-25 18:43:30 +03:00
sadposter df10367b35 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-07-25 12:00:29 +01:00
kaniini d1e891062e Merge branch 'tests/filter_dedupe' into 'develop' 
fixed test for elixir 1.7.4

See merge request pleroma/pleroma!1487
 2019-07-25 03:43:13 +00:00
Maksim 03c386614f fixed test for elixir 1.7.4 2019-07-25 03:43:13 +00:00
kaniini 19835be067 Merge branch 'fix-remote-follow-from-ostatus-subscribe' into 'develop' 
Fix remote follow from /ostatus_subscribe

Closes #1103

See merge request pleroma/pleroma!1472
 2019-07-24 19:29:01 +00:00
kaniini 931c4974ee Merge branch 'fix/put-correct-activity-url' into 'develop' 
Show the url advertised in the Activity in the Status JSON response

Closes #1077

See merge request pleroma/pleroma!1485
 2019-07-24 19:28:21 +00:00
Sergey Suprunenko b20020da16 Show the url advertised in the Activity in the Status JSON response 2019-07-24 19:28:21 +00:00
kPherox 8d9f43e1d1
Add WebFinger test for AP-only account 2019-07-25 01:27:34 +09:00
kaniini acd20914ec Merge branch 'fix/Upload_base_url' into 'develop' 
Fix/upload base url

See merge request pleroma/pleroma!1484
 2019-07-24 15:35:25 +00:00
feld 84fca14c3c Do not prepend /media/ when using base_url 
This ensures admin has full control over the path where media resides.
 2019-07-24 15:35:25 +00:00
Mike Verdone 0e2b5a3e6a WIP 2019-07-24 17:25:11 +02:00
kPherox ac27b94ffa
Change to not require magic-public-key on WebFinger 2019-07-25 00:21:32 +09:00
kaniini 7286cdff7a Merge branch 'tests/web_finger' into 'develop' 
tests WebFinger

See merge request pleroma/pleroma!1483
 2019-07-24 15:13:11 +00:00
Maksim 55341ac717 tests WebFinger 2019-07-24 15:13:10 +00:00
kaniini b7fae304d3 Merge branch 'domain-blocking-relationship-api' into 'develop' 
Add `domain_blocking` to the relationship API (GET /api/v1/accounts/relationships)

See merge request pleroma/pleroma!1481
 2019-07-24 15:12:27 +00:00
Eugenij 4504135894 Add domain_blocking to the relationship API (GET /api/v1/accounts/relationships) 2019-07-24 15:12:27 +00:00
Mike Verdone 2c83eb0b15 Revert "squash! Expose expires_at datetime in mastoAPI only for the activity actor" 
This reverts commit 2981821db8.
 2019-07-24 17:09:59 +02:00
Mike Verdone 877575d0da fixup! Update changelog 2019-07-24 17:07:51 +02:00
Mike Verdone 2981821db8 squash! Expose expires_at datetime in mastoAPI only for the activity actor 
NOTE: rewrite the commit msg
 2019-07-24 16:51:09 +02:00
Mike Verdone 91d9fdc7de Update changelog to document expiring posts feature 2019-07-24 16:48:34 +02:00
Roman Chvanikov d2da3d30f3 Merge branch 'develop' into feature/digest-email 2019-07-24 16:37:52 +03:00
Mike Verdone 3cb471ec06 Expose expires_at datetime in mastoAPI only for the activity actor 
In the "pleroma" section of the MastoAPI for status activities you can
see an expires_at item that states when the activity will expire, or
nothing if the activity will not expire.

The expires_at date is only visible to the person who posted the
activity. This is the conservative approach in case some attacker
decides to write a logger for expiring posts. However, in the future of
OCAP, signed requests, and all that stuff, this attack might not be that
likely. Some other pleroma dev should remove the restriction in the code
at that time, if they're satisfied with the security implications of
doing so.
 2019-07-24 14:47:22 +02:00
Mike Verdone 36012ef6c1 Require that ephemeral posts live for at least one hour 
If we didn't put some kind of lifetime requirement on these, I guess you
could annoy people by sending large numbers of ephemeral posts that
provoke notifications but then disappear before anyone can read them.
 2019-07-24 14:46:08 +02:00
Mike Verdone 704960b3c1 Add support for activity expiration to common and Masto API 
The "expires_at" parameter accepts an ISO8601-formatted date which
defines when the activity will expire.

At this point the API will not give you any feedback about if your post
will expire or not.
 2019-07-24 14:45:14 +02:00
sadposter d6dbcc03ea Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-07-24 12:45:16 +01:00
lain 53fad36b57 Merge branch 'develop' into 'develop' 
Honour domain blocks on streamed notifications/statuses

See merge request pleroma/pleroma!1482
 2019-07-24 11:28:05 +00:00
Mike Verdone 378f5f0fbe Add activity expiration worker 
This is a worker that runs every minute and deletes expired activities.
It's based heavily on the scheduled activities worker.
 2019-07-24 13:14:52 +02:00
Mike Verdone 666514194a Add activity expirations table 
Add a table to store activity expirations. An activity can have zero or
one expirations. The expiration has a scheduled_at field which stores
the time at which the activity should expire and be deleted.
 2019-07-24 13:14:52 +02:00
Mike Verdone b729402774 Make test.exs read config in the same way as dev.exs 
This way, if your test.secret.exs has an error, you'll actually see it.
 2019-07-24 13:14:52 +02:00
Mike Verdone 8ba7a151ad Cleanup: fix a comment 2019-07-24 13:14:52 +02:00
sadposter f5d574f4ed check both item and parent domain blocks 2019-07-24 11:35:16 +01:00
Sadposter 48bd3be9cb move domain block check to with block 2019-07-24 11:11:33 +01:00
Sadposter 4af4f6166b honour domain blocks on streaming notifications 2019-07-24 11:09:06 +01:00
kaniini 0be548b90a Merge branch 'Fix-static-dir-doc' into 'develop' 
Fix static_dir docs

See merge request pleroma/pleroma!1465
 2019-07-24 01:59:41 +00:00
aries 9638da43e9 Add text about gitignore 2019-07-24 01:50:56 +00:00
kaniini 9c6357324e Merge branch 'feature/admin-api-user-statuses' into 'develop' 
Admin API: Endpoint for fetching latest user's statuses

See merge request pleroma/pleroma!1413
 2019-07-23 23:59:21 +00:00
kaniini 2ae510ee81 Merge branch 'bugfix/rich-media-splice-url' into 'develop' 
rich media: parser: splice the given URL into the result

See merge request pleroma/pleroma!1480
 2019-07-23 23:59:06 +00:00