Commit graph

5974 commits

Author SHA1 Message Date
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
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
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
Moonman
105f437ce9 formatting 2019-07-15 08:36:51 -07:00
kaniini
6aa5b39837 Merge branch 'update-tzdata' into 'develop'
Dependencies: Update tzdata and related packages.

See merge request pleroma/pleroma!1423
2019-07-15 13:02:59 +00:00
kaniini
03c4ea44ad Merge branch 'admin-configure-atom-keys' into 'develop'
admin configure - atom keys with leading :

See merge request pleroma/pleroma!1424
2019-07-15 13:01:58 +00:00
kaniini
11b71c6a70 Merge branch 'tests/http_signature' into 'develop'
tests for Pleroma.Signature

See merge request pleroma/pleroma!1426
2019-07-15 13:01:22 +00:00
Maksim
c32384c1ea tests for Pleroma.Signature 2019-07-15 13:01:22 +00:00
kaniini
d725ccfd3a Merge branch 'feature/addressable-lists' into 'develop'
[#802] Add addressable lists

See merge request pleroma/pleroma!1113
2019-07-15 13:00:33 +00:00
Alex S
b8607c151c migrating task refactor 2019-07-15 15:45:27 +03:00
Alex S
c66044b923 atom keys with leading : 2019-07-15 11:00:55 +03:00
Egor Kislitsyn
de13c9bb8f List messages must be visible for mentioned users 2019-07-15 14:54:40 +07:00
lain
d302fcaa61 Dependencies: Update tzdata and related packages. 2019-07-15 16:47:39 +09:00
Egor Kislitsyn
04f18a144b Add listMessage to to the JSON-LD context 2019-07-15 14:29:13 +07:00
Egor Kislitsyn
0c66bb5857 Update documentation 2019-07-15 14:27:56 +07:00
Egor Kislitsyn
d86a97abfb Add an explanation comment to Publisher.publish/2 2019-07-15 14:20:31 +07:00
Egor Kislitsyn
64a946643e Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists 2019-07-15 14:11:54 +07:00
Egor Kislitsyn
a87c313309 Support list visibility in StatusView 2019-07-15 14:00:29 +07:00
kaniini
46ef8f0216 Merge branch 'tests/media_proxy' into 'develop'
added tests for Web.MediaProxy

See merge request pleroma/pleroma!1418
2019-07-14 21:01:32 +00:00
Maksim
fa17879c20 added tests for Web.MediaProxy 2019-07-14 21:01:32 +00:00
kaniini
4b78622bba Merge branch 'feature/unsubscribe-on-unfollow' into 'develop'
Unfollow should also unsubscribe

Closes #1086

See merge request pleroma/pleroma!1419
2019-07-14 19:25:03 +00:00
Sergey Suprunenko
dce8ebc9ea Unfollow should also unsubscribe 2019-07-14 19:25:03 +00:00