limepotato/akkoma
1
0
Fork 0
Code Pull requests Activity
5993 commits 27 branches 107 tags 315 MiB
Commit graph

5993 commits

This branch
This branch
All branches
Author SHA1 Message Date
kaniini
0e502cb836 Merge branch 'patch-2' into 'develop' 
Update clients.md - added Homepage for Fedilab Android app

See merge request pleroma/pleroma!1444
 2019-07-17 23:03:46 +00:00
tallship
cffe8229a5 Update clients.md - added Homepage for Fedilab Android app 2019-07-17 23:03:46 +00:00
kaniini
a51ee5fae5 Merge branch 'patch-3' into 'develop' 
Update otp_en.md - Added creation of initial admin user

See merge request pleroma/pleroma!1445
 2019-07-17 23:03:30 +00:00
Ariadne Conill
399acd4c42 fetcher: sign object fetches if configured 2019-07-17 22:58:46 +00:00
Bradley D. Thornton
cdecef2a08 Update otp_en.md - Added creation of initial admin user 2019-07-17 22:35:16 +00:00
Ariadne Conill
b2a8ccf37f config: add sign_object_fetches option 2019-07-17 21:38:06 +00:00
kaniini
1e48af9acf Merge branch 'feature/instance-fetch-actor' into 'develop' 
instance fetch service actor

See merge request pleroma/pleroma!1440
 2019-07-17 19:45:40 +00:00
kaniini
60b54ee64a Merge branch 'feature/http-signatures-keyid' into 'develop' 
http signatures: derive actor from key IDs

See merge request pleroma/pleroma!1442
 2019-07-17 19:44:14 +00:00
Ariadne Conill
f84fb340b7 http signatures: derive actor ID from key ID. 
Almost all AP servers return their key ID as the actor URI with #main-key
added.  Hubzilla, which doesn't, uses a URL which refers to the actor
anyway, so worst case, Hubzilla users get refetched.
 2019-07-17 19:18:19 +00:00
Ariadne Conill
1e3aff6ef1 mix: bump http_signatures dependency to a2a5982fa167fb1352fbd518ce6b606ba233a989 2019-07-17 19:00:26 +00:00
kaniini
348307ec19 Merge branch 'password-reset-fix-for-non-test-env' into 'develop' 
Fix password reset for non-test env

See merge request pleroma/pleroma!1441
 2019-07-17 18:09:31 +00:00
Eugenij
4bf2bb9cff Fix password reset for non-test env 
Fixes `Plug.Conn.NotSentError` that causes a 5xx error in response
instead of 404 and 400.

Fixes pattern matching error caused by different response format
in test and non-test env: `Pleroma.Emails.Mailer.deliver_async` returns
:ok when PleromaJobQueue is enabled and `{:ok, _}` when it's disabled.
In tests, it's disabled.
 2019-07-17 18:09:31 +00:00
Ariadne Conill
c119835102 update changelog 2019-07-17 17:49:21 +00:00
Ariadne Conill
3d23a12d75 tests: add test for fetching the internal fetch actor 2019-07-17 17:48:08 +00:00
Ariadne Conill
cf9cb953d5 activitypub: represent internal fetch actor 2019-07-17 17:34:57 +00:00
Ariadne Conill
d930e5d5c3 activitypub: introduce internal fetch service actor 2019-07-17 17:14:08 +00:00
Ariadne Conill
62e5ff624e user: add is_internal_user? helper function 2019-07-17 17:12:42 +00:00
Ariadne Conill
0a6f6e1b5b webfinger: allow resolution of usernames with dots in them (internal actors) 2019-07-17 16:59:29 +00:00
Ariadne Conill
a9d6a12bb3 activitypub: controller: rework the way the relay actor is presented so the code can be reused 2019-07-17 16:33:08 +00:00
Ariadne Conill
4885473be2 user: refactor get_or_create_instance_user() into get_or_create_service_actor_by_id() 2019-07-17 16:03:05 +00:00
kaniini
ce73d5f6a5 Merge branch 'feature/mention-mrf' into 'develop' 
Add MRF MentionPolicy for dropping posts which mention specific actors

See merge request pleroma/pleroma!1439
 2019-07-17 15:28:41 +00:00
RX14
96a2890a9e
Add MRF MentionPolicy for dropping posts which mention specific actors 2019-07-17 15:16:55 +01:00
kaniini
0bbc0f0cf4 Merge branch 'feature/1078-password-reset' into 'develop' 
Feature/1078 password reset

Closes #1078

See merge request pleroma/pleroma!1431
 2019-07-16 21:44:50 +00:00
Alexander Strizhakov
10f82c88b8 mastoapi password reset 
added rate limit to password reset

