summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-02-17Merge branch 'docs/add-clients-to-ex_doc' into 'develop'lambda
mix.exs: Add docs/Clients.md to docs.extras See merge request pleroma/pleroma!835
2019-02-17Merge branch 'develop' into 'docs/add-clients-to-ex_doc'lambda
# Conflicts: # mix.exs
2019-02-17Merge branch 'docker-speedup' into 'develop'lambda
Docker speedup See merge request pleroma/pleroma!837
2019-02-17Merge branch 'mastoapi-stop-capping-attachments' into 'develop'lambda
Remove a limit on attachments in Mastodon API and document the changes in responses from vanilla Mastodon See merge request pleroma/pleroma!834
2019-02-17Update Differences-in-MastodonAPI-Responses.mdlambda
2019-02-17Merge branch 'fix/hellthread-policy-recipient-check' into 'develop'lambda
Fix recipient count in hellthread policy See merge request pleroma/pleroma!836
2019-02-17More speedup, test fixes.lain
2019-02-17more tests for HellthreadPolicyrinpatch
2019-02-17[#468] Formatting fix.Ivan Tashkinov
2019-02-17[#468] Merged `upstream/develop`, resolved conflicts.Ivan Tashkinov
2019-02-17[#468] Refactored OAuth scopes' defaults & missing selection handling.Ivan Tashkinov
2019-02-17Speed up docker postgres.lain
2019-02-17Fix recipient count in hellthread policyrinpatch
2019-02-17Fix formatingrinpatch
2019-02-17Add differences in MastoAPI responses to mix.exs extrasrinpatch
2019-02-16Web.MastodonAPI.MastodonAPIControllerTest: Add testing of the flavour switchingHaelwenn (lanodan) Monnier
2019-02-16[MastoAPI] Add switching of frontend flavoursHaelwenn (lanodan) Monnier
2019-02-16mix.exs: Add docs/Clients.md to docs.extrasHaelwenn (lanodan) Monnier
[ci skip]
2019-02-16Add a section on how to identify a pleroma instance, clarify that post ↵rinpatch
upload limit is not capped too
2019-02-16Merge branch 'welcome-message' into 'develop'rinpatch
Add optional welcome message. See merge request pleroma/pleroma!832
2019-02-16Remove a limit on attachments in Mastodon API and document the changes in ↵rinpatch
responses from vanilla mastodon
2019-02-16WelcomeMessage: specify that the user has to be local.lain
2019-02-16WelcomeMessage: Get rid of Ecto reference.lain
2019-02-16Check that the welcome message is sent from the correct user.lain
2019-02-16Add option to return all friends in twitter api.lain
Mainly useful for user export.
2019-02-16Add optional welcome message.lain
2019-02-15[#468] Defined OAuth restrictions for all applicable routes.Ivan Tashkinov
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.
2019-02-15Merge branch 'bugfix/oauth-token-padding' into 'develop'lambda
oauth: never use base64 padding when returning tokens to applications See merge request pleroma/pleroma!825
2019-02-15Merge branch 'hellthread-filter-fix' into 'develop'rinpatch
Hellthread filter fix Closes #634 See merge request pleroma/pleroma!831
2019-02-15Readd threshold is not 0 check, optmization?Karen Konou
2019-02-15Rename test, add check for follower collection when delistingKaren Konou
2019-02-15Merge branch 'bugfix/actor-containment' into 'develop'rinpatch
activitypub: correctly handle bare URIs in user lookup Closes #645 See merge request pleroma/pleroma!829
2019-02-15Add tests, change default config values, fix a bugKaren Konou
2019-02-15Add logic for keeping follow_request_count up-to-date on the `follow`,eugenijm
`approve_friend_request`, and `deny_friend_request` actions. Add follow_request_count to the user view.
2019-02-14test: user: add a test for whether user search returns a user or notWilliam Pitcock
2019-02-14user: search: use get_or_fetch() instead of get_or_fetch_by_nickname()William Pitcock
get_or_fetch() handles the nickname verses URI differences transparently.
2019-02-14Merge branch 'bugfix/activitypub-reserialization' into 'develop'lambda
activitypub transmogrifier: fix reserialization edge cases See merge request pleroma/pleroma!826
2019-02-14activitypub: clean up logging statements a littleWilliam Pitcock
2019-02-14Merge remote-tracking branch 'upstream/develop' into patch-image-descriptionWim Vanderbauwhede
2019-02-14[#468] Refactored OAuth scopes parsing / defaults handling.Ivan Tashkinov
2019-02-14[#468] OAuth scopes-related data migration simplification.Ivan Tashkinov
2019-02-14Merge branch 'fix/mediaproxy-s3' into 'develop'href
Fix S3 links encoding in Mediaproxy Closes #580 See merge request pleroma/pleroma!828
2019-02-14Fix queue nameEgor Kislitsyn
2019-02-14fix S3 links encoding in MediaproxyEgor Kislitsyn
2019-02-14Merge branch 'fix/credo-issues-test' into 'develop'kaniini
Fix credo issues in ./test See merge request pleroma/pleroma!808
2019-02-14Merge branch 'bugfix/activitypub-totalitems-removal' into 'develop'Haelwenn
activitypub: user inbox/outbox: `totalItems` removal See merge request pleroma/pleroma!827
2019-02-14tests: update tests for totalItems leak fixWilliam Pitcock
2019-02-14activitypub: user view: formattingWilliam Pitcock
2019-02-14activitypub: user view: report totalItems=0 for follows/followers when hiddenWilliam Pitcock
2019-02-14activitypub: user view: remove totalItems from user outboxWilliam Pitcock
(this is based on a counter in User.Info, but the counter is not reliable.)