2ba07b63f4
Apply suggestion to docs/config.md
5 years ago
889dc17abd
[ #1094 ] Rate-limited follow & unfollow actions.
5 years ago
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
5 years ago
520ee6c591
Add `pleroma.deactivated` to the Account entity (Mastodon API)
5 years ago
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
5 years ago
c4ca142e14
Add the `blocked_by` attribute to the relationship API (`GET /api/v1/accounts/relationships`)
5 years ago
cf7ca1db0e
Merge branch 'feature/addressable-lists' into 'develop'
...
Fix typo
See merge request pleroma/pleroma!1432
5 years ago
70439494af
Fix typo
5 years ago
996fd58ac4
Merge branch 'bugfix/poll-id-as-string' into 'develop'
...
Status View: Poll ids are strings.
See merge request pleroma/pleroma!1430
5 years ago
7a24def473
Mastodon Controller: Fix tests.
5 years ago
1ed24bcc76
Status View: Poll ids are strings.
...
All ids in mastodon are strings, in general.
5 years ago
46c7c53fbb
Add changelog entry for Mastodon API change
5 years ago
ffb4eb9779
Merge branch 'develop' into feature/matstodon-statuses-by-name
5 years ago
9f987dd017
Merge branch 'match-file-name' into 'develop'
...
try to always match the filename for proxy url
See merge request pleroma/pleroma!1405
5 years ago
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
5 years ago
345a38778e
Remove dead link from the installation docs
5 years ago
d80bcd270d
Merge branch 'tests/mastodon-common-api' into 'develop'
...
Add more tests for MastodonAPIController and CommonAPI
See merge request pleroma/pleroma!1425
5 years ago
b74300bc7a
Add more tests for MastodonAPIController and CommonAPI
5 years ago
30d7e22784
Merge branch 'fix/1091-notifications-query' into 'develop'
...
Notifications query fix
Closes #1091
See merge request pleroma/pleroma!1427
5 years ago
33fd4c0ed7
query fix
5 years ago
ee5250ae56
Merge branch 'sha512-crypt' into 'develop'
...
detect and use sha512-crypt for stored password hash.
See merge request pleroma/pleroma!1422
5 years ago
1d906ffa82
Merge branch 'develop' into match-file-name
...
# Conflicts:
# lib/pleroma/web/media_proxy/media_proxy_controller.ex
5 years ago
105f437ce9
formatting
5 years ago
6aa5b39837
Merge branch 'update-tzdata' into 'develop'
...
Dependencies: Update tzdata and related packages.
See merge request pleroma/pleroma!1423
5 years ago
03c4ea44ad
Merge branch 'admin-configure-atom-keys' into 'develop'
...
admin configure - atom keys with leading :
See merge request pleroma/pleroma!1424
5 years ago
11b71c6a70
Merge branch 'tests/http_signature' into 'develop'
...
tests for Pleroma.Signature
See merge request pleroma/pleroma!1426
5 years ago
c32384c1ea
tests for Pleroma.Signature
5 years ago
d725ccfd3a
Merge branch 'feature/addressable-lists' into 'develop'
...
[#802 ] Add addressable lists
See merge request pleroma/pleroma!1113
5 years ago
b8607c151c
migrating task refactor
5 years ago
c66044b923
atom keys with leading :
5 years ago
de13c9bb8f
List messages must be visible for mentioned users
5 years ago
d302fcaa61
Dependencies: Update tzdata and related packages.
5 years ago
04f18a144b
Add `listMessage` to to the JSON-LD context
5 years ago
0c66bb5857
Update documentation
5 years ago
d86a97abfb
Add an explanation comment to Publisher.publish/2
5 years ago
64a946643e
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
5 years ago
a87c313309
Support `list` visibility in StatusView
5 years ago
46ef8f0216
Merge branch 'tests/media_proxy' into 'develop'
...
added tests for Web.MediaProxy
See merge request pleroma/pleroma!1418
5 years ago
fa17879c20
added tests for Web.MediaProxy
5 years ago
4b78622bba
Merge branch 'feature/unsubscribe-on-unfollow' into 'develop'
...
Unfollow should also unsubscribe
Closes #1086
See merge request pleroma/pleroma!1419
5 years ago
dce8ebc9ea
Unfollow should also unsubscribe
5 years ago
509d8058d9
Merge branch 'security/ir-generic-containment' into 'develop'
...
security: IR-based generic object containment
See merge request pleroma/pleroma!1417
5 years ago
841314c2d5
tests: fix object containment violations in the transmogrifier tests
...
Some objects were not completely rewritten in the tests, which caused object
containment violations. Fix them by rewriting the object IDs to be in an
appropriate namespace.
5 years ago
739bbe0d3b
security: detect object containment violations at the IR level
...
It is more efficient to check for object containment violations at the IR
level instead of in the protocol handlers. OStatus containment is especially
a tricky situation, as the containment rules don't match those of IR and
ActivityPub.
Accordingly, we just always do a final containment check at the IR level
before the object is added to the IR object graph.
5 years ago
f98f7ad1b9
detect and use sha512-crypt for stored password hash.
5 years ago
93701c3399
Merge branch 'chore/remove-cc-by-nc-nd-license' into 'develop'
...
remove CC-BY-NC-ND license.
See merge request pleroma/pleroma!1415
5 years ago
26f265fb0e
remove CC-BY-NC-ND license.
...
we moved branding assets (mascot etc) to CC-BY-SA a while back.
5 years ago
cef4337f95
Merge branch 'bugfix/llal-object-containment' into 'develop'
...
Object.Fetcher: Handle error on Containment.contain_origin/2
See merge request pleroma/pleroma!1414
5 years ago
2592934480
Object.Fetcher: Keep the with-do block as per kaniini proposition
5 years ago
a2c601acb5
FetcherTest: Containment refute called(OStatus.fetch_activity_from_url)
5 years ago
Ivan Tashkinov