configure rate limit in runtime
 2019-07-16 21:44:50 +00:00
kaniini
33fbb638cd Merge branch 'tests/upload_filters' into 'develop' 
added tests for Pleroma.Upload.Filter

See merge request pleroma/pleroma!1434
 2019-07-16 21:35:43 +00:00
Maksim
21e3f9ac69 added tests for Pleroma.Upload.Filter 2019-07-16 21:35:43 +00:00
kaniini
4ac269a2c3 Merge branch '1094-relation-actions-rate-limiting' into 'develop' 
[#1094] Rate-limited follow & unfollow actions.

Closes #1094

See merge request pleroma/pleroma!1436
 2019-07-16 21:35:12 +00:00
Sachin Joshi
18234cc44e add the rich media ttl based on image exp time 2019-07-17 00:20:34 +05:45
Ivan Tashkinov
2ba07b63f4 Apply suggestion to docs/config.md 2019-07-16 16:59:02 +00:00
Ivan Tashkinov
889dc17abd [#1094] Rate-limited follow & unfollow actions. 2019-07-16 19:18:30 +03:00
kaniini
d3b9222761 Merge branch 'add-deactivated-to-account-view' into 'develop' 
Add `pleroma.deactivated` to the Account entity (Mastodon API)

See merge request pleroma/pleroma!1433
 2019-07-16 11:14:46 +00:00
Eugenij
520ee6c591 Add pleroma.deactivated to the Account entity (Mastodon API) 2019-07-16 11:14:46 +00:00
kaniini
a0d71d3ccf Merge branch 'add-blocked-by-to-relationship' into 'develop' 
Add the `blocked_by` attribute to the relationship API (`GET /api/v1/accounts/relationships`)

See merge request pleroma/pleroma!1429
 2019-07-16 11:04:11 +00:00
Eugenij
c4ca142e14 Add the blocked_by attribute to the relationship API (GET /api/v1/accounts/relationships) 2019-07-16 11:04:11 +00:00
kaniini
cf7ca1db0e Merge branch 'feature/addressable-lists' into 'develop' 
Fix typo

See merge request pleroma/pleroma!1432
 2019-07-16 10:49:24 +00:00
Egor Kislitsyn
70439494af Fix typo 2019-07-16 14:56:07 +07:00
rinpatch
996fd58ac4 Merge branch 'bugfix/poll-id-as-string' into 'develop' 
Status View: Poll ids are strings.

See merge request pleroma/pleroma!1430
 2019-07-16 06:06:22 +00:00
lain
7a24def473 Mastodon Controller: Fix tests. 2019-07-16 14:01:18 +09:00
lain
1ed24bcc76 Status View: Poll ids are strings. 
All ids in mastodon are strings, in general.
 2019-07-16 12:47:40 +09:00
Mark Felder
46c7c53fbb Add changelog entry for Mastodon API change 2019-07-15 17:10:33 -05:00
Mark Felder
ffb4eb9779 Merge branch 'develop' into feature/matstodon-statuses-by-name 2019-07-15 17:10:27 -05:00
feld
9f987dd017 Merge branch 'match-file-name' into 'develop' 
try to always match the filename for proxy url

See merge request pleroma/pleroma!1405
 2019-07-15 22:04:58 +00:00
feld
03bcb40883 Merge branch 'remove-dead-admin-tasks-links-from-docs' into 'develop' 
Remove dead link from the installation docs

See merge request pleroma/pleroma!1428
 2019-07-15 21:43:04 +00:00
Eugenij
345a38778e Remove dead link from the installation docs 2019-07-15 21:43:04 +00:00
kaniini
d80bcd270d Merge branch 'tests/mastodon-common-api' into 'develop' 
Add more tests for MastodonAPIController and CommonAPI

See merge request pleroma/pleroma!1425
 2019-07-15 19:47:23 +00:00
Sergey Suprunenko
b74300bc7a Add more tests for MastodonAPIController and CommonAPI 2019-07-15 19:47:23 +00:00
kaniini
30d7e22784 Merge branch 'fix/1091-notifications-query' into 'develop' 
Notifications query fix

Closes #1091

See merge request pleroma/pleroma!1427
 2019-07-15 19:46:31 +00:00
Alex S
33fd4c0ed7 query fix 2019-07-15 20:53:52 +03:00
kaniini
ee5250ae56 Merge branch 'sha512-crypt' into 'develop' 
detect and use sha512-crypt for stored password hash.

See merge request pleroma/pleroma!1422
 2019-07-15 16:13:17 +00:00
Sachin Joshi
1d906ffa82 Merge branch 'develop' into match-file-name 
# Conflicts:
#	lib/pleroma/web/media_proxy/media_proxy_controller.ex
 2019-07-15 21:30:56 +05:45