a2f4fc49fe
Merge branch 'develop' into 'docs/add-clients-to-ex_doc'
...
# Conflicts:
# mix.exs
6 years ago
79e503b3f5
Merge branch 'docker-speedup' into 'develop'
...
Docker speedup
See merge request pleroma/pleroma!837
6 years ago
f26582aae9
Merge branch 'mastoapi-stop-capping-attachments' into 'develop'
...
Remove a limit on attachments in Mastodon API and document the changes in responses from vanilla Mastodon
See merge request pleroma/pleroma!834
6 years ago
6a8a8e90da
Update Differences-in-MastodonAPI-Responses.md
6 years ago
ae84af4ad0
Merge branch 'fix/hellthread-policy-recipient-check' into 'develop'
...
Fix recipient count in hellthread policy
See merge request pleroma/pleroma!836
6 years ago
71c8c60ded
More speedup, test fixes.
6 years ago
d0a94f98e0
more tests for HellthreadPolicy
6 years ago
d3fe2c8ec6
[ #468 ] Formatting fix.
6 years ago
bc4f77b10b
[ #468 ] Merged `upstream/develop`, resolved conflicts.
6 years ago
dcf24a3233
[ #468 ] Refactored OAuth scopes' defaults & missing selection handling.
6 years ago
fa191a658b
Speed up docker postgres.
6 years ago
8f98d970c1
Fix recipient count in hellthread policy
6 years ago
ccd30a1875
Fix formating
6 years ago
006bec8c6a
Add differences in MastoAPI responses to mix.exs extras
6 years ago
72a4272d84
Web.MastodonAPI.MastodonAPIControllerTest: Add testing of the flavour switching
6 years ago
4df455f69b
[MastoAPI] Add switching of frontend flavours
6 years ago
25ab90edea
mix.exs: Add docs/Clients.md to docs.extras
...
[ci skip]
6 years ago
c788f1543c
Add a section on how to identify a pleroma instance, clarify that post upload limit is not capped too
6 years ago
3b14119471
Merge branch 'welcome-message' into 'develop'
...
Add optional welcome message.
See merge request pleroma/pleroma!832
6 years ago
96c725328b
Remove a limit on attachments in Mastodon API and document the changes in responses from vanilla mastodon
6 years ago
27375e5575
WelcomeMessage: specify that the user has to be local.
6 years ago
269d3e1ca6
WelcomeMessage: Get rid of Ecto reference.
6 years ago
f469a8610f
Check that the welcome message is sent from the correct user.
6 years ago
38e15930cb
Add option to return all friends in twitter api.
...
Mainly useful for user export.
6 years ago
d812a347ca
Add optional welcome message.
6 years ago
2a4a4f3342
[ #468 ] Defined OAuth restrictions for all applicable routes.
...
Improved missing "scopes" param handling.
Allowed "any of" / "all of" mode specification in OAuthScopesPlug.
Fixed auth UI / behavior when user selects no permissions at /oauth/authorize.
6 years ago
1ce1b7b58d
Merge branch 'bugfix/oauth-token-padding' into 'develop'
...
oauth: never use base64 padding when returning tokens to applications
See merge request pleroma/pleroma!825
6 years ago
921571c19b
Merge branch 'hellthread-filter-fix' into 'develop'
...
Hellthread filter fix
Closes #634
See merge request pleroma/pleroma!831
6 years ago
c2e0a0c8d4
Readd threshold is not 0 check, optmization?
6 years ago
dca6bee2f7
Rename test, add check for follower collection when delisting
6 years ago
b63a5e309d
Merge branch 'bugfix/actor-containment' into 'develop'
...
activitypub: correctly handle bare URIs in user lookup
Closes #645
See merge request pleroma/pleroma!829
6 years ago
d943c90249
Add tests, change default config values, fix a bug
6 years ago
ecdf0657ba
Add logic for keeping follow_request_count up-to-date on the `follow`,
...
`approve_friend_request`, and `deny_friend_request` actions.
Add follow_request_count to the user view.
6 years ago
32b1649434
test: user: add a test for whether user search returns a user or not
6 years ago
da44cdd381
user: search: use get_or_fetch() instead of get_or_fetch_by_nickname()
...
get_or_fetch() handles the nickname verses URI differences transparently.
6 years ago
ea2698beb7
Merge branch 'bugfix/activitypub-reserialization' into 'develop'
...
activitypub transmogrifier: fix reserialization edge cases
See merge request pleroma/pleroma!826
6 years ago
56862f4ce1
activitypub: clean up logging statements a little
6 years ago
04b1c13554
Merge remote-tracking branch 'upstream/develop' into patch-image-description
6 years ago
027adbc9e5
[ #468 ] Refactored OAuth scopes parsing / defaults handling.
6 years ago
949e35e26d
[ #468 ] OAuth scopes-related data migration simplification.
6 years ago
1d17082ab2
Merge branch 'fix/mediaproxy-s3' into 'develop'
...
Fix S3 links encoding in Mediaproxy
Closes #580
See merge request pleroma/pleroma!828
6 years ago
3f32d7b937
Fix queue name
6 years ago
907306174b
fix S3 links encoding in Mediaproxy
6 years ago
19756d68f2
Merge branch 'fix/credo-issues-test' into 'develop'
...
Fix credo issues in ./test
See merge request pleroma/pleroma!808
6 years ago
6652389e80
Merge branch 'bugfix/activitypub-totalitems-removal' into 'develop'
...
activitypub: user inbox/outbox: `totalItems` removal
See merge request pleroma/pleroma!827
6 years ago
e031cc6473
tests: update tests for totalItems leak fix
6 years ago
72ba5b4ab7
activitypub: user view: formatting
6 years ago
5307c211b8
activitypub: user view: report totalItems=0 for follows/followers when hidden
6 years ago
6542b86292
activitypub: user view: remove totalItems from user outbox
...
(this is based on a counter in User.Info, but the counter is not reliable.)
6 years ago
ee2fa1a314
activitypub: user view: remove totalInbox from user inbox view
...
It is not really feasible to quickly calculate the totalItems value and
it shouldn't be trusted anyway.
6 years ago
lambda